[release/3.10] 修复系统代理 JVM 参数格式 (#5591)

https://github.com/HMCL-dev/HMCL/pull/5265

Co-authored-by: Xirren <michaelqiancn@gmail.com>
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) 获取帮助。
-        * 你的启动器版本是**最新的预览版本**。你可以从 [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) 下载最新预览版本。
+        * 该问题确实是 **HMCL 的错误**，而**不是 Minecraft 非正常退出**，如果你的 Minecraft 非正常退出，请前往 [QQ 群](https://docs.hmcl.net/groups.html)/[Discord 服务器](https://discord.gg/jVvC7HfM6U) 获取帮助。
+        * 你的启动器版本是**最新的预览版本**，可以点击 [此处](https://zkitefly.github.io/HMCL-Snapshot-Update/) 下载最新预览版本。
 
         如果你的问题并不属于上述两类，你可以选取另一种 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 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).
+        * 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.
 
         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: |
-        如果你的启动器崩溃了，请将崩溃报告填入 (或将文件拖入) 下方。
+        如果你的启动器崩溃了，请将崩溃报告填入（或将文件拖入）下方。
         如果你的启动器没有崩溃，请在遇到问题后**不要退出启动器**，在启动器的 “设置 → 通用 → 调试” 一栏中点击 “导出启动器日志”，并将导出的日志拖到下方的输入栏中。
         **请注意：启动器崩溃报告或日志文件是诊断问题的重要依据，请务必上传！**
         

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

@@ -1,357 +0,0 @@
-/*
- * 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

@@ -1,297 +0,0 @@
-/*
- * 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

@@ -24,10 +24,8 @@ 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;
@@ -43,12 +41,7 @@ import javafx.stage.Window;
 public class JFXPopup extends PopupControl {
 
     public enum PopupHPosition {
-        RIGHT,
-        LEFT;
-
-        public PopupHPosition getOpposite() {
-            return (this == RIGHT) ? LEFT : RIGHT;
-        }
+        RIGHT, LEFT
     }
 
     public enum PopupVPosition {
@@ -128,21 +121,18 @@ public class JFXPopup extends PopupControl {
     /// @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) {
+            if (node.getScene() == null || node.getScene().getWindow() == null) {
                 throw new IllegalStateException("Can not show popup. The node must be attached to a scene/window.");
             }
-            Window parent = scene.getWindow();
+            Window parent = node.getScene().getWindow();
             final Point2D origin = node.localToScene(0, 0);
-
-            boolean isRTL = node.getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT;
-
-            this.show(parent,
-                    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);
+            final double anchorX = parent.getX() + origin.getX()
+                    + node.getScene().getX() + (hAlign == PopupHPosition.RIGHT ? ((Region) node).getWidth() : 0);
+            final double anchorY = parent.getY() + origin.getY()
+                    + node.getScene()
+                    .getY() + (vAlign == PopupVPosition.BOTTOM ? ((Region) node).getHeight() : 0);
+            this.show(parent, anchorX, anchorY);
+            ((JFXPopupSkin) getSkin()).reset(vAlign, hAlign, initOffsetX, initOffsetY);
             Platform.runLater(() -> ((JFXPopupSkin) getSkin()).animate());
         }
     }

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

@@ -1,297 +0,0 @@
-/*
- * 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

@@ -1,299 +0,0 @@
-/*
- * 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/org/jackhuang/hmcl/EntryPoint.java

@@ -50,12 +50,10 @@ public final class EntryPoint {
         LOG.start(Metadata.HMCL_CURRENT_DIRECTORY.resolve("logs"));
 
         setupJavaFXVMOptions();
+        checkDirectoryPath();
 
-        if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) {
-            System.getProperties().putIfAbsent("apple.awt.application.appearance", "system");
-            if (!isInsideMacAppBundle())
-                initIcon();
-        }
+        if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS && !isInsideMacAppBundle())
+            initIcon();
 
         checkJavaFX();
         verifyJavaFX();
@@ -194,6 +192,16 @@ 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().addAll("sudo", "chown", "-R", userName).addAll(files).toString();
+        String command = new CommandBuilder().add("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,7 +46,6 @@ 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;
@@ -322,8 +321,6 @@ 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))
@@ -422,7 +419,6 @@ 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())
@@ -442,6 +438,17 @@ 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 {
@@ -551,39 +558,4 @@ 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/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, handler) -> {
+                                            (result, resolve, reject) -> {
                                                 if (CommandBuilder.setExecutionPolicy()) {
                                                     LOG.info("Set the ExecutionPolicy for the scope 'CurrentUser' to 'RemoteSigned'");
-                                                    handler.resolve();
+                                                    resolve.run();
                                                 } else {
                                                     LOG.warning("Failed to set ExecutionPolicy");
-                                                    handler.reject(i18n("launch.failed.execution_policy.failed_to_set"));
+                                                    reject.accept(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.majorVersion()) {
+                        if (minimumJavaVersion != null && targetJavaVersionMajor < minimumJavaVersion.getMajorVersion()) {
                             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.majorVersion()),
+                i18n("launch.advice.require_newer_java_version", javaVersion.getMajorVersion()),
                 i18n("message.warning"),
                 MessageType.QUESTION)
                 .yesOrNo(() -> {

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

@@ -64,7 +64,7 @@ public final class LogExporter {
         }
 
         return CompletableFuture.runAsync(() -> {
-            try (Zipper zipper = new Zipper(zipFile, true)) {
+            try (Zipper zipper = new Zipper(zipFile)) {
                 processLogs(runDirectory.resolve("liteconfig"), "*.log", "liteconfig", zipper, logMatcher);
                 processLogs(runDirectory.resolve("logs"), "*.log", "logs", zipper, logMatcher);
                 processLogs(runDirectory, "*.log", "runDirectory", zipper, logMatcher);

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

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

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

@@ -36,9 +36,7 @@ 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"),
-    LEGACY_FABRIC("/assets/img/legacyfabric.png")
-    ;
+    CLEANROOM("/assets/img/cleanroom.png");
 
     // Please append new items at last
 

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

@@ -33,6 +33,7 @@ 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.Pair;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.io.HttpRequest;
@@ -44,13 +45,15 @@ 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.ArrayList;
+import java.util.List;
 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;
 
+import static org.jackhuang.hmcl.util.Pair.pair;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 
@@ -310,11 +313,18 @@ public final class TerracottaManager {
     public static TerracottaState.HostScanning setScanning() {
         TerracottaState state = STATE_V.get();
         if (state instanceof TerracottaState.PortSpecific portSpecific) {
-            String uri = NetworkUtils.withQuery(String.format("http://127.0.0.1:%d/state/scanning", portSpecific.port), Map.of(
-                    "player", getPlayerName()
-            ));
+            Task.supplyAsync(Schedulers.io(), TerracottaNodeList::fetch)
+                    .thenComposeAsync(nodes -> {
+                        List<Pair<String, String>> query = new ArrayList<>(nodes.size() + 1);
+                        query.add(pair("player", getPlayerName()));
+                        for (URI node : nodes) {
+                            query.add(pair("public_nodes", node.toString()));
+                        }
+                        return new GetTask(NetworkUtils.withQuery(
+                                "http://127.0.0.1:%d/state/scanning".formatted(portSpecific.port), query
+                        )).setSignificance(Task.TaskSignificance.MINOR);
+                    }).start();
 
-            new GetTask(uri).setSignificance(Task.TaskSignificance.MINOR).start();
             return new TerracottaState.HostScanning(-1, -1, null);
         }
         return null;
@@ -323,15 +333,19 @@ public final class TerracottaManager {
     public static Task<TerracottaState.GuestConnecting> setGuesting(String room) {
         TerracottaState state = STATE_V.get();
         if (state instanceof TerracottaState.PortSpecific portSpecific) {
-            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.GuestConnecting(-1, -1, null))
-                    .setSignificance(Task.TaskSignificance.MINOR);
+            return Task.supplyAsync(Schedulers.io(), TerracottaNodeList::fetch)
+                    .thenComposeAsync(nodes -> {
+                        ArrayList<Pair<String, String>> query = new ArrayList<>(nodes.size() + 2);
+                        query.add(pair("room", room));
+                        query.add(pair("player", getPlayerName()));
+                        for (URI node : nodes) {
+                            query.add(pair("public_nodes", node.toString()));
+                        }
+                        return new GetTask(NetworkUtils.withQuery("http://127.0.0.1:%d/state/guesting".formatted(portSpecific.port), query))
+                                .setSignificance(Task.TaskSignificance.MINOR)
+                                .thenSupplyAsync(() -> new TerracottaState.GuestConnecting(-1, -1, null))
+                                .setSignificance(Task.TaskSignificance.MINOR);
+                    });
         } else {
             return null;
         }

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

@@ -0,0 +1,103 @@
+/*
+ * 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.terracotta;
+
+import com.google.gson.JsonParseException;
+import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.gson.JsonSerializable;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
+import org.jackhuang.hmcl.util.gson.TolerableValidationException;
+import org.jackhuang.hmcl.util.gson.Validation;
+import org.jackhuang.hmcl.util.i18n.LocaleUtils;
+import org.jackhuang.hmcl.util.io.HttpRequest;
+import org.jetbrains.annotations.Nullable;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.List;
+
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
+
+/// @author Glavo
+public final class TerracottaNodeList {
+    private static final String NODE_LIST_URL = "https://terracotta.glavo.site/nodes";
+
+    @JsonSerializable
+    private record TerracottaNode(String url, @Nullable String region) implements Validation {
+        @Override
+        public void validate() throws JsonParseException, TolerableValidationException {
+            Validation.requireNonNull(url, "TerracottaNode.url cannot be null");
+            try {
+                new URI(url);
+            } catch (URISyntaxException e) {
+                throw new JsonParseException("Invalid URL: " + url, e);
+            }
+        }
+    }
+
+    private static volatile List<URI> list;
+
+    public static List<URI> fetch() {
+        List<URI> list = TerracottaNodeList.list;
+        if (list != null)
+            return list;
+
+        synchronized (TerracottaNodeList.class) {
+            list = TerracottaNodeList.list;
+            if (list != null)
+                return list;
+
+            try {
+                List<TerracottaNode> nodes = HttpRequest.GET(NODE_LIST_URL)
+                        .getJson(JsonUtils.listTypeOf(TerracottaNode.class));
+
+                if (nodes == null) {
+                    list = List.of();
+                    LOG.info("No available Terracotta nodes found");
+                } else {
+                    list = nodes.stream()
+                            .filter(node -> {
+                                if (node == null)
+                                    return false;
+
+                                try {
+                                    node.validate();
+                                } catch (Exception e) {
+                                    LOG.warning("Invalid terracotta node: " + node, e);
+                                    return false;
+                                }
+
+                                return StringUtils.isBlank(node.region) || LocaleUtils.IS_CHINA_MAINLAND == "CN".equalsIgnoreCase(node.region);
+                            })
+                            .map(it -> URI.create(it.url()))
+                            .toList();
+                    LOG.info("Terracotta node list: " + list);
+                }
+            } catch (Exception e) {
+                LOG.warning("Failed to fetch terracotta node list", e);
+                list = List.of();
+            }
+
+            TerracottaNodeList.list = list;
+            return list;
+        }
+    }
+
+    private TerracottaNodeList() {
+    }
+}

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

@@ -17,7 +17,6 @@
  */
 package org.jackhuang.hmcl.theme;
 
-import com.sun.jna.Pointer;
 import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
@@ -25,10 +24,7 @@ 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;
@@ -36,17 +32,11 @@ import org.glavo.monetfx.beans.property.ColorSchemeProperty;
 import org.glavo.monetfx.beans.property.ReadOnlyColorSchemeProperty;
 import org.glavo.monetfx.beans.property.SimpleColorSchemeProperty;
 import org.jackhuang.hmcl.ui.FXUtils;
-import org.jackhuang.hmcl.ui.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.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 
@@ -75,7 +65,7 @@ public final class Themes {
                     if (FXUtils.DARK_MODE != null) {
                         yield FXUtils.DARK_MODE.get() ? Brightness.DARK : Brightness.LIGHT;
                     } else {
-                        yield getDefaultBrightness();
+                        yield Brightness.DEFAULT;
                     }
                 }
                 case "dark" -> Brightness.DARK;
@@ -107,34 +97,6 @@ public final class Themes {
         theme.addListener(listener);
     }
 
-    private static Brightness defaultBrightness;
-
-    private static Brightness getDefaultBrightness() {
-        if (defaultBrightness != null)
-            return defaultBrightness;
-
-        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;
-            }
-        }
-
-        return defaultBrightness = brightness;
-    }
-
     public static ObjectExpression<Theme> themeProperty() {
         return theme;
     }
@@ -167,39 +129,6 @@ 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/FXUtils.java

@@ -18,8 +18,7 @@
 package org.jackhuang.hmcl.ui;
 
 import com.jfoenix.controls.*;
-import javafx.animation.Animation;
-import javafx.animation.Interpolator;
+import javafx.animation.*;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
@@ -27,10 +26,7 @@ import javafx.beans.WeakInvalidationListener;
 import javafx.beans.WeakListener;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.*;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableBooleanValue;
-import javafx.beans.value.ObservableValue;
-import javafx.beans.value.WeakChangeListener;
+import javafx.beans.value.*;
 import javafx.collections.ObservableMap;
 import javafx.event.Event;
 import javafx.event.EventDispatcher;
@@ -43,23 +39,20 @@ 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.ColumnConstraints;
-import javafx.scene.layout.Priority;
-import javafx.scene.layout.Region;
-import javafx.scene.layout.StackPane;
+import javafx.scene.layout.*;
 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.FileChooser;
-import javafx.stage.Screen;
-import javafx.stage.Stage;
+import javafx.stage.*;
 import javafx.util.Callback;
 import javafx.util.Duration;
 import javafx.util.StringConverter;
@@ -68,13 +61,9 @@ 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.Lang;
-import org.jackhuang.hmcl.util.ResourceNotFoundError;
+import org.jackhuang.hmcl.util.*;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.io.NetworkUtils;
 import org.jackhuang.hmcl.util.javafx.ExtendedProperties;
@@ -99,14 +88,12 @@ import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.ref.WeakReference;
-import java.net.HttpURLConnection;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URLConnection;
+import java.net.*;
 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.*;
@@ -115,8 +102,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.i18n.I18n.i18n;
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class FXUtils {
     private FXUtils() {
@@ -312,14 +299,6 @@ 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;
@@ -433,20 +412,6 @@ 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);
@@ -1432,15 +1397,6 @@ public final class FXUtils {
         });
     }
 
-    public static void onSecondaryButtonClicked(Node node, Runnable action) {
-        node.addEventHandler(MouseEvent.MOUSE_CLICKED, e -> {
-            if (e.getButton() == MouseButton.SECONDARY) {
-                action.run();
-                e.consume();
-            }
-        });
-    }
-
     public static <N extends Parent> N prepareNode(N node) {
         Scene dummyScene = new Scene(node);
         StyleSheets.init(dummyScene);
@@ -1636,39 +1592,4 @@ 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

@@ -40,7 +40,6 @@ 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;
@@ -91,8 +90,6 @@ public class GameCrashWindow extends Stage {
     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;

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

@@ -92,18 +92,37 @@ public class InstallerItem extends Control {
         this.id = id;
         this.style = style;
 
-        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;
-        };
+        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;
+        }
     }
 
     public String getLibraryId() {
@@ -182,8 +201,6 @@ 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);
@@ -191,11 +208,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, 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);
+            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);
 
             for (Map.Entry<InstallerItem, Set<InstallerItem>> entry : incompatibleMap.entrySet()) {
                 InstallerItem item = entry.getKey();
@@ -229,7 +246,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, legacyfabric, legacyfabricApi, cleanroom};
+            InstallerItem[] all = {game, forge, neoForge, liteLoader, optiFine, fabric, fabricApi, quilt, quiltApi, cleanroom};
 
             for (InstallerItem item : all) {
                 if (!item.resolvedStateProperty.isBound()) {
@@ -246,9 +263,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, legacyfabric, legacyfabricApi, optiFine};
-            } else if (GameVersionNumber.compare(gameVersion, "1.13.2") <= 0) {
-                this.libraries = new InstallerItem[]{game, forge, liteLoader, optiFine, legacyfabric, legacyfabricApi};
+                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};
             } else {
                 this.libraries = new InstallerItem[]{game, forge, neoForge, optiFine, fabric, fabricApi, quilt, quiltApi};
             }

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

@@ -0,0 +1,49 @@
+/*
+ * 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

@@ -0,0 +1,108 @@
+/*
+ * 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,6 +21,7 @@ import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXCheckBox;
 import com.jfoenix.controls.JFXComboBox;
 import com.jfoenix.controls.JFXListView;
+import com.sun.jna.Pointer;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.binding.Bindings;
@@ -28,6 +29,7 @@ import javafx.beans.property.*;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.css.PseudoClass;
+import javafx.event.EventHandler;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Scene;
@@ -36,6 +38,7 @@ 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;
@@ -45,6 +48,9 @@ import org.jackhuang.hmcl.ui.construct.NoneMultipleSelectionModel;
 import org.jackhuang.hmcl.ui.construct.SpinnerPane;
 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;
@@ -81,13 +87,41 @@ 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));

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

@@ -50,9 +50,7 @@ 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"),
@@ -104,7 +102,6 @@ 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"),
@@ -124,7 +121,6 @@ public enum SVG {
     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"),
     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/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.FXUtils.wrap;
+import static org.jackhuang.hmcl.ui.versions.VersionPage.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

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

@@ -118,7 +118,6 @@ 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(

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

@@ -30,6 +30,7 @@ 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;
 
@@ -74,7 +75,7 @@ public class AdvancedListBox extends ScrollPane {
         item.setActionButtonVisible(false);
         item.setTitle(title);
         if (leftGraphic != null) {
-            item.setLeftGraphic(FXUtils.wrap(leftGraphic));
+            item.setLeftGraphic(VersionPage.wrap(leftGraphic));
         }
         return item;
     }

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

@@ -19,6 +19,8 @@ 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;
@@ -26,6 +28,7 @@ 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;
@@ -39,7 +42,8 @@ import org.jackhuang.hmcl.ui.animation.Motion;
 final class ComponentListCell extends StackPane {
     private final Node content;
     private Animation expandAnimation;
-    private boolean expanded = false;
+    private Rectangle clipRect;
+    private final BooleanProperty expanded = new SimpleBooleanProperty(this, "expanded", false);
 
     ComponentListCell(Node content) {
         this.content = content;
@@ -47,6 +51,25 @@ final class ComponentListCell extends StackPane {
         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");
@@ -124,8 +147,8 @@ final class ComponentListCell extends StackPane {
                     expandAnimation.stop();
                 }
 
-                boolean expanded = !this.expanded;
-                this.expanded = expanded;
+                boolean expanded = !isExpanded();
+                setExpanded(expanded);
                 if (expanded) {
                     list.doLazyInit();
                     list.layout();
@@ -134,9 +157,14 @@ final class ComponentListCell extends StackPane {
                 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);
@@ -149,11 +177,19 @@ final class ComponentListCell extends StackPane {
                                         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);
+                        }
                     }
                 });
             });
@@ -164,4 +200,16 @@ final class ComponentListCell extends StackPane {
             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/FloatListCell.java

@@ -0,0 +1,69 @@
+/*
+ * 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/InputDialogPane.java

@@ -72,19 +72,13 @@ public class InputDialogPane extends JFXDialogLayout implements DialogAware {
         acceptButton.setOnAction(e -> {
             acceptPane.showSpinner();
 
-            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);
-                }
+            onResult.call(textField.getText(), () -> {
+                acceptPane.hideSpinner();
+                future.complete(textField.getText());
+                fireEvent(new DialogCloseEvent());
+            }, msg -> {
+                acceptPane.hideSpinner();
+                lblCreationWarning.setText(msg);
             });
         });
         textField.setOnAction(event -> acceptButton.fire());

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

@@ -78,8 +78,6 @@ 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,17 +117,11 @@ public class PromptDialogPane extends DialogPane {
     protected void onAccept() {
         setLoading();
 
-        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));
-            }
+        builder.callback.call(builder.questions, () -> {
+            future.complete(builder.questions);
+            runInFX(this::onSuccess);
+        }, msg -> {
+            runInFX(() -> onFailure(msg));
         });
     }
 

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

@@ -41,7 +41,6 @@ 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;
@@ -165,8 +164,6 @@ 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) {
@@ -430,25 +427,23 @@ public final class TaskListPane extends StackPane {
 
             // CHECKSTYLE:OFF
             // @formatter:off
-            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);
-            };
+            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;
+            }
             // @formatter:on
             // CHECKSTYLE:ON
 

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

@@ -44,9 +44,6 @@ 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) {
@@ -62,7 +59,7 @@ public class TwoLineListItem extends VBox {
         HBox firstLine = new HBox();
         firstLine.getStyleClass().add("first-line");
 
-        lblTitle = new Label();
+        Label lblTitle = new Label();
         lblTitle.getStyleClass().add("title");
         lblTitle.textProperty().bind(title);
 
@@ -71,7 +68,7 @@ public class TwoLineListItem extends VBox {
         firstLineChildren.appendList(tags);
         Bindings.bindContent(firstLine.getChildren(), firstLineChildren.getAggregatedList());
 
-        lblSubtitle = new Label();
+        Label lblSubtitle = new Label();
         lblSubtitle.getStyleClass().add("subtitle");
         lblSubtitle.textProperty().bind(subtitle);
 
@@ -112,14 +109,6 @@ 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/DecoratorSkin.java

@@ -328,18 +328,6 @@ 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,11 +38,9 @@ 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;
@@ -58,15 +56,8 @@ public abstract class AbstractInstallersPage extends Control implements WizardPa
             String libraryId = library.getLibraryId();
             if (libraryId.equals(LibraryAnalyzer.LibraryType.MINECRAFT.getPatchId())) continue;
             library.setOnInstall(() -> {
-                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 (LibraryAnalyzer.LibraryType.FABRIC_API.getPatchId().equals(libraryId)) {
+                    Controllers.dialog(i18n("install.installer.fabric-api.warning"), i18n("message.warning"), MessageDialogPane.MessageType.WARNING);
                 }
 
                 if (!(library.resolvedStateProperty().get() instanceof InstallerItem.IncompatibleState))

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

@@ -134,7 +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, handler) -> {
+        Controllers.prompt(i18n("archive.file.name"), (result, resolve, reject) -> {
             Path dest = runDirectory.resolve(subdirectoryName).resolve(result);
 
             Controllers.taskDialog(Task.composeAsync(() -> {
@@ -152,7 +152,7 @@ public class DownloadPage extends DecoratorAnimatedPage implements DecoratorPage
                     Controllers.showToast(i18n("install.success"));
                 }
             }), i18n("message.downloading"), TaskCancellationAction.NORMAL);
-            handler.resolve();
+            resolve.run();
         }, file.getFile().getFilename(), new Validator(i18n("install.new_game.malformed"), FileUtils::isNameValid));
 
     }

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

@@ -121,20 +121,32 @@ public class InstallersPage extends AbstractInstallersPage {
 
             LibraryAnalyzer.LibraryType libraryType = LibraryAnalyzer.LibraryType.fromPatchId(libraryId);
             if (libraryType != null) {
-                String loaderName = switch (libraryType) {
-                    case FORGE -> i18n("install.installer.forge");
-                    case NEO_FORGE -> i18n("install.installer.neoforge");
-                    case CLEANROOM -> i18n("install.installer.cleanroom");
-                    case LEGACY_FABRIC -> i18n("install.installer.legacyfabric").replace(" ", "_");
-                    case FABRIC -> i18n("install.installer.fabric");
-                    case LITELOADER -> i18n("install.installer.liteloader");
-                    case QUILT -> i18n("install.installer.quilt");
-                    case OPTIFINE -> i18n("install.installer.optifine");
-                    default -> null;
-                };
-
-                if (loaderName == null)
-                    continue;
+                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;
+                }
 
                 nameBuilder.append("-").append(loaderName);
             }

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

@@ -124,45 +124,45 @@ public final class ModpackSelectionPage extends VBox implements WizardPage {
     }
 
     private void onChooseRemoteFile() {
-        Controllers.prompt(i18n("modpack.choose.remote.tooltip"), (url, handler) -> {
+        Controllers.prompt(i18n("modpack.choose.remote.tooltip"), (url, resolve, reject) -> {
             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) {
-                            handler.reject(i18n("modpack.type.server.malformed"));
+                            reject.accept(i18n("modpack.type.server.malformed"));
                         } else if (e == null) {
-                            handler.resolve();
+                            resolve.run();
                             controller.getSettings().put(MODPACK_SERVER_MANIFEST, manifest);
                             controller.onNext();
                         } else {
-                            handler.reject(e.getMessage());
+                            reject.accept(e.getMessage());
                         }
-                    }).executor(true), i18n("message.downloading"), TaskCancellationAction.NORMAL);
+                    }), 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");
-                    handler.resolve();
+                    resolve.run();
 
                     Controllers.taskDialog(
                             new FileDownloadTask(url, modpack)
                                     .whenComplete(Schedulers.javafx(), e -> {
                                         if (e == null) {
-                                            handler.resolve();
+                                            resolve.run();
                                             controller.getSettings().put(MODPACK_FILE, modpack);
                                             controller.onNext();
                                         } else {
-                                            handler.reject(e.getMessage());
+                                            reject.accept(e.getMessage());
                                         }
-                                    }).executor(true),
+                                    }),
                             i18n("message.downloading"),
                             TaskCancellationAction.NORMAL
                     );
                 }
             } catch (IOException e) {
-                handler.reject(e.getMessage());
+                reject.accept(e.getMessage());
             }
         }, "", new URLValidator());
     }

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

@@ -38,8 +38,6 @@ import org.jackhuang.hmcl.download.fabric.FabricAPIRemoteVersion;
 import org.jackhuang.hmcl.download.fabric.FabricRemoteVersion;
 import org.jackhuang.hmcl.download.forge.ForgeRemoteVersion;
 import org.jackhuang.hmcl.download.game.GameRemoteVersion;
-import org.jackhuang.hmcl.download.legacyfabric.LegacyFabricAPIRemoteVersion;
-import org.jackhuang.hmcl.download.legacyfabric.LegacyFabricRemoteVersion;
 import org.jackhuang.hmcl.download.liteloader.LiteLoaderRemoteVersion;
 import org.jackhuang.hmcl.download.neoforge.NeoForgeRemoteVersion;
 import org.jackhuang.hmcl.download.optifine.OptiFineRemoteVersion;
@@ -272,8 +270,6 @@ public final class VersionsPage extends Control implements WizardPage, Refreshab
                     iconType = VersionIconType.CLEANROOM;
                 else if (remoteVersion instanceof NeoForgeRemoteVersion)
                     iconType = VersionIconType.NEO_FORGE;
-                else if (remoteVersion instanceof LegacyFabricRemoteVersion || remoteVersion instanceof LegacyFabricAPIRemoteVersion)
-                    iconType = VersionIconType.LEGACY_FABRIC;
                 else if (remoteVersion instanceof FabricRemoteVersion || remoteVersion instanceof FabricAPIRemoteVersion)
                     iconType = VersionIconType.FABRIC;
                 else if (remoteVersion instanceof QuiltRemoteVersion || remoteVersion instanceof QuiltAPIRemoteVersion)

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

@@ -22,10 +22,10 @@ import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.mod.ModAdviser;
 import org.jackhuang.hmcl.mod.ModpackExportInfo;
 import org.jackhuang.hmcl.mod.mcbbs.McbbsModpackExportTask;
-import org.jackhuang.hmcl.mod.modrinth.ModrinthModpackExportTask;
 import org.jackhuang.hmcl.mod.multimc.MultiMCInstanceConfiguration;
 import org.jackhuang.hmcl.mod.multimc.MultiMCModpackExportTask;
 import org.jackhuang.hmcl.mod.server.ServerModpackExportTask;
+import org.jackhuang.hmcl.mod.modrinth.ModrinthModpackExportTask;
 import org.jackhuang.hmcl.setting.Config;
 import org.jackhuang.hmcl.setting.FontManager;
 import org.jackhuang.hmcl.setting.Profile;
@@ -41,9 +41,7 @@ import org.jackhuang.hmcl.util.io.Zipper;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 
@@ -134,9 +132,7 @@ public final class ExportWizardProvider implements WizardProvider {
                     exported.getAuthlibInjectorServers().setAll(config().getAuthlibInjectorServers());
 
                     zip.putTextFile(exported.toJson(), ".hmcl/hmcl.json");
-                    zip.putFile(tempModpack, ModpackTypeSelectionPage.MODPACK_TYPE_MODRINTH.equals(modpackType)
-                            ? "modpack.mrpack"
-                            : "modpack.zip");
+                    zip.putFile(tempModpack, "modpack.zip");
 
                     Path bg = Metadata.HMCL_CURRENT_DIRECTORY.resolve("background");
                     if (!Files.isDirectory(bg))
@@ -267,10 +263,10 @@ public final class ExportWizardProvider implements WizardProvider {
             @Override
             public void execute() {
                 dependency = new ModrinthModpackExportTask(
-                        profile.getRepository(),
-                        version,
-                        exportInfo,
-                        modpackFile
+                    profile.getRepository(),
+                    version,
+                    exportInfo,
+                    modpackFile
                 );
             }
 

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

@@ -109,7 +109,7 @@ public final class ModpackInfoPage extends Control implements WizardPage {
     private void onNext() {
         FileChooser fileChooser = new FileChooser();
         fileChooser.setTitle(i18n("modpack.wizard.step.initialization.save"));
-        if (!packWithLauncher.get() && controller.getSettings().get(MODPACK_TYPE) == MODPACK_TYPE_MODRINTH) {
+        if (controller.getSettings().get(MODPACK_TYPE) == MODPACK_TYPE_MODRINTH) {
             fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("modpack"), "*.mrpack"));
             fileChooser.setInitialFileName(name.get() + (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS ? "" : ".mrpack"));
         } else {

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

@@ -38,10 +38,7 @@ import org.jackhuang.hmcl.game.GameJavaVersion;
 import org.jackhuang.hmcl.java.JavaInfo;
 import org.jackhuang.hmcl.java.JavaManager;
 import org.jackhuang.hmcl.setting.DownloadProviders;
-import org.jackhuang.hmcl.task.FileDownloadTask;
-import org.jackhuang.hmcl.task.GetTask;
-import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.task.*;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
@@ -119,7 +116,7 @@ public final class JavaDownloadDialog extends StackPane {
             vbox.getChildren().add(prompt);
 
             for (GameJavaVersion version : supportedGameJavaVersions) {
-                JFXRadioButton button = new JFXRadioButton("Java " + version.majorVersion());
+                JFXRadioButton button = new JFXRadioButton("Java " + version.getMajorVersion());
                 button.setUserData(version);
                 vbox.getChildren().add(button);
                 toggleGroup.getToggles().add(button);
@@ -251,7 +248,7 @@ public final class JavaDownloadDialog extends StackPane {
 
                 for (int i = 0; i < versions.size(); i++) {
                     DiscoJavaRemoteVersion version = versions.get(i);
-                    if (version.getJdkVersion() == GameJavaVersion.LATEST.majorVersion()) {
+                    if (version.getJdkVersion() == GameJavaVersion.LATEST.getMajorVersion()) {
                         remoteVersionBox.getSelectionModel().select(i);
                         return;
                     }

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

@@ -189,7 +189,6 @@ public final class JavaManagementPage extends ListPageBase<JavaRuntime> {
 
         JavaPageSkin(JavaManagementPage skinnable) {
             super(skinnable);
-            this.listView.getStyleClass().add("no-horizontal-scrollbar");
         }
 
         @Override
@@ -211,7 +210,7 @@ public final class JavaManagementPage extends ListPageBase<JavaRuntime> {
 
         @Override
         protected ListCell<JavaRuntime> createListCell(JFXListView<JavaRuntime> listView) {
-            return new JavaItemCell(listView);
+            return new JavaItemCell();
         }
     }
 
@@ -223,7 +222,7 @@ public final class JavaManagementPage extends ListPageBase<JavaRuntime> {
         private final StackPane removeIconPane;
         private final Tooltip removeTooltip = new Tooltip();
 
-        JavaItemCell(JFXListView<JavaRuntime> listView) {
+        JavaItemCell() {
             BorderPane root = new BorderPane();
 
             HBox center = new HBox();
@@ -273,8 +272,6 @@ public final class JavaManagementPage extends ListPageBase<JavaRuntime> {
             root.setPadding(new Insets(8));
 
             this.graphic = new RipplerContainer(root);
-
-            FXUtils.limitCellWidth(listView, this);
         }
 
         @Override

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

@@ -59,6 +59,7 @@ import org.jackhuang.hmcl.ui.animation.TransitionPane;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
 import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
+import org.jackhuang.hmcl.ui.versions.GameItem;
 import org.jackhuang.hmcl.ui.versions.GameListPopupMenu;
 import org.jackhuang.hmcl.ui.versions.Versions;
 import org.jackhuang.hmcl.upgrade.RemoteVersion;
@@ -153,13 +154,11 @@ public final class MainPage extends StackPane implements DecoratorPage {
             announcementCard.getStyleClass().addAll("card", "announcement");
 
             VBox announcementBox = new VBox(16);
-            announcementBox.setPadding(new Insets(15));
             announcementBox.getChildren().add(announcementCard);
 
             announcementPane = new TransitionPane();
             announcementPane.setContent(announcementBox, ContainerAnimations.NONE);
 
-            StackPane.setMargin(announcementPane, new Insets(-15));
             getChildren().add(announcementPane);
         }
 
@@ -247,14 +246,7 @@ public final class MainPage extends StackPane implements DecoratorPage {
 
             menuButton = new JFXButton();
             menuButton.getStyleClass().add("menu-button");
-            menuButton.setOnAction(e -> GameListPopupMenu.show(
-                    menuButton,
-                    JFXPopup.PopupVPosition.BOTTOM,
-                    JFXPopup.PopupHPosition.RIGHT,
-                    0,
-                    -menuButton.getHeight(),
-                    profile, versions
-            ));
+            menuButton.setOnAction(e -> onMenu());
             FXUtils.installFastTooltip(menuButton, i18n("version.switch"));
             menuButton.setGraphic(SVG.ARROW_DROP_UP.createIcon(30));
 
@@ -350,6 +342,19 @@ public final class MainPage extends StackPane implements DecoratorPage {
         Controllers.taskDialog(task, i18n("version.launch.empty.installing"), TaskCancellationAction.NORMAL);
     }
 
+    private void onMenu() {
+        GameListPopupMenu menu = new GameListPopupMenu();
+        menu.getItems().setAll(versions.stream().map(it -> new GameItem(profile, it.getId())).toList());
+        JFXPopup popup = new JFXPopup(menu);
+        popup.show(
+                menuButton,
+                JFXPopup.PopupVPosition.BOTTOM,
+                JFXPopup.PopupHPosition.RIGHT,
+                0,
+                -menuButton.getHeight()
+        );
+    }
+
     private void onUpgrade() {
         RemoteVersion target = UpdateChecker.getLatestVersion();
         if (target == null) {

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

@@ -44,6 +44,7 @@ import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.javafx.SafeStringConverter;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
 
@@ -86,8 +87,11 @@ public class PersonalizationPage extends StackPane {
 
             brightnessPane.setLeft(left);
 
-            JFXComboBox<String> cboBrightness = new JFXComboBox<>();
-            cboBrightness.getItems().setAll("auto", "light", "dark");
+            JFXComboBox<String> cboBrightness = new JFXComboBox<>(FXCollections.observableArrayList(
+                    FXUtils.DARK_MODE != null
+                            ? List.of("auto", "light", "dark")
+                            : List.of("light", "dark")
+            ));
             cboBrightness.setConverter(FXUtils.stringConverter(name -> i18n("settings.launcher.brightness." + name)));
             cboBrightness.valueProperty().bindBidirectional(config().themeBrightnessProperty());
             brightnessPane.setRight(cboBrightness);

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

@@ -19,7 +19,10 @@ package org.jackhuang.hmcl.ui.main;
 
 import com.jfoenix.controls.JFXPopup;
 import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.scene.control.Label;
+import javafx.scene.input.MouseButton;
 import org.jackhuang.hmcl.Metadata;
+import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.event.EventBus;
 import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
 import org.jackhuang.hmcl.game.HMCLGameRepository;
@@ -35,18 +38,17 @@ import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.account.AccountAdvancedListItem;
-import org.jackhuang.hmcl.ui.account.AccountListPopupMenu;
 import org.jackhuang.hmcl.ui.animation.AnimationUtils;
 import org.jackhuang.hmcl.ui.construct.AdvancedListBox;
 import org.jackhuang.hmcl.ui.construct.AdvancedListItem;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
+import org.jackhuang.hmcl.ui.construct.PopupMenu;
 import org.jackhuang.hmcl.ui.decorator.DecoratorAnimatedPage;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
 import org.jackhuang.hmcl.ui.download.ModpackInstallWizardProvider;
 import org.jackhuang.hmcl.ui.nbt.NBTEditorPage;
 import org.jackhuang.hmcl.ui.nbt.NBTFileType;
 import org.jackhuang.hmcl.ui.versions.GameAdvancedListItem;
-import org.jackhuang.hmcl.ui.versions.GameListPopupMenu;
 import org.jackhuang.hmcl.ui.versions.Versions;
 import org.jackhuang.hmcl.upgrade.UpdateChecker;
 import org.jackhuang.hmcl.util.Lang;
@@ -65,7 +67,7 @@ import java.util.Locale;
 import java.util.stream.Collectors;
 
 import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
-import static org.jackhuang.hmcl.ui.FXUtils.wrap;
+import static org.jackhuang.hmcl.ui.versions.VersionPage.wrap;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 
@@ -146,7 +148,12 @@ public class RootPage extends DecoratorAnimatedPage implements DecoratorPage {
             // first item in left sidebar
             AccountAdvancedListItem accountListItem = new AccountAdvancedListItem();
             accountListItem.setOnAction(e -> Controllers.navigate(Controllers.getAccountListPage()));
-            FXUtils.onSecondaryButtonClicked(accountListItem, () -> AccountListPopupMenu.show(accountListItem, JFXPopup.PopupVPosition.TOP, JFXPopup.PopupHPosition.LEFT, accountListItem.getWidth(), 0));
+            accountListItem.setOnMouseClicked(e -> {
+                if (e.getButton() == MouseButton.SECONDARY) {
+                    showAccountListPopupMenu(accountListItem);
+                    e.consume();
+                }
+            });
             accountListItem.accountProperty().bind(Accounts.selectedAccountProperty());
 
             // second item in left sidebar
@@ -167,7 +174,6 @@ public class RootPage extends DecoratorAnimatedPage implements DecoratorPage {
             if (AnimationUtils.isAnimationEnabled()) {
                 FXUtils.prepareOnMouseEnter(gameListItem, Controllers::prepareVersionPage);
             }
-            FXUtils.onSecondaryButtonClicked(gameListItem, () -> showGameListPopupMenu(gameListItem));
 
             // third item in left sidebar
             AdvancedListItem gameItem = new AdvancedListItem();
@@ -175,7 +181,6 @@ public class RootPage extends DecoratorAnimatedPage implements DecoratorPage {
             gameItem.setActionButtonVisible(false);
             gameItem.setTitle(i18n("version.manage"));
             gameItem.setOnAction(e -> Controllers.navigate(Controllers.getGameListPage()));
-            FXUtils.onSecondaryButtonClicked(gameItem, () -> showGameListPopupMenu(gameItem));
 
             // forth item in left sidebar
             AdvancedListItem downloadItem = new AdvancedListItem();
@@ -249,14 +254,34 @@ public class RootPage extends DecoratorAnimatedPage implements DecoratorPage {
             setCenter(getSkinnable().getMainPage());
         }
 
-        public void showGameListPopupMenu(AdvancedListItem gameListItem) {
-            GameListPopupMenu.show(gameListItem,
-                    JFXPopup.PopupVPosition.TOP,
-                    JFXPopup.PopupHPosition.LEFT,
-                    gameListItem.getWidth(),
-                    0,
-                    getSkinnable().getMainPage().getProfile(),
-                    getSkinnable().getMainPage().getVersions());
+        public void showAccountListPopupMenu(
+                AccountAdvancedListItem accountListItem
+        ) {
+            PopupMenu popupMenu = new PopupMenu();
+            JFXPopup popup = new JFXPopup(popupMenu);
+            AdvancedListBox scrollPane = new AdvancedListBox();
+            scrollPane.getStyleClass().add("no-padding");
+            scrollPane.setPrefWidth(220);
+            scrollPane.setPrefHeight(-1);
+            scrollPane.setMaxHeight(260);
+
+            if (Accounts.getAccounts().isEmpty()) {
+                Label placeholder = new Label(i18n("account.empty"));
+                placeholder.setStyle("-fx-padding: 10px; -fx-text-fill: -monet-on-surface-variant; -fx-font-style: italic;");
+                scrollPane.add(placeholder);
+            } else {
+                for (Account account : Accounts.getAccounts()) {
+                    AccountAdvancedListItem item = new AccountAdvancedListItem(account);
+                    item.setOnAction(e -> {
+                        Accounts.setSelectedAccount(account);
+                        popup.hide();
+                    });
+                    scrollPane.add(item);
+                }
+            }
+
+            popupMenu.getContent().add(scrollPane);
+            popup.show(accountListItem, JFXPopup.PopupVPosition.TOP, JFXPopup.PopupHPosition.LEFT, accountListItem.getWidth(), 0);
         }
     }
 
@@ -268,21 +293,11 @@ public class RootPage extends DecoratorAnimatedPage implements DecoratorPage {
                 checkedModpack = true;
 
                 if (repository.getVersionCount() == 0) {
-                    Path zipModpack = Metadata.CURRENT_DIRECTORY.resolve("modpack.zip");
-                    Path mrpackModpack = Metadata.CURRENT_DIRECTORY.resolve("modpack.mrpack");
-
-                    Path modpackFile;
-                    if (Files.exists(zipModpack)) {
-                        modpackFile = zipModpack;
-                    } else if (Files.exists(mrpackModpack)) {
-                        modpackFile = mrpackModpack;
-                    } else {
-                        modpackFile = null;
-                    }
-
-                    if (modpackFile != null) {
+                    Path modpackFile = Metadata.CURRENT_DIRECTORY.resolve("modpack.zip");
+                    if (Files.exists(modpackFile)) {
                         Task.supplyAsync(() -> CompressingUtils.findSuitableEncoding(modpackFile))
-                                .thenApplyAsync(encoding -> ModpackHelper.readModpackManifest(modpackFile, encoding))
+                                .thenApplyAsync(
+                                        encoding -> ModpackHelper.readModpackManifest(modpackFile, encoding))
                                 .thenApplyAsync(modpack -> ModpackHelper
                                         .getInstallTask(repository.getProfile(), modpackFile, modpack.getName(), modpack, null)
                                         .executor())

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

@@ -63,7 +63,9 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
@@ -328,19 +330,6 @@ public final class SettingsPage extends ScrollPane {
         UpdateHandler.updateFrom(target);
     }
 
-    private static String getEntryName(Set<String> entryNames, String name) {
-        if (entryNames.add(name)) {
-            return name;
-        }
-
-        for (long i = 1; ; i++) {
-            String newName = name + "." + i;
-            if (entryNames.add(newName)) {
-                return newName;
-            }
-        }
-    }
-
     /// This method guarantees to close both `input` and the current zip entry.
     ///
     /// If no exception occurs, this method returns `true`;
@@ -400,8 +389,6 @@ public final class SettingsPage extends ScrollPane {
                     try (var os = Files.newOutputStream(outputFile);
                          var zos = new ZipOutputStream(os)) {
 
-                        Set<String> entryNames = new HashSet<>();
-
                         for (Path path : recentLogFiles) {
                             String fileName = FileUtils.getName(path);
                             String extension = StringUtils.substringAfterLast(fileName, '.');
@@ -423,7 +410,7 @@ public final class SettingsPage extends ScrollPane {
                                     input = null;
                                 }
 
-                                String entryName = getEntryName(entryNames, StringUtils.substringBeforeLast(fileName, "."));
+                                String entryName = StringUtils.substringBeforeLast(fileName, ".");
                                 if (input != null && exportLogFile(zos, path, entryName, input, buffer))
                                     continue;
                             }
@@ -440,10 +427,10 @@ public final class SettingsPage extends ScrollPane {
                                 continue;
                             }
 
-                            exportLogFile(zos, path, getEntryName(entryNames, fileName), input, buffer);
+                            exportLogFile(zos, path, fileName, input, buffer);
                         }
 
-                        zos.putNextEntry(new ZipEntry(getEntryName(entryNames, "hmcl-latest.log")));
+                        zos.putNextEntry(new ZipEntry("hmcl-latest.log"));
                         LOG.exportLogs(zos);
                         zos.closeEntry();
                     }

HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfileListItemSkin.java

@@ -28,6 +28,7 @@ import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.construct.RipplerContainer;
 import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
+import org.jackhuang.hmcl.ui.versions.VersionPage;
 
 public class ProfileListItemSkin extends SkinBase<ProfileListItem> {
     private final PseudoClass SELECTED = PseudoClass.getPseudoClass("selected");
@@ -46,7 +47,7 @@ public class ProfileListItemSkin extends SkinBase<ProfileListItem> {
 
         FXUtils.onClicked(getSkinnable(), () -> getSkinnable().setSelected(true));
 
-        Node left = FXUtils.wrap(SVG.FOLDER);
+        Node left = VersionPage.wrap(SVG.FOLDER);
         root.setLeft(left);
         BorderPane.setAlignment(left, Pos.CENTER_LEFT);
 

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

@@ -245,19 +245,19 @@ public class TerracottaControllerPage extends StackPane {
                 guest.setSubtitle(i18n("terracotta.status.waiting.guest.desc"));
                 guest.setRightIcon(SVG.ARROW_FORWARD);
                 FXUtils.onClicked(guest, () -> {
-                    Controllers.prompt(i18n("terracotta.status.waiting.guest.prompt.title"), (code, handler) -> {
+                    Controllers.prompt(i18n("terracotta.status.waiting.guest.prompt.title"), (code, resolve, reject) -> {
                         Task<TerracottaState.GuestConnecting> task = TerracottaManager.setGuesting(code);
                         if (task != null) {
                             task.whenComplete(Schedulers.javafx(), (s, e) -> {
                                 if (e != null) {
-                                    handler.reject(i18n("terracotta.status.waiting.guest.prompt.invalid"));
+                                    reject.accept(i18n("terracotta.status.waiting.guest.prompt.invalid"));
                                 } else {
-                                    handler.resolve();
+                                    resolve.run();
                                     UI_STATE.set(s);
                                 }
                             }).setSignificance(Task.TaskSignificance.MINOR).start();
                         } else {
-                            handler.resolve();
+                            resolve.run();
                         }
                     });
                 });

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

@@ -17,7 +17,6 @@
  */
 package org.jackhuang.hmcl.ui.terracotta;
 
-import com.jfoenix.controls.JFXPopup;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.beans.value.ChangeListener;
@@ -25,21 +24,17 @@ import javafx.geometry.Insets;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.setting.Accounts;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
 import org.jackhuang.hmcl.terracotta.TerracottaMetadata;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
-import org.jackhuang.hmcl.ui.account.AccountAdvancedListItem;
-import org.jackhuang.hmcl.ui.account.AccountListPopupMenu;
 import org.jackhuang.hmcl.ui.animation.TransitionPane;
 import org.jackhuang.hmcl.ui.construct.*;
 import org.jackhuang.hmcl.ui.decorator.DecoratorAnimatedPage;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
 import org.jackhuang.hmcl.ui.main.MainPage;
-import org.jackhuang.hmcl.ui.versions.GameListPopupMenu;
 import org.jackhuang.hmcl.ui.versions.Versions;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.StringUtils;
@@ -72,13 +67,7 @@ public class TerracottaPage extends DecoratorAnimatedPage implements DecoratorPa
                 .addNavigationDrawerTab(tab, statusPage, i18n("terracotta.status"), SVG.TUNE);
         left.setTop(sideBar);
 
-        AccountAdvancedListItem accountListItem = new AccountAdvancedListItem();
-        accountListItem.setOnAction(e -> Controllers.navigate(Controllers.getAccountListPage()));
-        accountListItem.accountProperty().bind(Accounts.selectedAccountProperty());
-        FXUtils.onSecondaryButtonClicked(accountListItem, () -> AccountListPopupMenu.show(accountListItem, JFXPopup.PopupVPosition.BOTTOM, JFXPopup.PopupHPosition.LEFT, accountListItem.getWidth(), 0));
-
         AdvancedListBox toolbar = new AdvancedListBox()
-                .add(accountListItem)
                 .addNavigationDrawerItem(i18n("version.launch"), SVG.ROCKET_LAUNCH, () -> {
                     Profile profile = Profiles.getSelectedProfile();
                     Versions.launch(profile, profile.getSelectedVersion(), launcherHelper -> {
@@ -95,13 +84,6 @@ public class TerracottaPage extends DecoratorAnimatedPage implements DecoratorPa
                         String currentId = mainPage.getCurrentGame();
                         return Lang.indexWhere(list, instance -> instance.getId().equals(currentId));
                     }, it -> mainPage.getProfile().setSelectedVersion(it.getId()));
-
-                    FXUtils.onSecondaryButtonClicked(item, () -> GameListPopupMenu.show(item,
-                            JFXPopup.PopupVPosition.BOTTOM,
-                            JFXPopup.PopupHPosition.LEFT,
-                            item.getWidth(),
-                            0,
-                            mainPage.getProfile(), mainPage.getVersions()));
                 })
                 .addNavigationDrawerItem(i18n("terracotta.feedback.title"), SVG.FEEDBACK, () -> FXUtils.openLink(TerracottaMetadata.FEEDBACK_LINK));
         BorderPane.setMargin(toolbar, new Insets(0, 0, 12, 0));

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

@@ -17,8 +17,10 @@
  */
 package org.jackhuang.hmcl.ui.versions;
 
-import com.jfoenix.controls.*;
-import com.jfoenix.effects.JFXDepthManager;
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXComboBox;
+import com.jfoenix.controls.JFXListView;
+import com.jfoenix.controls.JFXTextField;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.ObjectBinding;
 import javafx.beans.property.*;
@@ -28,9 +30,11 @@ import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
-import javafx.scene.Cursor;
 import javafx.scene.Node;
-import javafx.scene.control.*;
+import javafx.scene.control.Control;
+import javafx.scene.control.Label;
+import javafx.scene.control.Skin;
+import javafx.scene.control.SkinBase;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.KeyCode;
@@ -48,7 +52,7 @@ import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.WeakListenerHolder;
-import org.jackhuang.hmcl.ui.construct.RipplerContainer;
+import org.jackhuang.hmcl.ui.construct.FloatListCell;
 import org.jackhuang.hmcl.ui.construct.SpinnerPane;
 import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
@@ -521,65 +525,46 @@ public class DownloadListPage extends Control implements DecoratorPage, VersionP
 
                 spinnerPane.setContent(listView);
                 Bindings.bindContent(listView.getItems(), getSkinnable().items);
-                listView.setSelectionModel(null);
+                FXUtils.onClicked(listView, () -> {
+                    if (listView.getSelectionModel().getSelectedIndex() < 0)
+                        return;
+                    RemoteMod selectedItem = listView.getSelectionModel().getSelectedItem();
+                    Controllers.navigate(new DownloadPage(getSkinnable(), selectedItem, getSkinnable().getProfileVersion(), getSkinnable().callback));
+                });
+
                 // ListViewBehavior would consume ESC pressed event, preventing us from handling it, so we ignore it here
                 ignoreEvent(listView, KeyEvent.KEY_PRESSED, e -> e.getCode() == KeyCode.ESCAPE);
 
-                listView.setCellFactory(x -> new ListCell<>() {
-                    private static final Insets PADDING = new Insets(9, 9, 0, 9);
-
-                    private final RipplerContainer graphic;
-
+                listView.setCellFactory(x -> new FloatListCell<>(listView) {
                     private final TwoLineListItem content = new TwoLineListItem();
                     private final ImageView imageView = new ImageView();
 
                     {
-                        setPadding(PADDING);
-
                         HBox container = new HBox(8);
-                        container.getStyleClass().add("card");
-                        container.setCursor(Cursor.HAND);
                         container.setAlignment(Pos.CENTER_LEFT);
-                        JFXDepthManager.setDepth(container, 1);
+                        pane.getChildren().add(container);
 
                         imageView.setFitWidth(40);
                         imageView.setFitHeight(40);
 
                         container.getChildren().setAll(FXUtils.limitingSize(imageView, 40, 40), content);
                         HBox.setHgrow(content, Priority.ALWAYS);
-
-                        this.graphic = new RipplerContainer(container);
-                        graphic.setPosition(JFXRippler.RipplerPos.FRONT);
-                        FXUtils.onClicked(graphic, () -> {
-                            RemoteMod item = getItem();
-                            if (item != null)
-                                Controllers.navigate(new DownloadPage(getSkinnable(), item, getSkinnable().getProfileVersion(), getSkinnable().callback));
-                        });
-
-                        setPrefWidth(0);
-
-                        FXUtils.limitCellWidth(listView, this);
-
                     }
 
                     @Override
-                    protected void updateItem(RemoteMod item, boolean empty) {
-                        super.updateItem(item, empty);
-                        if (empty || item == null) {
-                            setGraphic(null);
-                        } else {
-                            ModTranslations.Mod mod = ModTranslations.getTranslationsByRepositoryType(getSkinnable().repository.getType()).getModByCurseForgeId(item.getSlug());
-                            content.setTitle(mod != null && I18n.isUseChinese() ? mod.getDisplayName() : item.getTitle());
-                            content.setSubtitle(item.getDescription());
-                            content.getTags().clear();
-                            for (String category : item.getCategories()) {
-                                if (getSkinnable().shouldDisplayCategory(category))
-                                    content.addTag(getSkinnable().getLocalizedCategory(category));
-                            }
-                            iconLoader.load(imageView.imageProperty(), item.getIconUrl());
-                            setGraphic(graphic);
+                    protected void updateControl(RemoteMod dataItem, boolean empty) {
+                        if (empty) return;
+                        ModTranslations.Mod mod = ModTranslations.getTranslationsByRepositoryType(getSkinnable().repository.getType()).getModByCurseForgeId(dataItem.getSlug());
+                        content.setTitle(mod != null && I18n.isUseChinese() ? mod.getDisplayName() : dataItem.getTitle());
+                        content.setSubtitle(dataItem.getDescription());
+                        content.getTags().clear();
+                        for (String category : dataItem.getCategories()) {
+                            if (getSkinnable().shouldDisplayCategory(category))
+                                content.addTag(getSkinnable().getLocalizedCategory(category));
                         }
+                        iconLoader.load(imageView.imageProperty(), dataItem.getIconUrl());
                     }
+
                 });
             }
 

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

@@ -230,7 +230,6 @@ public class DownloadPage extends Control implements DecoratorPage {
                 ModTranslations.Mod mod = getSkinnable().translations.getModByCurseForgeId(getSkinnable().addon.getSlug());
                 content.setTitle(mod != null && I18n.isUseChinese() ? mod.getDisplayName() : getSkinnable().addon.getTitle());
                 content.setSubtitle(getSkinnable().addon.getDescription());
-                content.getSubtitleLabel().setWrapText(true);
                 getSkinnable().addon.getCategories().stream()
                         .map(category -> getSkinnable().page.getLocalizedCategory(category))
                         .forEach(content::addTag);

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

@@ -70,7 +70,7 @@ public class GameListPage extends DecoratorAnimatedPage implements DecoratorPage
                 addProfileItem.getStyleClass().add("navigation-drawer-item");
                 addProfileItem.setTitle(i18n("profile.new"));
                 addProfileItem.setActionButtonVisible(false);
-                addProfileItem.setLeftGraphic(FXUtils.wrap(SVG.ADD_CIRCLE));
+                addProfileItem.setLeftGraphic(VersionPage.wrap(SVG.ADD_CIRCLE));
                 addProfileItem.setOnAction(e -> Controllers.navigate(new ProfilePage(null)));
 
                 pane.setFitToWidth(true);

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

@@ -26,7 +26,6 @@ import javafx.beans.property.StringProperty;
 import javafx.collections.ObservableList;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
-import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
@@ -35,29 +34,15 @@ import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
-import org.jackhuang.hmcl.game.Version;
-import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.construct.RipplerContainer;
 import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
 import org.jackhuang.hmcl.util.StringUtils;
 
-import java.util.List;
-
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 /// @author Glavo
 public final class GameListPopupMenu extends StackPane {
-
-    public static void show(Node owner, JFXPopup.PopupVPosition vAlign, JFXPopup.PopupHPosition hAlign,
-                            double initOffsetX, double initOffsetY,
-                            Profile profile, List<Version> versions) {
-        GameListPopupMenu menu = new GameListPopupMenu();
-        menu.getItems().setAll(versions.stream().map(it -> new GameItem(profile, it.getId())).toList());
-        JFXPopup popup = new JFXPopup(menu);
-        popup.show(owner, vAlign, hAlign, initOffsetX, initOffsetY);
-    }
-
     private final JFXListView<GameItem> listView = new JFXListView<>();
     private final BooleanBinding isEmpty = Bindings.isEmpty(listView.getItems());
 

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

@@ -76,12 +76,12 @@ public class InstallerListPage extends ListPageBase<InstallerItem> implements Ve
 
             InstallerItem.InstallerItemGroup group = new InstallerItem.InstallerItemGroup(gameVersion, InstallerItem.Style.LIST_ITEM);
 
-            // Conventional libraries: game, fabric, legacyfabric, forge, cleanroom, neoforge, liteloader, optifine
+            // Conventional libraries: game, fabric, forge, cleanroom, neoforge, liteloader, optifine
             for (InstallerItem item : group.getLibraries()) {
                 String libraryId = item.getLibraryId();
 
-                // Skip fabric-api and quilt-api and legacyfabric-api
-                if (libraryId.endsWith("-api")) {
+                // Skip fabric-api and quilt-api
+                if (libraryId.contains("fabric-api") || libraryId.contains("quilt-api")) {
                     continue;
                 }
 

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

@@ -19,45 +19,34 @@ package org.jackhuang.hmcl.ui.versions;
 
 import org.jackhuang.hmcl.mod.LocalModFile;
 import org.jackhuang.hmcl.mod.RemoteMod;
-import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 
-import java.io.IOException;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-
-import static org.jackhuang.hmcl.util.logging.Logger.LOG;
+import java.util.*;
+import java.util.stream.Collectors;
 
 public class ModCheckUpdatesTask extends Task<List<LocalModFile.ModUpdate>> {
-    private final List<Task<LocalModFile.ModUpdate>> dependents;
+    private final String gameVersion;
+    private final Collection<LocalModFile> mods;
+    private final Collection<Collection<Task<LocalModFile.ModUpdate>>> dependents;
 
     public ModCheckUpdatesTask(String gameVersion, Collection<LocalModFile> mods) {
-        dependents = mods.stream().map(mod ->
-                Task.supplyAsync(Schedulers.io(), () -> {
-                    LocalModFile.ModUpdate candidate = null;
-                    for (RemoteMod.Type type : RemoteMod.Type.values()) {
-                        LocalModFile.ModUpdate update = null;
-                        try {
-                            update = mod.checkUpdates(gameVersion, type.getRemoteModRepository());
-                        } catch (IOException e) {
-                            LOG.warning(String.format("Cannot check update for mod %s.", mod.getFileName()), e);
-                        }
-                        if (update == null) {
-                            continue;
-                        }
+        this.gameVersion = gameVersion;
+        this.mods = mods;
 
-                        if (candidate == null || candidate.getCandidate().getDatePublished().isBefore(update.getCandidate().getDatePublished())) {
-                            candidate = update;
-                        }
-                    }
-
-                    return candidate;
-                }).setName(mod.getFileName()).setSignificance(TaskSignificance.MAJOR).withCounter("update.checking")
-        ).toList();
+        dependents = mods.stream()
+                .map(mod ->
+                        Arrays.stream(RemoteMod.Type.values())
+                                .map(type ->
+                                        Task.supplyAsync(() -> mod.checkUpdates(gameVersion, type.getRemoteModRepository()))
+                                                .setSignificance(TaskSignificance.MAJOR)
+                                                .setName(String.format("%s (%s)", mod.getFileName(), type.name())).withCounter("update.checking")
+                                )
+                                .collect(Collectors.toList())
+                )
+                .collect(Collectors.toList());
 
         setStage("update.checking");
-        getProperties().put("total", dependents.size());
+        getProperties().put("total", dependents.size() * RemoteMod.Type.values().length);
     }
 
     @Override
@@ -72,7 +61,7 @@ public class ModCheckUpdatesTask extends Task<List<LocalModFile.ModUpdate>> {
 
     @Override
     public Collection<? extends Task<?>> getDependents() {
-        return dependents;
+        return dependents.stream().flatMap(Collection::stream).collect(Collectors.toList());
     }
 
     @Override
@@ -83,7 +72,14 @@ public class ModCheckUpdatesTask extends Task<List<LocalModFile.ModUpdate>> {
     @Override
     public void execute() throws Exception {
         setResult(dependents.stream()
-                .map(Task::getResult)
-                .filter(Objects::nonNull).toList());
+                .map(tasks -> tasks.stream()
+                        .filter(task -> task.getResult() != null)
+                        .map(Task::getResult)
+                        .filter(modUpdate -> !modUpdate.getCandidates().isEmpty())
+                        .max(Comparator.comparing((LocalModFile.ModUpdate modUpdate) -> modUpdate.getCandidates().get(0).getDatePublished()))
+                        .orElse(null)
+                )
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList()));
     }
 }

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

@@ -152,10 +152,6 @@ public final class ModListPage extends ListPageBase<ModListPageSkin.ModInfoObjec
             supportedLoaders.add(ModLoaderType.FABRIC);
         }
 
-        if (analyzer.has(LibraryAnalyzer.LibraryType.LEGACY_FABRIC)) {
-            supportedLoaders.add(ModLoaderType.FABRIC);
-        }
-
         if (analyzer.has(LibraryAnalyzer.LibraryType.FABRIC) && modManager.hasMod("kilt", ModLoaderType.FABRIC)) {
             supportedLoaders.add(ModLoaderType.FORGE);
             supportedLoaders.add(ModLoaderType.NEO_FORGED);

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

@@ -470,18 +470,29 @@ final class ModListPageSkin extends SkinBase<ModListPage> {
                             RemoteMod remoteMod = repository.getModById(versionOptional.get().getModid());
                             FXUtils.runInFX(() -> {
                                 for (ModLoaderType modLoaderType : versionOptional.get().getLoaders()) {
-                                    String loaderName = switch (modLoaderType) {
-                                        case FORGE -> i18n("install.installer.forge");
-                                        case CLEANROOM -> i18n("install.installer.cleanroom");
-                                        case LEGACY_FABRIC -> i18n("install.installer.legacyfabric");
-                                        case NEO_FORGED -> i18n("install.installer.neoforge");
-                                        case FABRIC -> i18n("install.installer.fabric");
-                                        case LITE_LOADER -> i18n("install.installer.liteloader");
-                                        case QUILT -> i18n("install.installer.quilt");
-                                        default -> null;
-                                    };
-                                    if (loaderName == null)
-                                        continue;
+                                    String loaderName;
+                                    switch (modLoaderType) {
+                                        case FORGE:
+                                            loaderName = i18n("install.installer.forge");
+                                            break;
+                                        case CLEANROOM:
+                                            loaderName = i18n("install.installer.cleanroom");
+                                            break;
+                                        case NEO_FORGED:
+                                            loaderName = i18n("install.installer.neoforge");
+                                            break;
+                                        case FABRIC:
+                                            loaderName = i18n("install.installer.fabric");
+                                            break;
+                                        case LITE_LOADER:
+                                            loaderName = i18n("install.installer.liteloader");
+                                            break;
+                                        case QUILT:
+                                            loaderName = i18n("install.installer.quilt");
+                                            break;
+                                        default:
+                                            continue;
+                                    }
                                     if (title.getTags()
                                             .stream()
                                             .noneMatch(it -> it.getText().equals(loaderName))) {
@@ -653,13 +664,24 @@ final class ModListPageSkin extends SkinBase<ModListPage> {
             } else if (!ModListPageSkin.this.getSkinnable().supportedLoaders.contains(modLoaderType)) {
                 warning.add(i18n("mods.warning.loader_mismatch"));
                 switch (dataItem.getModInfo().getModLoaderType()) {
-                    case FORGE -> content.addTagWarning(i18n("install.installer.forge"));
-                    case LEGACY_FABRIC -> content.addTagWarning(i18n("install.installer.legacyfabric"));
-                    case CLEANROOM -> content.addTagWarning(i18n("install.installer.cleanroom"));
-                    case NEO_FORGED -> content.addTagWarning(i18n("install.installer.neoforge"));
-                    case FABRIC -> content.addTagWarning(i18n("install.installer.fabric"));
-                    case LITE_LOADER -> content.addTagWarning(i18n("install.installer.liteloader"));
-                    case QUILT -> content.addTagWarning(i18n("install.installer.quilt"));
+                    case FORGE:
+                        content.addTagWarning(i18n("install.installer.forge"));
+                        break;
+                    case CLEANROOM:
+                        content.addTagWarning(i18n("install.installer.cleanroom"));
+                        break;
+                    case NEO_FORGED:
+                        content.addTagWarning(i18n("install.installer.neoforge"));
+                        break;
+                    case FABRIC:
+                        content.addTagWarning(i18n("install.installer.fabric"));
+                        break;
+                    case LITE_LOADER:
+                        content.addTagWarning(i18n("install.installer.liteloader"));
+                        break;
+                    case QUILT:
+                        content.addTagWarning(i18n("install.installer.quilt"));
+                        break;
                 }
             }
 

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

@@ -134,7 +134,7 @@ public class ModUpdatesPage extends BorderPane implements DecoratorPage {
                 modManager,
                 objects.stream()
                         .filter(o -> o.enabled.get())
-                        .map(object -> pair(object.data.getLocalMod(), object.data.getCandidate()))
+                        .map(object -> pair(object.data.getLocalMod(), object.data.getCandidates().get(0)))
                         .collect(Collectors.toList()));
         Controllers.taskDialog(
                 task.whenComplete(Schedulers.javafx(), exception -> {
@@ -203,7 +203,7 @@ public class ModUpdatesPage extends BorderPane implements DecoratorPage {
             enabled.set(!data.getLocalMod().getModManager().isDisabled(data.getLocalMod().getFile()));
             fileName.set(data.getLocalMod().getFileName());
             currentVersion.set(data.getCurrentVersion().getVersion());
-            targetVersion.set(data.getCandidate().getVersion());
+            targetVersion.set(data.getCandidates().get(0).getVersion());
             switch (data.getCurrentVersion().getSelf().getType()) {
                 case CURSEFORGE:
                     source.set(i18n("mods.curseforge"));

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

@@ -19,10 +19,8 @@ package org.jackhuang.hmcl.ui.versions;
 
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXDialogLayout;
-import com.jfoenix.controls.JFXListView;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
-import javafx.scene.Group;
 import javafx.scene.Node;
 import javafx.scene.control.*;
 import javafx.scene.image.Image;
@@ -32,7 +30,6 @@ import javafx.scene.image.WritableImage;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
-import javafx.scene.shape.SVGPath;
 import javafx.stage.FileChooser;
 import org.jackhuang.hmcl.schematic.LitematicFile;
 import org.jackhuang.hmcl.setting.Profile;
@@ -163,30 +160,30 @@ public final class SchematicsPage extends ListPageBase<SchematicsPage.Item> impl
         Controllers.dialog(new InputDialogPane(
                 i18n("schematics.create_directory.prompt"),
                 "",
-                (result, handler) -> {
+                (result, resolve, reject) -> {
                     if (StringUtils.isBlank(result)) {
-                        handler.reject(i18n("schematics.create_directory.failed.empty_name"));
+                        reject.accept(i18n("schematics.create_directory.failed.empty_name"));
                         return;
                     }
 
                     if (result.contains("/") || result.contains("\\") || !FileUtils.isNameValid(result)) {
-                        handler.reject(i18n("schematics.create_directory.failed.invalid_name"));
+                        reject.accept(i18n("schematics.create_directory.failed.invalid_name"));
                         return;
                     }
 
                     Path targetDir = parent.resolve(result);
                     if (Files.exists(targetDir)) {
-                        handler.reject(i18n("schematics.create_directory.failed.already_exists"));
+                        reject.accept(i18n("schematics.create_directory.failed.already_exists"));
                         return;
                     }
 
                     try {
                         Files.createDirectories(targetDir);
-                        handler.resolve();
+                        resolve.run();
                         refresh();
                     } catch (IOException e) {
                         LOG.warning("Failed to create directory: " + targetDir, e);
-                        handler.reject(i18n("schematics.create_directory.failed", targetDir));
+                        reject.accept(i18n("schematics.create_directory.failed", targetDir));
                     }
                 }));
     }
@@ -224,7 +221,7 @@ public final class SchematicsPage extends ListPageBase<SchematicsPage.Item> impl
         getItems().addAll(item.children);
     }
 
-    abstract sealed class Item implements Comparable<Item> {
+    abstract class Item extends Control implements Comparable<Item> {
 
         boolean isDirectory() {
             return this instanceof DirItem;
@@ -261,6 +258,11 @@ public final class SchematicsPage extends ListPageBase<SchematicsPage.Item> impl
 
             return this.getName().compareTo(o.getName());
         }
+
+        @Override
+        protected Skin<?> createDefaultSkin() {
+            return new ItemSkin(this);
+        }
     }
 
     private final class BackItem extends Item {
@@ -436,10 +438,6 @@ public final class SchematicsPage extends ListPageBase<SchematicsPage.Item> impl
             return SVG.SCHEMA;
         }
 
-        public @Nullable Image getImage() {
-            return image;
-        }
-
         Node getIcon(int size) {
             if (image == null) {
                 return super.getIcon(size);
@@ -542,122 +540,62 @@ public final class SchematicsPage extends ListPageBase<SchematicsPage.Item> impl
         }
     }
 
-    private static final class Cell extends ListCell<Item> {
+    private static final class ItemSkin extends SkinBase<Item> {
+        public ItemSkin(Item item) {
+            super(item);
 
-        private final RipplerContainer graphics;
-        private final BorderPane root;
-        private final StackPane left;
-        private final TwoLineListItem center;
-        private final HBox right;
-
-        private final ImageView iconImageView;
-        private final SVGPath iconSVG;
-        private final StackPane iconSVGWrapper;
-
-        private final Tooltip tooltip = new Tooltip();
-
-        public Cell() {
-            this.root = new BorderPane();
+            BorderPane root = new BorderPane();
             root.getStyleClass().add("md-list-cell");
             root.setPadding(new Insets(8));
 
             {
-                this.left = new StackPane();
+                StackPane left = new StackPane();
+                left.setMaxSize(32, 32);
+                left.setPrefSize(32, 32);
+                left.getChildren().add(item.getIcon(24));
                 left.setPadding(new Insets(0, 8, 0, 0));
 
-                this.iconImageView = new ImageView();
-                FXUtils.limitSize(iconImageView, 32, 32);
-
-                this.iconSVG = new SVGPath();
-                iconSVG.getStyleClass().add("svg");
-                iconSVG.setScaleX(32.0 / SVG.DEFAULT_SIZE);
-                iconSVG.setScaleY(32.0 / SVG.DEFAULT_SIZE);
-
-                this.iconSVGWrapper = new StackPane(new Group(iconSVG));
-                iconSVGWrapper.setAlignment(Pos.CENTER);
-                FXUtils.setLimitWidth(iconSVGWrapper, 32);
-                FXUtils.setLimitHeight(iconSVGWrapper, 32);
+                Path path = item.getPath();
+                if (path != null) {
+                    FXUtils.installSlowTooltip(left, path.toAbsolutePath().normalize().toString());
+                }
 
                 BorderPane.setAlignment(left, Pos.CENTER);
                 root.setLeft(left);
             }
 
             {
-                this.center = new TwoLineListItem();
+                TwoLineListItem center = new TwoLineListItem();
+                center.setTitle(item.getName());
+                center.setSubtitle(item.getDescription());
+
                 root.setCenter(center);
             }
 
-            {
-                this.right = new HBox(8);
+            if (!(item instanceof BackItem)) {
+                HBox right = new HBox(8);
                 right.setAlignment(Pos.CENTER_RIGHT);
 
                 JFXButton btnReveal = new JFXButton();
                 FXUtils.installFastTooltip(btnReveal, i18n("reveal.in_file_manager"));
                 btnReveal.getStyleClass().add("toggle-icon4");
                 btnReveal.setGraphic(SVG.FOLDER_OPEN.createIcon());
-                btnReveal.setOnAction(event -> {
-                    Item item = getItem();
-                    if (item != null && !(item instanceof BackItem))
-                        item.onReveal();
-                });
+                btnReveal.setOnAction(event -> item.onReveal());
 
                 JFXButton btnDelete = new JFXButton();
                 btnDelete.getStyleClass().add("toggle-icon4");
                 btnDelete.setGraphic(SVG.DELETE_FOREVER.createIcon());
-                btnDelete.setOnAction(event -> {
-                    Item item = getItem();
-                    if (item != null && !(item instanceof BackItem)) {
+                btnDelete.setOnAction(event ->
                         Controllers.confirm(i18n("button.remove.confirm"), i18n("button.remove"),
-                                item::onDelete, null);
-                    }
-                });
+                                item::onDelete, null));
 
                 right.getChildren().setAll(btnReveal, btnDelete);
+                root.setRight(right);
             }
 
-            this.graphics = new RipplerContainer(root);
-            FXUtils.onClicked(graphics, () -> {
-                Item item = getItem();
-                if (item != null)
-                    item.onClick();
-            });
-        }
-
-        @Override
-        protected void updateItem(Item item, boolean empty) {
-            super.updateItem(item, empty);
-
-            iconImageView.setImage(null);
-
-            if (empty || item == null) {
-                setGraphic(null);
-                center.setTitle("");
-                center.setSubtitle("");
-            } else {
-                if (item instanceof LitematicFileItem fileItem && fileItem.getImage() != null) {
-                    iconImageView.setImage(fileItem.getImage());
-                    left.getChildren().setAll(iconImageView);
-                } else {
-                    iconSVG.setContent(item.getIcon().getPath());
-                    left.getChildren().setAll(iconSVGWrapper);
-                }
-
-                center.setTitle(item.getName());
-                center.setSubtitle(item.getDescription());
-
-                Path path = item.getPath();
-                if (path != null) {
-                    tooltip.setText(FileUtils.getAbsolutePath(path));
-                    FXUtils.installSlowTooltip(left, tooltip);
-                } else {
-                    tooltip.setText("");
-                    Tooltip.uninstall(left, tooltip);
-                }
-
-                root.setRight(item instanceof BackItem ? null : right);
-
-                setGraphic(graphics);
-            }
+            RipplerContainer container = new RipplerContainer(root);
+            FXUtils.onClicked(container, item::onClick);
+            this.getChildren().add(container);
         }
     }
 
@@ -674,10 +612,5 @@ public final class SchematicsPage extends ListPageBase<SchematicsPage.Item> impl
                     createToolbarButton2(i18n("schematics.create_directory"), SVG.CREATE_NEW_FOLDER, skinnable::onCreateDirectory)
             );
         }
-
-        @Override
-        protected ListCell<Item> createListCell(JFXListView<Item> listView) {
-            return new Cell();
-        }
     }
 }

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

@@ -64,7 +64,6 @@ public class VersionIconDialog extends DialogPane {
                 createIcon(VersionIconType.OPTIFINE),
                 createIcon(VersionIconType.CRAFT_TABLE),
                 createIcon(VersionIconType.FABRIC),
-                createIcon(VersionIconType.LEGACY_FABRIC),
                 createIcon(VersionIconType.FORGE),
                 createIcon(VersionIconType.CLEANROOM),
                 createIcon(VersionIconType.NEO_FORGE),

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

@@ -21,8 +21,11 @@ import com.jfoenix.controls.JFXPopup;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.*;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.layout.Priority;
+import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import org.jackhuang.hmcl.event.EventBus;
 import org.jackhuang.hmcl.event.EventPriority;
@@ -302,6 +305,20 @@ public class VersionPage extends DecoratorAnimatedPage implements DecoratorPage
         }
     }
 
+    public static Node wrap(Node node) {
+        StackPane stackPane = new StackPane();
+        stackPane.setAlignment(Pos.CENTER);
+        FXUtils.setLimitWidth(stackPane, 30);
+        FXUtils.setLimitHeight(stackPane, 20);
+        stackPane.setPadding(new Insets(0, 0, 0, 0));
+        stackPane.getChildren().setAll(node);
+        return stackPane;
+    }
+
+    public static Node wrap(SVG svg) {
+        return wrap(svg.createIcon(20));
+    }
+
     public interface VersionLoadable {
         void loadVersion(Profile profile, String version);
     }

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

@@ -42,7 +42,10 @@ import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.WeakListenerHolder;
 import org.jackhuang.hmcl.ui.construct.*;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
-import org.jackhuang.hmcl.util.*;
+import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.Pair;
+import org.jackhuang.hmcl.util.ServerAddress;
+import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.javafx.BindingMapping;
 import org.jackhuang.hmcl.util.javafx.PropertyUtils;
 import org.jackhuang.hmcl.util.javafx.SafeStringConverter;
@@ -53,18 +56,34 @@ import org.jackhuang.hmcl.util.platform.SystemInfo;
 import org.jackhuang.hmcl.util.platform.hardware.PhysicalMemoryStatus;
 import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
 
-import java.lang.ref.WeakReference;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static org.jackhuang.hmcl.ui.FXUtils.stringConverter;
 import static org.jackhuang.hmcl.util.DataSizeUnit.GIGABYTES;
 import static org.jackhuang.hmcl.util.DataSizeUnit.MEGABYTES;
+import static org.jackhuang.hmcl.util.Lang.getTimer;
 import static org.jackhuang.hmcl.util.Pair.pair;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class VersionSettingsPage extends StackPane implements DecoratorPage, VersionPage.VersionLoadable, PageAware {
 
+    private static final ObjectProperty<PhysicalMemoryStatus> memoryStatus = new SimpleObjectProperty<>(PhysicalMemoryStatus.INVALID);
+    private static TimerTask memoryStatusUpdateTask;
+
+    private static void initMemoryStatusUpdateTask() {
+        FXUtils.checkFxUserThread();
+        if (memoryStatusUpdateTask != null)
+            return;
+        memoryStatusUpdateTask = new TimerTask() {
+            @Override
+            public void run() {
+                Platform.runLater(() -> memoryStatus.set(SystemInfo.getPhysicalMemoryStatus()));
+            }
+        };
+        getTimer().scheduleAtFixedRate(memoryStatusUpdateTask, 0, 1000);
+    }
+
     private final ReadOnlyObjectWrapper<State> state = new ReadOnlyObjectWrapper<>(new State("", null, false, false, false));
 
     private AdvancedVersionSettingPage advancedVersionSettingPage;
@@ -108,8 +127,6 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
     private final IntegerProperty maxMemory = new SimpleIntegerProperty();
     private final BooleanProperty modpack = new SimpleBooleanProperty();
 
-    private final ReadOnlyObjectProperty<PhysicalMemoryStatus> memoryStatus = UpdateMemoryStatus.memoryStatusProperty();
-
     public VersionSettingsPage(boolean globalSetting) {
         ScrollPane scrollPane = new ScrollPane();
         scrollPane.setFitToHeight(true);
@@ -493,7 +510,10 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
         cboProcessPriority.getItems().setAll(ProcessPriority.values());
         cboProcessPriority.setConverter(stringConverter(e -> i18n("settings.advanced.process_priority." + e.name().toLowerCase(Locale.ROOT))));
 
+        memoryStatus.set(SystemInfo.getPhysicalMemoryStatus());
         componentList.disableProperty().bind(enableSpecificSettings.not());
+
+        initMemoryStatusUpdateTask();
     }
 
     @Override
@@ -789,58 +809,4 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
     public ReadOnlyObjectProperty<State> stateProperty() {
         return state.getReadOnlyProperty();
     }
-
-    private static final class UpdateMemoryStatus extends Thread {
-
-        @FXThread
-        private static WeakReference<ObjectProperty<PhysicalMemoryStatus>> memoryStatusPropertyCache;
-
-        @FXThread
-        static ReadOnlyObjectProperty<PhysicalMemoryStatus> memoryStatusProperty() {
-            if (memoryStatusPropertyCache != null) {
-                var property = memoryStatusPropertyCache.get();
-                if (property != null) {
-                    return property;
-                }
-            }
-
-            ObjectProperty<PhysicalMemoryStatus> property = new SimpleObjectProperty<>(PhysicalMemoryStatus.INVALID);
-            memoryStatusPropertyCache = new WeakReference<>(property);
-            new UpdateMemoryStatus(memoryStatusPropertyCache).start();
-            return property;
-        }
-
-        private final WeakReference<ObjectProperty<PhysicalMemoryStatus>> memoryStatusPropertyRef;
-
-        UpdateMemoryStatus(WeakReference<ObjectProperty<PhysicalMemoryStatus>> memoryStatusPropertyRef) {
-            this.memoryStatusPropertyRef = memoryStatusPropertyRef;
-
-            setName("UpdateMemoryStatus");
-            setDaemon(true);
-            setPriority(Thread.MIN_PRIORITY);
-        }
-
-        @Override
-        public void run() {
-            while (true) {
-                PhysicalMemoryStatus status = SystemInfo.getPhysicalMemoryStatus();
-
-                var memoryStatusProperty = memoryStatusPropertyRef.get();
-                if (memoryStatusProperty == null)
-                    return;
-
-                if (Controllers.isStopped())
-                    return;
-
-                Platform.runLater(() -> memoryStatusProperty.set(status));
-
-                try {
-                    //noinspection BusyWait
-                    Thread.sleep(1000);
-                } catch (InterruptedException e) {
-                    return;
-                }
-            }
-        }
-    }
 }

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

@@ -103,7 +103,7 @@ public final class Versions {
                                         i18n("install.failed.downloading.detail", file.getFile().getUrl()) + "\n" + StringUtils.getStackTrace(e),
                                         i18n("download.failed.no_code"), MessageDialogPane.MessageType.ERROR);
                             }
-                        }).executor(true),
+                        }),
                 i18n("message.downloading"),
                 TaskCancellationAction.NORMAL
         );
@@ -129,13 +129,13 @@ public final class Versions {
     }
 
     public static CompletableFuture<String> renameVersion(Profile profile, String version) {
-        return Controllers.prompt(i18n("version.manage.rename.message"), (newName, handler) -> {
+        return Controllers.prompt(i18n("version.manage.rename.message"), (newName, resolve, reject) -> {
             if (newName.equals(version)) {
-                handler.resolve();
+                resolve.run();
                 return;
             }
             if (profile.getRepository().renameVersion(version, newName)) {
-                handler.resolve();
+                resolve.run();
                 profile.getRepository().refreshVersionsAsync()
                         .thenRunAsync(Schedulers.javafx(), () -> {
                             if (profile.getRepository().hasVersion(newName)) {
@@ -143,7 +143,7 @@ public final class Versions {
                             }
                         }).start();
             } else {
-                handler.reject(i18n("version.manage.rename.fail"));
+                reject.accept(i18n("version.manage.rename.fail"));
             }
         }, version, new Validator(i18n("install.new_game.malformed"), HMCLGameRepository::isValidVersionId),
             new Validator(i18n("install.new_game.already_exists"), newVersionName -> !profile.getRepository().versionIdConflicts(newVersionName) || newVersionName.equals(version)));
@@ -159,16 +159,16 @@ public final class Versions {
 
     public static void duplicateVersion(Profile profile, String version) {
         Controllers.prompt(
-                new PromptDialogPane.Builder(i18n("version.manage.duplicate.prompt"), (res, handler) -> {
+                new PromptDialogPane.Builder(i18n("version.manage.duplicate.prompt"), (res, resolve, reject) -> {
                     String newVersionName = ((PromptDialogPane.Builder.StringQuestion) res.get(1)).getValue();
                     boolean copySaves = ((PromptDialogPane.Builder.BooleanQuestion) res.get(2)).getValue();
                     Task.runAsync(() -> profile.getRepository().duplicateVersion(version, newVersionName, copySaves))
                             .thenComposeAsync(profile.getRepository().refreshVersionsAsync())
                             .whenComplete(Schedulers.javafx(), (result, exception) -> {
                                 if (exception == null) {
-                                    handler.resolve();
+                                    resolve.run();
                                 } else {
-                                    handler.reject(StringUtils.getStackTrace(exception));
+                                    reject.accept(StringUtils.getStackTrace(exception));
                                     if (!profile.getRepository().versionIdConflicts(newVersionName)) {
                                         profile.getRepository().removeVersionFromDisk(newVersionName);
                                     }

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

@@ -156,18 +156,18 @@ public final class WorldListPage extends ListPageBase<World> implements VersionP
         // Or too many input dialogs are popped.
         Task.supplyAsync(() -> new World(zipFile))
                 .whenComplete(Schedulers.javafx(), world -> {
-                    Controllers.prompt(i18n("world.name.enter"), (name, handler) -> {
+                    Controllers.prompt(i18n("world.name.enter"), (name, resolve, reject) -> {
                         Task.runAsync(() -> world.install(savesDir, name))
                                 .whenComplete(Schedulers.javafx(), () -> {
-                                    handler.resolve();
+                                    resolve.run();
                                     refresh();
                                 }, e -> {
                                     if (e instanceof FileAlreadyExistsException)
-                                        handler.reject(i18n("world.import.failed", i18n("world.import.already_exists")));
+                                        reject.accept(i18n("world.import.failed", i18n("world.import.already_exists")));
                                     else if (e instanceof IOException && e.getCause() instanceof InvalidPathException)
-                                        handler.reject(i18n("world.import.failed", i18n("install.new_game.malformed")));
+                                        reject.accept(i18n("world.import.failed", i18n("install.new_game.malformed")));
                                     else
-                                        handler.reject(i18n("world.import.failed", e.getClass().getName() + ": " + e.getLocalizedMessage()));
+                                        reject.accept(i18n("world.import.failed", e.getClass().getName() + ": " + e.getLocalizedMessage()));
                                 }).start();
                     }, world.getWorldName(), new Validator(i18n("install.new_game.malformed"), FileUtils::isNameValid));
                 }, e -> {

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

@@ -92,20 +92,20 @@ public final class WorldManageUIUtils {
         Controllers.dialog(new InputDialogPane(
                 i18n("world.duplicate.prompt"),
                 "",
-                (result, handler) -> {
+                (result, resolve, reject) -> {
                     if (StringUtils.isBlank(result)) {
-                        handler.reject(i18n("world.duplicate.failed.empty_name"));
+                        reject.accept(i18n("world.duplicate.failed.empty_name"));
                         return;
                     }
 
                     if (result.contains("/") || result.contains("\\") || !FileUtils.isNameValid(result)) {
-                        handler.reject(i18n("world.duplicate.failed.invalid_name"));
+                        reject.accept(i18n("world.duplicate.failed.invalid_name"));
                         return;
                     }
 
                     Path targetDir = worldPath.resolveSibling(result);
                     if (Files.exists(targetDir)) {
-                        handler.reject(i18n("world.duplicate.failed.already_exists"));
+                        reject.accept(i18n("world.duplicate.failed.already_exists"));
                         return;
                     }
 
@@ -118,9 +118,9 @@ public final class WorldManageUIUtils {
                                     }
                             ).whenComplete(Schedulers.javafx(), (throwable) -> {
                                 if (throwable == null) {
-                                    handler.resolve();
+                                    resolve.run();
                                 } else {
-                                    handler.reject(i18n("world.duplicate.failed"));
+                                    reject.accept(i18n("world.duplicate.failed"));
                                     LOG.warning("Failed to duplicate world " + world.getFile(), throwable);
                                 }
                             })

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

@@ -198,7 +198,7 @@ public final class NativePatcher {
     public static SupportStatus checkSupportedStatus(GameVersionNumber gameVersion, Platform platform,
                                                      OSVersion systemVersion) {
         if (platform.equals(Platform.WINDOWS_X86_64)) {
-            if (!systemVersion.isAtLeast(OSVersion.WINDOWS_7) && gameVersion.isAtLeast("1.20.5", "24w14a"))
+            if (!systemVersion.isAtLeast(OSVersion.WINDOWS_10) && gameVersion.isAtLeast("1.20.5", "24w14a"))
                 return SupportStatus.UNSUPPORTED;
 
             return SupportStatus.OFFICIAL_SUPPORTED;

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

@@ -299,11 +299,6 @@
     -fx-fill: -monet-surface-tint;
 }
 
-.popup-menu .scroll-pane > .scroll-bar:vertical,
-.popup-menu .scroll-pane > .scroll-bar:horizontal {
-    -fx-opacity: 0;
-}
-
 .popup-menu-content {
     -fx-padding: 4 0 4 0;
 }
@@ -955,13 +950,6 @@
     -fx-background-color: transparent;
 }
 
-.no-horizontal-scrollbar .scroll-bar:horizontal {
-    -fx-opacity: 0;
-    -fx-max-height: 0;
-    -fx-min-height: 0;
-    -fx-pref-height: 0;
-}
-
 .options-list {
     -fx-background-color: transparent;
     -fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.26), 5, 0.06, -0.5, 1);
@@ -1011,6 +999,10 @@
     -fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.26), 5, 0.06, -0.5, 1);
 }
 
+.card:selected {
+    -fx-background-color: -monet-secondary-container-transparent-80;
+}
+
 .card-list {
     -fx-padding: 10;
     -fx-spacing: 10;

HMCL/src/main/resources/assets/lang/I18N.properties

@@ -719,9 +719,7 @@ install.installer.depend=Requires %s
 install.installer.do_not_install=Do not install
 install.installer.fabric=Fabric
 install.installer.fabric-api=Fabric API
-install.installer.legacyfabric=Legacy Fabric
-install.installer.legacyfabric-api=Legacy Fabric API
-install.installer.fabric-quilt-api.warning=%1$s is a mod and will be installed into the mod directory of the game instance. Please do not change the working directory of the game, or the %1$s will not function. If you do want to change the directory, you should reinstall it.
+install.installer.fabric-api.warning=Warning: Fabric API is a mod and will be installed into the mod directory of the game instance. Please do not change the working directory of the game, or the Fabric API will not function. If you do want to change the directory, you should reinstall it.
 install.installer.forge=Forge
 install.installer.neoforge=NeoForge
 install.installer.game=Minecraft
@@ -1108,14 +1106,6 @@ mods.install=Install
 mods.save_as=Save As
 mods.unknown=Unknown Mod
 
-menu.undo=Undo
-menu.redo=Redo
-menu.cut=Cut
-menu.copy=Copy
-menu.paste=Paste
-menu.deleteselection=Delete
-menu.selectall=Select All
-
 nbt.entries=%s entries
 nbt.open.failed=Failed to open file
 nbt.save.failed=Failed to save file
@@ -1306,7 +1296,6 @@ settings.advanced.custom_commands.hint=The following environment variables are p
    \  · $INST_LITELOADER: set if LiteLoader is installed.\n\
    \  · $INST_OPTIFINE: set if OptiFine is installed.\n\
    \  · $INST_FABRIC: set if Fabric is installed.\n\
-   \  · $INST_LEGACYFABRIC: set if Legacy Fabric is installed.\n\
    \  · $INST_QUILT: set if Quilt is installed.
 settings.advanced.dont_check_game_completeness=Do not check game integrity
 settings.advanced.dont_check_jvm_validity=Do not check JVM compatibility

HMCL/src/main/resources/assets/lang/I18N_ar.properties

@@ -696,7 +696,7 @@ install.installer.depend=يتطلب %s
 install.installer.do_not_install=عدم التثبيت
 install.installer.fabric=Fabric
 install.installer.fabric-api=Fabric API
-install.installer.fabric-quilt-api.warning=تحذير: %1$s هو تعديل وسيتم تثبيته في دليل التعديلات لنسخة اللعبة. يرجى عدم تغيير دليل عمل اللعبة، أو لن يعمل %1$s. إذا كنت تريد تغيير الدليل، فيجب عليك إعادة تثبيته.
+install.installer.fabric-api.warning=تحذير: Fabric API هو تعديل وسيتم تثبيته في دليل التعديلات لنسخة اللعبة. يرجى عدم تغيير دليل عمل اللعبة، أو لن يعمل Fabric API. إذا كنت تريد تغيير الدليل، فيجب عليك إعادة تثبيته.
 install.installer.forge=Forge
 install.installer.neoforge=NeoForge
 install.installer.game=Minecraft

HMCL/src/main/resources/assets/lang/I18N_es.properties

@@ -701,7 +701,7 @@ install.installer.depend=Requiere %s
 install.installer.do_not_install=No instalar
 install.installer.fabric=Fabric
 install.installer.fabric-api=Fabric API
-install.installer.fabric-quilt-api.warning=%1$s es un mod, y se instalará en el directorio de mods de la instancia del juego. Por favor, no cambies el directorio de trabajo del juego, o el %1$s no funcionará. Si quieres cambiar esta configuración, debes reinstalarlo.
+install.installer.fabric-api.warning=Atención: Fabric API es un mod, y se instalará en el directorio de mods de la instancia del juego. Por favor, no cambies el directorio de trabajo del juego, o el Fabric API no funcionará. Si quieres cambiar esta configuración, debes reinstalarlo.
 install.installer.forge=Forge
 install.installer.neoforge=NeoForge
 install.installer.game=Minecraft

HMCL/src/main/resources/assets/lang/I18N_ja.properties

@@ -429,7 +429,7 @@ install.installer.choose=%s バージョンを選択してください
 install.installer.depend=%s に依存
 install.installer.fabric=Fabric
 install.installer.fabric-api=Fabric API
-install.installer.fabric-quilt-api.warning=%1$sはmodであり、新しいゲームのmodディレクトリにインストールされます。新しいゲームの実行ディレクトリを変更しないでください。変更すると、%1$sのインストールが失われます。その設定を変更したい場合は、%1$sを再インストールする必要があります。
+install.installer.fabric-api.warning=警告：Fabric APIはmodであり、新しいゲームのmodディレクトリにインストールされます。新しいゲームの実行ディレクトリを変更しないでください。変更すると、FabricAPIのインストールが失われます。その設定を変更したい場合は、FabricAPIを再インストールする必要があります。
 install.installer.forge=Forge
 install.installer.game=Minecraft
 install.installer.incompatible=%s と互換性がありません

HMCL/src/main/resources/assets/lang/I18N_lzh.properties

@@ -498,7 +498,7 @@ install.installer.depend=請先裝 %s
 install.installer.do_not_install=不裝
 install.installer.fabric=緞
 install.installer.fabric-api=緞界
-install.installer.fabric-quilt-api.warning=%1$s者，改囊也，將措乎新戲之改囊案夾也。既裝而無改戲之「行徑」。將改，而須復置之。
+install.installer.fabric-api.warning=誡：緞界者，改囊也，將措乎新戲之改囊案夾也。既裝而無改戲之「行徑」。將改，而須復置之。
 install.installer.forge=鍛
 install.installer.neoforge=新鍛
 install.installer.game=礦藝

HMCL/src/main/resources/assets/lang/I18N_ru.properties

@@ -692,7 +692,7 @@ install.installer.depend=Требуется %s
 install.installer.do_not_install=Не устанавливать
 install.installer.fabric=Fabric
 install.installer.fabric-api=Fabric API
-install.installer.fabric-quilt-api.warning=%1$s является модом и будет установлен в папку mod в сборке игры. Пожалуйста, не меняйте рабочую папку сборки, иначе %1$s не будет работать. Если вы все же хотите изменить папку, вам следует переустановить сборку.
+install.installer.fabric-api.warning=Предупреждение: Fabric API является модом и будет установлен в папку mod в сборке игры. Пожалуйста, не меняйте рабочую папку сборки, иначе Fabric API не будет работать. Если вы все же хотите изменить папку, вам следует переустановить сборку.
 install.installer.forge=Forge
 install.installer.neoforge=NeoForge
 install.installer.game=Minecraft

HMCL/src/main/resources/assets/lang/I18N_uk.properties

@@ -640,7 +640,7 @@ install.installer.depend=Вимагає %s
 install.installer.do_not_install=Не встановлювати
 install.installer.fabric=Fabric
 install.installer.fabric-api=Fabric API
-install.installer.fabric-quilt-api.warning=%1$s - це мод, і він буде встановлений у каталог модів екземпляра гри. Не змінюйте робочий каталог гри, інакше %1$s не працюватиме. Якщо ви все ж хочете змінити каталог, вам слід перевстановити його.
+install.installer.fabric-api.warning=Попередження: Fabric API - це мод, і він буде встановлений у каталог модів екземпляра гри. Не змінюйте робочий каталог гри, інакше Fabric API не працюватиме. Якщо ви все ж хочете змінити каталог, вам слід перевстановити його.
 install.installer.forge=Forge
 install.installer.neoforge=NeoForge
 install.installer.game=Minecraft

HMCL/src/main/resources/assets/lang/I18N_zh.properties

@@ -518,9 +518,7 @@ install.installer.depend=需要先安裝 %s
 install.installer.do_not_install=不安裝
 install.installer.fabric=Fabric
 install.installer.fabric-api=Fabric API
-install.installer.legacyfabric=Legacy Fabric
-install.installer.legacyfabric-api=Legacy Fabric API
-install.installer.fabric-quilt-api.warning=%1$s 是一個模組，將會被安裝到新遊戲的模組目錄。請你在安裝遊戲後不要修改目前遊戲的「執行路徑」設定。如果你在之後修改了相關設定，則需要重新安裝 %1$s。
+install.installer.fabric-api.warning=警告：Fabric API 是一個模組，將會被安裝到新遊戲的模組目錄。請你在安裝遊戲後不要修改目前遊戲的「執行路徑」設定。如果你在之後修改了相關設定，則需要重新安裝 Fabric API。
 install.installer.forge=Forge
 install.installer.neoforge=NeoForge
 install.installer.game=Minecraft
@@ -896,14 +894,6 @@ mods.install=安裝到目前實例
 mods.save_as=下載到本機目錄
 mods.unknown=未知模組
 
-menu.undo=還原
-menu.redo=重做
-menu.cut=剪下
-menu.copy=複製
-menu.paste=貼上
-menu.deleteselection=刪除
-menu.selectall=全選
-
 nbt.entries=%s 個條目
 nbt.open.failed=開啟檔案失敗
 nbt.save.failed=儲存檔案失敗
@@ -1090,7 +1080,6 @@ settings.advanced.custom_commands.hint=自訂指令被呼叫時將包含如下
   \  · $INST_LITELOADER: 若安裝了 LiteLoader，將會存在本環境變數；\n\
   \  · $INST_OPTIFINE: 若安裝了 OptiFine，將會存在本環境變數；\n\
   \  · $INST_FABRIC: 若安裝了 Fabric，將會存在本環境變數；\n\
-  \  · $INST_LEGACYFABRIC: 若安裝了 Legacy Fabric，將會存在本環境變數；\n\
   \  · $INST_QUILT: 若安裝了 Quilt，將會存在本環境變數。
 settings.advanced.dont_check_game_completeness=不檢查遊戲完整性
 settings.advanced.dont_check_jvm_validity=不檢查 Java 虛擬機與遊戲的相容性

HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties

@@ -521,10 +521,8 @@ install.installer.cleanroom=Cleanroom
 install.installer.depend=需要先安装 %s
 install.installer.do_not_install=不安装
 install.installer.fabric=Fabric
-install.installer.legacyfabric=Legacy Fabric
-install.installer.legacyfabric-api=Legacy Fabric API
 install.installer.fabric-api=Fabric API
-install.installer.fabric-quilt-api.warning=%1$s 是一个模组，将会被安装到新游戏的模组文件夹。请你在安装游戏后不要修改当前游戏的“版本隔离”设置。如果你在之后修改了相关设置，则需要重新安装 %1$s。
+install.installer.fabric-api.warning=警告：Fabric API 是一个模组，将会被安装到新游戏的模组文件夹。请你在安装游戏后不要修改当前游戏的“运行路径”设置。如果你在之后修改了相关设置，则需要重新安装 Fabric API。
 install.installer.forge=Forge
 install.installer.neoforge=NeoForge
 install.installer.game=Minecraft
@@ -900,14 +898,6 @@ mods.install=安装到当前实例
 mods.save_as=下载到本地文件夹
 mods.unknown=未知模组
 
-menu.undo=撤销
-menu.redo=重做
-menu.cut=剪切
-menu.copy=复制
-menu.paste=粘贴
-menu.deleteselection=删除
-menu.selectall=全选
-
 nbt.entries=%s 个条目
 nbt.open.failed=打开文件失败
 nbt.save.failed=保存文件失败
@@ -1094,7 +1084,6 @@ settings.advanced.custom_commands.hint=自定义命令被调用时将包含如
   \  · $INST_LITELOADER: 若安装了 LiteLoader，将会存在本环境变量；\n\
   \  · $INST_OPTIFINE: 若安装了 OptiFine，将会存在本环境变量；\n\
   \  · $INST_FABRIC: 若安装了 Fabric，将会存在本环境变量；\n\
-  \  · $INST_LEGACYFABRIC: 若安装了 Legacy Fabric，将会存在本环境变量；\n\
   \  · $INST_QUILT: 若安装了 Quilt，将会存在本环境变量。
 settings.advanced.dont_check_game_completeness=不检查游戏完整性
 settings.advanced.dont_check_jvm_validity=不检查 Java 虚拟机与游戏的兼容性

HMCL/src/main/resources/assets/terracotta.json

@@ -1,63 +1,63 @@
 {
   "__comment__": "THIS FILE IS MACHINE GENERATED! DO NOT EDIT!",
-  "version_latest": "0.4.1",
+  "version_latest": "0.4.2",
   "packages": {
     "windows-x86_64": {
-      "hash": "4693fec29bb54a0bb1a1a8a263a935f1673b8f76e84d125974cf259f1912a195beab4dfd04c23cae592cf71b116e82ecd48828b1445ab75c980c8cd79c777d21",
+      "hash": "6a98f524d4f00373696517306af8aa50d01d55ce4eadb27e9e4bc2f882707a0b5f20d5d4c33371d1459dcf5bf144ffed9beb414202d9ccf32b11dbbfcf19d650",
       "files": {
         "VCRUNTIME140.DLL": "3d4b24061f72c0e957c7b04a0c4098c94c8f1afb4a7e159850b9939c7210d73398be6f27b5ab85073b4e8c999816e7804fef0f6115c39cd061f4aaeb4dcda8cf",
-        "terracotta-0.4.1-windows-x86_64.exe": "3d29f7deb61b8b87e14032baecad71042340f6259d7ff2822336129714470e1a951cd96ee5d6a8c9312e7cf1bb9bb9d1cbf757cfa44d2b2f214362c32ea03b5b"
+        "terracotta-0.4.2-windows-x86_64.exe": "6e98d1f2380ed22fb5a2dd4aafce6c773e9cf69100c8bb8e49e7d6983756bdb9a31f80e06bcfbe5a2742144fe806d3d687dec54d8f09d87c659341f99dd9fd80"
       }
     },
     "windows-arm64": {
-      "hash": "6c68da53142cc92598a9d3b803f110c77927ee7b481e2f623dfab17cd97fee4a58378e796030529713d3e394355135cc01d5f5d86cef7dbd31bbf8e913993d4c",
+      "hash": "fc1077247014ac0c712469498bde2ef7f6d881d5fcb7bdd5e11ebe20218fed365be19afdb8d453a79d77b729f866058522b910741767f4df947faa891434b463",
       "files": {
         "VCRUNTIME140.DLL": "5cb5ce114614101d260f4754c09e8a0dd57e4da885ebb96b91e274326f3e1dd95ed0ade9f542f1922fad0ed025e88a1f368e791e1d01fae69718f0ec3c7b98c8",
-        "terracotta-0.4.1-windows-arm64.exe": "d2cf0f29aac752d322e594da6144bbe2874aabde52b5890a6f04a33b77a377464cbf3367e40de6b046c7226517f48e23fd40e611198fcaa1f30503c36d99b20c"
+        "terracotta-0.4.2-windows-arm64.exe": "30a15c5c53e5817c5a3634532172559327474741d3b2c7ef4e8a30acc6f59cdcf3570bf5f583e3cbe9e2abc8253e977c1abda1e9f36c88c4e99240da257347d0"
       }
     },
     "macos-x86_64": {
-      "hash": "c247ab9023cf47231f3a056ddf70fe823e504c19ce241bf264c0a3cf2981c044b236dc239f430afb2541445d1b61d18898f8af5e1c063f31fb952bdfbea4aff5",
+      "hash": "a762e4b2d6f84e899292b9e3856d009411a516d3c47f54575f843ce082f63dff2baa68ba0faa844b8b64fb12e91017386f15f5e7f975f8ee605bf8d4217cb091",
       "files": {
-        "terracotta-0.4.1-macos-x86_64": "dd2cde70a950849498425b8b00c17fb80edb8dd9bc0312da4885d97a28a4959d87782bd2202ef7f71bdbf2a92609089585c9e3faf24c10df6150e221e111a764",
-        "terracotta-0.4.1-macos-x86_64.pkg": "6057d5b4ea93da45796277a20ddaea7850e8c66326ded769f20fff74e132b453d6d615d937fc8f1d62b0b36b26961df5afb76535aecf85f25d2160889225ac6d"
+        "terracotta-0.4.2-macos-x86_64": "24efb85390eff88a538ed7e503fb1488e5e622730ca30c741a0e8b4c8f4e8d4868a2f9f38da8de540aeb535af2fd1e41c7081dae9c700e8a1a03b6c540218164",
+        "terracotta-0.4.2-macos-x86_64.pkg": "0f80437061231018ec0f860f875aba02cae9e0b36d21f2db8e99d25948806e1119f7844a4d4acca01d6124d7079718762cdebe3756b005a55632de7029fe0d24"
       }
     },
     "macos-arm64": {
-      "hash": "0ddf48a44ea2563c37707caea8381ad3c69da73dd443d07dd98fe630f4e24ccda6f1fcdc9207a66bf61758b887a7b47186883ccd12bcb6b68387d8d756873f44",
+      "hash": "09e444fea2d9fd19f3e5cb62e29055228345be163924cbd408d947646fafed1012cf48508ee6a155ede3d571e2ffaa72d09ceeb1493c8a60feb05e0699f19ba3",
       "files": {
-        "terracotta-0.4.1-macos-arm64": "ddc335ee082b4c0323314d482933810fc2d377cfc131a9aa978b54f245f1bed8973139edf7cf94f7ae6c04660dfe18d275b1a81638781e482b4ff585f351eed9",
-        "terracotta-0.4.1-macos-arm64.pkg": "5cbb41a450f080234b66fa264351bd594e3f6ef1599c96f277baa308e34dd26caefa3a34b3d65e972bc20868f2d4a661e8b3910d4b0311a374c6ac680bdccf8f"
+        "terracotta-0.4.2-macos-arm64": "8e59a9d78acd57702dc044d6f2799c6af586b075a262f7d4dbbf0876e1af8d8271e04783c24ff820b801e3b14cd0190ab8403d097f3f2d98b6d911f95ed1e972",
+        "terracotta-0.4.2-macos-arm64.pkg": "b0b72f8883767c359f0700e958bd859dd5932c4674fbdf2a32f7de189fb9f54822d4825a754dc856416c8760338eb8ffca80b40c0a57c608fbe6ae9928888993"
       }
     },
     "linux-x86_64": {
-      "hash": "c00b0622203c1610a8e72bde5230fca6fe56cf1f45dc9bc7e857350f3a050d442c814084758090799b9a5b875730fa666539ee75bec706c05d9338ea208301eb",
+      "hash": "d326ad95815d04568d485b5038e40ffc47ca54292fa0925eee6f5cea014024f901d661708aac2a743037b990882ad82b4d0b7bb03dc3b2fe720dbf0f3efe1c98",
       "files": {
-        "terracotta-0.4.1-linux-x86_64": "e53a9d8ec085ef7a7816b3da374e5c88fced2cf8319d447be3226422d01f9d7ee2019e403eafe21082135050652b2788b7d9520cc432c8d08931930b99595ed7"
+        "terracotta-0.4.2-linux-x86_64": "fac328ba8957a711b03557bb913940f22d61b76608cd203fdf51024b6f94b19f5bc91c9b8a9fa80baf6968e1e6873c1880fd4cf54a2f8e3c6cf1e6ac161f8d0c"
       }
     },
     "linux-arm64": {
-      "hash": "4d661e1123ca050980960fe2d32b8d93a2c3ba807748569a45f16050fb1b52089bfc64c2dd64aba652dfed0e4ac3fba1ff9518cc3f95598c99fc71d93552b589",
+      "hash": "57c08f48d9535e93ad547d2dfc852d267992cc164a7208b42a2da0a6cbc2f21862f610e02a746b4b67150f4dec26b86a4f96eb9bd2f58d124d5b40ba50c6d55e",
       "files": {
-        "terracotta-0.4.1-linux-arm64": "d4ccf6ff8c2fac060fecaa3c8368677f9342e283f2435493b3e259e922ee0bb0b08f15a292bf91898800a462336c64d0dee7b73f03c1752e5b0988a05adb3b52"
+        "terracotta-0.4.2-linux-arm64": "d807744c2041c98686e4b505324713badea7a0f31e8810be49ae053a63fb6dfc474ac58d678fb93eea0dd5cccff7372d9ec6135a1046f4b306cad35cd90ecacd"
       }
     },
     "linux-loongarch64": {
-      "hash": "8297bb37617e9e7ce282fc553c5b14c84a900bcff4d025be31fd4a4da8b3943d040afc6143aa17de9a88e5fa29af7254d38db8ae6418ee539c2301632448da09",
+      "hash": "a19f4ad4fa1fd2f3c1c867f8743178ab0524d1634d63e122ffc080623e4f14207ecab58830fa0d888696ef28ce4cfa189e6ffbe92c6e1aa1836652617a96a801",
       "files": {
-        "terracotta-0.4.1-linux-loongarch64": "ffdf7582d095307b91ddfc3e5d0daa78d434e4e34916d0cdf1520ae74b188fe5a48307047bf2da9a526eb725fe80cf230a93001bc8199d236b9cf28a1beaa6e9"
+        "terracotta-0.4.2-linux-loongarch64": "7d4896b275207def0861e544cf2afc9501c1946f1bc8bb2bad9ef4510dd915eabb63eeedff725e69565cdf5c27c146b52dd75d24115d5141909c0865f89cd7b9"
       }
     },
     "linux-riscv64": {
-      "hash": "092f863885205107525e7ccb0e18977f6fd3018910ca5819772ec741dd8cffee52cc352a44b928bd2ba99ab881adaadff9e3bf4bf283f7384a35fea14becb0b4",
+      "hash": "ef3dfcf3c64dfcaf94adc518f0184d017a32a924f67ef33ffb8128f20669cf177cd345df3be8c00225a275bd44f70657b94fb43c60afeb21238000ac7a7f1721",
       "files": {
-        "terracotta-0.4.1-linux-riscv64": "a6e5d70ddc433bf804764b69e8c204a6a428ece22b9d8ab713ed339fb81bfa1d29daeb6bdfd62c85ff193396315f96172f4a28925e5a4efc45f7d6fa868782a9"
+        "terracotta-0.4.2-linux-riscv64": "afddc55f16f5cf3103548d13f7a3238964c8899dba8eb0e1fdc9e354da65e91fa4486de4b8680a7a3d9326eacf18c1ddb6b5b1f9459908f35f77b36f769172ea"
       }
     },
     "freebsd-x86_64": {
-      "hash": "288bd7a97b2e2c5fb3c7d8107ed1311bc881fb74cf92da40b6c84156239d0832d2306b74b1e93a683188a5db896a6506326c6a7a4ac0ab2e798fa4f1f00787f0",
+      "hash": "a4d02ebbb1419f4e9265f5b24060432799151a27e0d1871690d2f3a51f40bcfd6d92c176001a15a62caa9bf31ea1b67a7b2da10e3351bfcdd36bfac1377d08d9",
       "files": {
-        "terracotta-0.4.1-freebsd-x86_64": "c90e7db3c5e5cc8d53d8d10a8bf88899e2c418758c14c3d14bc24efc32a711f76882bb5b5a49db5b0256ead4f22b666139bd2a212bf09036d7e7e64ddec4ec3c"
+        "terracotta-0.4.2-freebsd-x86_64": "a50da02752cef73d21804b26eb02261568ed3053c8fef1074014d50226843810f71e6eda39a53af3bad8e173cec40826631a4c8877af460d14a307f1b0a62519"
       }
     }
   },

HMCLBoot/src/main/java/org/jackhuang/hmcl/Main.java

@@ -102,19 +102,7 @@ public final class Main {
         System.exit(1);
     }
 
-    private static void checkDirectoryPath() {
-        String currentDir = System.getProperty("user.dir", "");
-        if (currentDir.contains("!")) {
-            SwingUtils.initLookAndFeel();
-            System.err.println("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.
-            SwingUtils.showErrorDialog("Exclamation mark(!) is not allowed in the path where HMCL is in.\n" + "The path is " + currentDir);
-            System.exit(1);
-        }
-    }
-
     public static void main(String[] args) throws Throwable {
-        checkDirectoryPath();
         if (getJavaFeatureVersion(System.getProperty("java.version")) >= MINIMUM_JAVA_VERSION) {
             EntryPoint.main(args);
         } else {

HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java

@@ -22,8 +22,6 @@ import org.jackhuang.hmcl.download.fabric.FabricAPIVersionList;
 import org.jackhuang.hmcl.download.fabric.FabricVersionList;
 import org.jackhuang.hmcl.download.forge.ForgeBMCLVersionList;
 import org.jackhuang.hmcl.download.game.GameVersionList;
-import org.jackhuang.hmcl.download.legacyfabric.LegacyFabricAPIVersionList;
-import org.jackhuang.hmcl.download.legacyfabric.LegacyFabricVersionList;
 import org.jackhuang.hmcl.download.liteloader.LiteLoaderBMCLVersionList;
 import org.jackhuang.hmcl.download.neoforge.NeoForgeBMCLVersionList;
 import org.jackhuang.hmcl.download.optifine.OptiFineBMCLVersionList;
@@ -49,8 +47,6 @@ public final class BMCLAPIDownloadProvider implements DownloadProvider {
     private final FabricAPIVersionList fabricApi;
     private final ForgeBMCLVersionList forge;
     private final CleanroomVersionList cleanroom;
-    private final LegacyFabricVersionList legacyFabric;
-    private final LegacyFabricAPIVersionList legacyFabricApi;
     private final NeoForgeBMCLVersionList neoforge;
     private final LiteLoaderBMCLVersionList liteLoader;
     private final OptiFineBMCLVersionList optifine;
@@ -70,9 +66,6 @@ public final class BMCLAPIDownloadProvider implements DownloadProvider {
         this.optifine = new OptiFineBMCLVersionList(apiRoot);
         this.quilt = new QuiltVersionList(this);
         this.quiltApi = new QuiltAPIVersionList(this);
-        this.legacyFabric = new LegacyFabricVersionList(this);
-        this.legacyFabricApi = new LegacyFabricAPIVersionList(this);
-
         this.replacement = Arrays.asList(
                 pair("https://bmclapi2.bangbang93.com", apiRoot),
                 pair("https://launchermeta.mojang.com", apiRoot),
@@ -119,21 +112,30 @@ public final class BMCLAPIDownloadProvider implements DownloadProvider {
 
     @Override
     public VersionList<?> getVersionListById(String id) {
-        return switch (id) {
-            case "game" -> game;
-            case "fabric" -> fabric;
-            case "fabric-api" -> fabricApi;
-            case "forge" -> forge;
-            case "cleanroom" -> cleanroom;
-            case "neoforge" -> neoforge;
-            case "liteloader" -> liteLoader;
-            case "optifine" -> optifine;
-            case "quilt" -> quilt;
-            case "quilt-api" -> quiltApi;
-            case "legacyfabric" -> legacyFabric;
-            case "legacyfabric-api" -> legacyFabricApi;
-            default -> throw new IllegalArgumentException("Unrecognized version list id: " + id);
-        };
+        switch (id) {
+            case "game":
+                return game;
+            case "fabric":
+                return fabric;
+            case "fabric-api":
+                return fabricApi;
+            case "forge":
+                return forge;
+            case "cleanroom":
+                return cleanroom;
+            case "neoforge":
+                return neoforge;
+            case "liteloader":
+                return liteLoader;
+            case "optifine":
+                return optifine;
+            case "quilt":
+                return quilt;
+            case "quilt-api":
+                return quiltApi;
+            default:
+                throw new IllegalArgumentException("Unrecognized version list id: " + id);
+        }
     }
 
     @Override

HMCLCore/src/main/java/org/jackhuang/hmcl/download/LibraryAnalyzer.java

@@ -189,35 +189,7 @@ public final class LibraryAnalyzer implements Iterable<LibraryAnalyzer.LibraryMa
 
     public enum LibraryType {
         MINECRAFT(true, "game", "^$", "^$", null),
-        LEGACY_FABRIC(true, "legacyfabric", "net\\.fabricmc", "fabric-loader", ModLoaderType.LEGACY_FABRIC) {
-            @Override
-            protected boolean matchLibrary(Library library, List<Library> libraries) {
-                if (!super.matchLibrary(library, libraries)) {
-                    return false;
-                }
-                for (Library l : libraries) {
-                    if ("net.legacyfabric".equals(l.getGroupId())) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-        },
-        LEGACY_FABRIC_API(false, "legacyfabric-api", "net\\.legacyfabric", "legacyfabric-api", null),
-        FABRIC(true, "fabric", "net\\.fabricmc", "fabric-loader", ModLoaderType.FABRIC) {
-            @Override
-            protected boolean matchLibrary(Library library, List<Library> libraries) {
-                if (!super.matchLibrary(library, libraries)) {
-                    return false;
-                }
-                for (Library l : libraries) {
-                    if ("net.legacyfabric".equals(l.getGroupId())) {
-                        return false;
-                    }
-                }
-                return true;
-            }
-        },
+        FABRIC(true, "fabric", "net\\.fabricmc", "fabric-loader", ModLoaderType.FABRIC),
         FABRIC_API(true, "fabric-api", "net\\.fabricmc", "fabric-api", null),
         FORGE(true, "forge", "net\\.minecraftforge", "(forge|fmlloader)", ModLoaderType.FORGE) {
             private final Pattern FORGE_VERSION_MATCHER = Pattern.compile("^([0-9.]+)-(?<forge>[0-9.]+)(-([0-9.]+))?$");
@@ -306,7 +278,6 @@ public final class LibraryAnalyzer implements Iterable<LibraryAnalyzer.LibraryMa
         private final ModLoaderType modLoaderType;
 
         private static final Map<String, LibraryType> PATCH_ID_MAP = new HashMap<>();
-
         static {
             for (LibraryType type : values()) {
                 PATCH_ID_MAP.put(type.getPatchId(), type);

HMCLCore/src/main/java/org/jackhuang/hmcl/download/MojangDownloadProvider.java

@@ -22,8 +22,6 @@ import org.jackhuang.hmcl.download.fabric.FabricAPIVersionList;
 import org.jackhuang.hmcl.download.fabric.FabricVersionList;
 import org.jackhuang.hmcl.download.forge.ForgeVersionList;
 import org.jackhuang.hmcl.download.game.GameVersionList;
-import org.jackhuang.hmcl.download.legacyfabric.LegacyFabricAPIVersionList;
-import org.jackhuang.hmcl.download.legacyfabric.LegacyFabricVersionList;
 import org.jackhuang.hmcl.download.liteloader.LiteLoaderVersionList;
 import org.jackhuang.hmcl.download.neoforge.NeoForgeOfficialVersionList;
 import org.jackhuang.hmcl.download.optifine.OptiFineBMCLVersionList;
@@ -49,8 +47,6 @@ public class MojangDownloadProvider implements DownloadProvider {
     private final OptiFineBMCLVersionList optifine;
     private final QuiltVersionList quilt;
     private final QuiltAPIVersionList quiltApi;
-    private final LegacyFabricVersionList legacyFabric;
-    private final LegacyFabricAPIVersionList legacyFabricApi;
 
     public MojangDownloadProvider() {
         // If there is no official download channel available, fallback to BMCLAPI.
@@ -66,8 +62,6 @@ public class MojangDownloadProvider implements DownloadProvider {
         this.optifine = new OptiFineBMCLVersionList(apiRoot);
         this.quilt = new QuiltVersionList(this);
         this.quiltApi = new QuiltAPIVersionList(this);
-        this.legacyFabric = new LegacyFabricVersionList(this);
-        this.legacyFabricApi = new LegacyFabricAPIVersionList(this);
     }
 
     @Override
@@ -82,21 +76,30 @@ public class MojangDownloadProvider implements DownloadProvider {
 
     @Override
     public VersionList<?> getVersionListById(String id) {
-        return switch (id) {
-            case "game" -> game;
-            case "fabric" -> fabric;
-            case "fabric-api" -> fabricApi;
-            case "forge" -> forge;
-            case "cleanroom" -> cleanroom;
-            case "neoforge" -> neoforge;
-            case "liteloader" -> liteLoader;
-            case "optifine" -> optifine;
-            case "quilt" -> quilt;
-            case "quilt-api" -> quiltApi;
-            case "legacyfabric" -> legacyFabric;
-            case "legacyfabric-api" -> legacyFabricApi;
-            default -> throw new IllegalArgumentException("Unrecognized version list id: " + id);
-        };
+        switch (id) {
+            case "game":
+                return game;
+            case "fabric":
+                return fabric;
+            case "fabric-api":
+                return fabricApi;
+            case "forge":
+                return forge;
+            case "cleanroom":
+                return cleanroom;
+            case "neoforge":
+                return neoforge;
+            case "liteloader":
+                return liteLoader;
+            case "optifine":
+                return optifine;
+            case "quilt":
+                return quilt;
+            case "quilt-api":
+                return quiltApi;
+            default:
+                throw new IllegalArgumentException("Unrecognized version list id: " + id);
+        }
     }
 
     @Override

HMCLCore/src/main/java/org/jackhuang/hmcl/download/MultipleSourceVersionList.java

@@ -20,6 +20,8 @@ package org.jackhuang.hmcl.download;
 import org.jackhuang.hmcl.task.Task;
 
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
 
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 
@@ -47,25 +49,58 @@ public class MultipleSourceVersionList extends VersionList<RemoteVersion> {
 
     private Task<?> refreshAsync(String gameVersion, int sourceIndex) {
         VersionList<?> versionList = backends[sourceIndex];
-        return versionList.refreshAsync(gameVersion)
-                .thenComposeAsync(() -> {
+        Task<?> refreshTask = versionList.refreshAsync(gameVersion);
+
+        return new Task<Object>() {
+            private Task<?> nextTask = null;
+
+            {
+                setSignificance(TaskSignificance.MODERATE);
+                setName("MultipleSourceVersionList.refreshAsync(" + sourceIndex + ")");
+            }
+
+            @Override
+            public Collection<Task<?>> getDependents() {
+                return List.of(refreshTask);
+            }
+
+            @Override
+            public Collection<? extends Task<?>> getDependencies() {
+                return nextTask != null ? List.of(nextTask) : List.of();
+            }
+
+            @Override
+            public boolean isRelyingOnDependents() {
+                return false;
+            }
+
+            @Override
+            public void execute() throws Exception {
+                if (isDependentsSucceeded()) {
                     lock.writeLock().lock();
                     try {
                         versions.putAll(gameVersion, versionList.getVersions(gameVersion));
-                    } catch (Exception e) {
-                        if (sourceIndex == backends.length - 1) {
-                            LOG.warning("Failed to fetch versions list from all sources", e);
-                            throw e;
-                        } else {
-                            LOG.warning("Failed to fetch versions list and try to fetch from other source", e);
-                            return refreshAsync(gameVersion, sourceIndex + 1);
-                        }
                     } finally {
                         lock.writeLock().unlock();
                     }
 
-                    return null;
-                });
+                    setResult(refreshTask.getResult());
+                } else {
+                    Exception exception = refreshTask.getException();
+                    assert exception != null;
+
+                    if (sourceIndex == backends.length - 1) {
+                        LOG.warning("Failed to fetch versions list from all sources", exception);
+                        setSignificance(TaskSignificance.MINOR);
+                        throw exception;
+                    } else {
+                        LOG.warning("Failed to fetch versions list and try to fetch from other source", exception);
+                        nextTask = refreshAsync(gameVersion, sourceIndex + 1);
+                        nextTask.storeTo(this::setResult);
+                    }
+                }
+            }
+        };
     }
 
     @Override

HMCLCore/src/main/java/org/jackhuang/hmcl/download/fabric/FabricAPIInstallTask.java

@@ -59,7 +59,7 @@ public final class FabricAPIInstallTask extends Task<Version> {
     public void execute() throws IOException {
         dependencies.add(new FileDownloadTask(
                 remote.getVersion().getFile().getUrl(),
-                dependencyManager.getGameRepository().getModsDirectory(version.getId()).resolve("fabric-api-" + remote.getVersion().getVersion() + ".jar"),
+                dependencyManager.getGameRepository().getRunDirectory(version.getId()).resolve("mods").resolve("fabric-api-" + remote.getVersion().getVersion() + ".jar"),
                 remote.getVersion().getFile().getIntegrityCheck())
         );
     }

HMCLCore/src/main/java/org/jackhuang/hmcl/download/fabric/FabricInstallTask.java

@@ -28,7 +28,6 @@ import org.jackhuang.hmcl.game.Library;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.task.GetTask;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.util.gson.JsonSerializable;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 
 import java.io.IOException;
@@ -128,7 +127,6 @@ public final class FabricInstallTask extends Task<Version> {
         return new Version(LibraryAnalyzer.LibraryType.FABRIC.getPatchId(), loaderVersion, Version.PRIORITY_LOADER, arguments, mainClass, libraries);
     }
 
-    @JsonSerializable
     public static class FabricInfo {
         private final LoaderInfo loader;
         private final IntermediaryInfo intermediary;
@@ -153,7 +151,6 @@ public final class FabricInstallTask extends Task<Version> {
         }
     }
 
-    @JsonSerializable
     public static class LoaderInfo {
         private final String separator;
         private final int build;
@@ -190,7 +187,6 @@ public final class FabricInstallTask extends Task<Version> {
         }
     }
 
-    @JsonSerializable
     public static class IntermediaryInfo {
         private final String maven;
         private final String version;

HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/mojang/MojangJavaDownloadTask.java

@@ -21,7 +21,7 @@ import org.jackhuang.hmcl.download.ArtifactMalformedException;
 import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.game.DownloadInfo;
 import org.jackhuang.hmcl.game.GameJavaVersion;
-import org.jackhuang.hmcl.java.JavaInfo;
+import org.jackhuang.hmcl.java.*;
 import org.jackhuang.hmcl.task.FileDownloadTask;
 import org.jackhuang.hmcl.task.GetTask;
 import org.jackhuang.hmcl.task.Task;
@@ -59,11 +59,11 @@ public final class MojangJavaDownloadTask extends Task<MojangJavaDownloadTask.Re
             MojangJavaDownloads allDownloads = JsonUtils.fromNonNullJson(javaDownloadsJson, MojangJavaDownloads.class);
 
             Map<String, List<MojangJavaDownloads.JavaDownload>> osDownloads = allDownloads.getDownloads().get(platform);
-            if (osDownloads == null || !osDownloads.containsKey(javaVersion.component()))
+            if (osDownloads == null || !osDownloads.containsKey(javaVersion.getComponent()))
                 throw new UnsupportedPlatformException("Unsupported platform: " + platform);
-            List<MojangJavaDownloads.JavaDownload> candidates = osDownloads.get(javaVersion.component());
+            List<MojangJavaDownloads.JavaDownload> candidates = osDownloads.get(javaVersion.getComponent());
             for (MojangJavaDownloads.JavaDownload download : candidates) {
-                if (JavaInfo.parseVersion(download.getVersion().getName()) >= javaVersion.majorVersion()) {
+                if (JavaInfo.parseVersion(download.getVersion().getName()) >= javaVersion.getMajorVersion()) {
                     this.download = download;
                     return new GetTask(downloadProvider.injectURLWithCandidates(download.getManifest().getUrl()));
                 }

HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/mojang/MojangJavaRemoteVersion.java

@@ -36,7 +36,7 @@ public final class MojangJavaRemoteVersion implements JavaRemoteVersion {
 
     @Override
     public int getJdkVersion() {
-        return gameJavaVersion.majorVersion();
+        return gameJavaVersion.getMajorVersion();
     }
 
     @Override

HMCLCore/src/main/java/org/jackhuang/hmcl/download/legacyfabric/LegacyFabricAPIInstallTask.java

@@ -1,61 +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.download.legacyfabric;
-
-import org.jackhuang.hmcl.download.DefaultDependencyManager;
-import org.jackhuang.hmcl.game.Version;
-import org.jackhuang.hmcl.task.FileDownloadTask;
-import org.jackhuang.hmcl.task.Task;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-public final class LegacyFabricAPIInstallTask extends Task<Version> {
-
-    private final DefaultDependencyManager dependencyManager;
-    private final Version version;
-    private final LegacyFabricAPIRemoteVersion remote;
-    private final List<Task<?>> dependencies = new ArrayList<>(1);
-
-    public LegacyFabricAPIInstallTask(DefaultDependencyManager dependencyManager, Version version, LegacyFabricAPIRemoteVersion remoteVersion) {
-        this.dependencyManager = dependencyManager;
-        this.version = version;
-        this.remote = remoteVersion;
-    }
-
-    @Override
-    public Collection<Task<?>> getDependencies() {
-        return dependencies;
-    }
-
-    @Override
-    public boolean isRelyingOnDependencies() {
-        return false;
-    }
-
-    @Override
-    public void execute() throws IOException {
-        dependencies.add(new FileDownloadTask(
-                remote.getVersion().getFile().getUrl(),
-                dependencyManager.getGameRepository().getModsDirectory(version.getId()).resolve("legacy-fabric-api-" + remote.getVersion().getVersion() + ".jar"),
-                remote.getVersion().getFile().getIntegrityCheck())
-        );
-    }
-}

HMCLCore/src/main/java/org/jackhuang/hmcl/download/legacyfabric/LegacyFabricAPIRemoteVersion.java

@@ -1,67 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2022  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.download.legacyfabric;
-
-import org.jackhuang.hmcl.download.DefaultDependencyManager;
-import org.jackhuang.hmcl.download.LibraryAnalyzer;
-import org.jackhuang.hmcl.download.RemoteVersion;
-import org.jackhuang.hmcl.game.Version;
-import org.jackhuang.hmcl.mod.RemoteMod;
-import org.jackhuang.hmcl.task.Task;
-
-import java.time.Instant;
-import java.util.List;
-
-public class LegacyFabricAPIRemoteVersion extends RemoteVersion {
-    private final String fullVersion;
-    private final RemoteMod.Version version;
-
-    /**
-     * Constructor.
-     *
-     * @param gameVersion the Minecraft version that this remote version suits.
-     * @param selfVersion the version string of the remote version.
-     * @param urls        the installer or universal jar original URL.
-     */
-    LegacyFabricAPIRemoteVersion(String gameVersion, String selfVersion, String fullVersion, Instant datePublished, RemoteMod.Version version, List<String> urls) {
-        super(LibraryAnalyzer.LibraryType.LEGACY_FABRIC_API.getPatchId(), gameVersion, selfVersion, datePublished, urls);
-
-        this.fullVersion = fullVersion;
-        this.version = version;
-    }
-
-    @Override
-    public String getFullVersion() {
-        return fullVersion;
-    }
-
-    public RemoteMod.Version getVersion() {
-        return version;
-    }
-
-    @Override
-    public Task<Version> getInstallTask(DefaultDependencyManager dependencyManager, Version baseVersion) {
-        return new LegacyFabricAPIInstallTask(dependencyManager, baseVersion, this);
-    }
-
-    @Override
-    public int compareTo(RemoteVersion o) {
-        if (!(o instanceof LegacyFabricAPIRemoteVersion)) return 0;
-        return -this.getReleaseDate().compareTo(o.getReleaseDate());
-    }
-}

HMCLCore/src/main/java/org/jackhuang/hmcl/download/legacyfabric/LegacyFabricAPIVersionList.java

@@ -1,53 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2022  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.download.legacyfabric;
-
-import org.jackhuang.hmcl.download.DownloadProvider;
-import org.jackhuang.hmcl.download.VersionList;
-import org.jackhuang.hmcl.mod.RemoteMod;
-import org.jackhuang.hmcl.mod.modrinth.ModrinthRemoteModRepository;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.util.Lang;
-
-import java.util.Collections;
-
-public class LegacyFabricAPIVersionList extends VersionList<LegacyFabricAPIRemoteVersion> {
-
-    private final DownloadProvider downloadProvider;
-
-    public LegacyFabricAPIVersionList(DownloadProvider downloadProvider) {
-        this.downloadProvider = downloadProvider;
-    }
-
-    @Override
-    public boolean hasType() {
-        return false;
-    }
-
-    @Override
-    public Task<?> refreshAsync() {
-        return Task.runAsync(() -> {
-            for (RemoteMod.Version modVersion : Lang.toIterable(ModrinthRemoteModRepository.MODS.getRemoteVersionsById("legacy-fabric-api"))) {
-                for (String gameVersion : modVersion.getGameVersions()) {
-                    versions.put(gameVersion, new LegacyFabricAPIRemoteVersion(gameVersion, modVersion.getVersion(), modVersion.getName(), modVersion.getDatePublished(), modVersion,
-                            Collections.singletonList(modVersion.getFile().getUrl())));
-                }
-            }
-        });
-    }
-}

HMCLCore/src/main/java/org/jackhuang/hmcl/download/legacyfabric/LegacyFabricInstallTask.java

@@ -1,130 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2022  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.download.legacyfabric;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import org.jackhuang.hmcl.download.DefaultDependencyManager;
-import org.jackhuang.hmcl.download.LibraryAnalyzer;
-import org.jackhuang.hmcl.download.UnsupportedInstallationException;
-import org.jackhuang.hmcl.download.fabric.FabricInstallTask;
-import org.jackhuang.hmcl.game.Arguments;
-import org.jackhuang.hmcl.game.Artifact;
-import org.jackhuang.hmcl.game.Library;
-import org.jackhuang.hmcl.game.Version;
-import org.jackhuang.hmcl.task.GetTask;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.util.gson.JsonUtils;
-
-import java.util.*;
-
-import static org.jackhuang.hmcl.download.UnsupportedInstallationException.FABRIC_NOT_COMPATIBLE_WITH_FORGE;
-
-public final class LegacyFabricInstallTask extends Task<Version> {
-
-    private final DefaultDependencyManager dependencyManager;
-    private final Version version;
-    private final LegacyFabricRemoteVersion remote;
-    private final GetTask launchMetaTask;
-    private final List<Task<?>> dependencies = new ArrayList<>(1);
-
-    public LegacyFabricInstallTask(DefaultDependencyManager dependencyManager, Version version, LegacyFabricRemoteVersion remoteVersion) {
-        this.dependencyManager = dependencyManager;
-        this.version = version;
-        this.remote = remoteVersion;
-
-        launchMetaTask = new GetTask(dependencyManager.getDownloadProvider().injectURLsWithCandidates(remoteVersion.getUrls()));
-        launchMetaTask.setCacheRepository(dependencyManager.getCacheRepository());
-    }
-
-    @Override
-    public boolean doPreExecute() {
-        return true;
-    }
-
-    @Override
-    public void preExecute() throws Exception {
-        if (!Objects.equals("net.minecraft.client.main.Main", version.resolve(dependencyManager.getGameRepository()).getMainClass()))
-            throw new UnsupportedInstallationException(FABRIC_NOT_COMPATIBLE_WITH_FORGE);
-    }
-
-    @Override
-    public Collection<Task<?>> getDependents() {
-        return Collections.singleton(launchMetaTask);
-    }
-
-    @Override
-    public Collection<Task<?>> getDependencies() {
-        return dependencies;
-    }
-
-    @Override
-    public boolean isRelyingOnDependencies() {
-        return false;
-    }
-
-    @Override
-    public void execute() {
-        setResult(getPatch(JsonUtils.GSON.fromJson(launchMetaTask.getResult(), FabricInstallTask.FabricInfo.class), remote.getGameVersion(), remote.getSelfVersion()));
-
-        dependencies.add(dependencyManager.checkLibraryCompletionAsync(getResult(), true));
-    }
-
-    private Version getPatch(FabricInstallTask.FabricInfo legacyFabricInfo, String gameVersion, String loaderVersion) {
-        JsonObject launcherMeta = legacyFabricInfo.getLauncherMeta();
-        Arguments arguments = new Arguments();
-
-        String mainClass;
-        if (!launcherMeta.get("mainClass").isJsonObject()) {
-            mainClass = launcherMeta.get("mainClass").getAsString();
-        } else {
-            mainClass = launcherMeta.get("mainClass").getAsJsonObject().get("client").getAsString();
-        }
-
-        if (launcherMeta.has("launchwrapper")) {
-            String clientTweaker = launcherMeta.get("launchwrapper").getAsJsonObject().get("tweakers").getAsJsonObject().get("client").getAsJsonArray().get(0).getAsString();
-            arguments = arguments.addGameArguments("--tweakClass", clientTweaker);
-        }
-
-        JsonObject librariesObject = launcherMeta.getAsJsonObject("libraries");
-        List<Library> libraries = new ArrayList<>();
-
-        // "common, server" is hard coded in fabric installer.
-        // Don't know the purpose of ignoring client libraries.
-        for (String side : new String[]{"common", "server"}) {
-            for (JsonElement element : librariesObject.getAsJsonArray(side)) {
-                libraries.add(JsonUtils.GSON.fromJson(element, Library.class));
-            }
-        }
-
-        // libraries.add(new Library(Artifact.fromDescriptor(legacyFabricInfo.hashed.maven), getMavenRepositoryByGroup(legacyFabricInfo.hashed.maven), null));
-        libraries.add(new Library(Artifact.fromDescriptor(legacyFabricInfo.getIntermediary().getMaven()), getMavenRepositoryByGroup(legacyFabricInfo.getIntermediary().getMaven()), null));
-        libraries.add(new Library(Artifact.fromDescriptor(legacyFabricInfo.getLoader().getMaven()), getMavenRepositoryByGroup(legacyFabricInfo.getLoader().getMaven()), null));
-
-        return new Version(LibraryAnalyzer.LibraryType.LEGACY_FABRIC.getPatchId(), loaderVersion, Version.PRIORITY_LOADER, arguments, mainClass, libraries);
-    }
-
-    private static String getMavenRepositoryByGroup(String maven) {
-        Artifact artifact = Artifact.fromDescriptor(maven);
-        return switch (artifact.getGroup()) {
-            case "net.fabricmc" -> "https://maven.fabricmc.net/";
-            case "net.legacyfabric" -> "https://maven.legacyfabric.net/";
-            default -> "https://maven.fabricmc.net/";
-        };
-    }
-}

HMCLCore/src/main/java/org/jackhuang/hmcl/download/legacyfabric/LegacyFabricRemoteVersion.java

@@ -1,44 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2022  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.download.legacyfabric;
-
-import org.jackhuang.hmcl.download.DefaultDependencyManager;
-import org.jackhuang.hmcl.download.LibraryAnalyzer;
-import org.jackhuang.hmcl.download.RemoteVersion;
-import org.jackhuang.hmcl.game.Version;
-import org.jackhuang.hmcl.task.Task;
-
-import java.util.List;
-
-public class LegacyFabricRemoteVersion extends RemoteVersion {
-    /**
-     * Constructor.
-     *
-     * @param gameVersion the Minecraft version that this remote version suits.
-     * @param selfVersion the version string of the remote version.
-     * @param urls        the installer or universal jar original URL.
-     */
-    LegacyFabricRemoteVersion(String gameVersion, String selfVersion, List<String> urls) {
-        super(LibraryAnalyzer.LibraryType.LEGACY_FABRIC.getPatchId(), gameVersion, selfVersion, null, urls);
-    }
-
-    @Override
-    public Task<Version> getInstallTask(DefaultDependencyManager dependencyManager, Version baseVersion) {
-        return new LegacyFabricInstallTask(dependencyManager, baseVersion, this);
-    }
-}

HMCLCore/src/main/java/org/jackhuang/hmcl/download/legacyfabric/LegacyFabricVersionList.java

@@ -1,106 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2022  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.download.legacyfabric;
-
-import org.jackhuang.hmcl.download.DownloadProvider;
-import org.jackhuang.hmcl.download.VersionList;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.util.gson.JsonUtils;
-import org.jackhuang.hmcl.util.io.NetworkUtils;
-import org.jetbrains.annotations.Nullable;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static org.jackhuang.hmcl.util.gson.JsonUtils.listTypeOf;
-
-public final class LegacyFabricVersionList extends VersionList<LegacyFabricRemoteVersion> {
-    private final DownloadProvider downloadProvider;
-
-    public LegacyFabricVersionList(DownloadProvider downloadProvider) {
-        this.downloadProvider = downloadProvider;
-    }
-
-    @Override
-    public boolean hasType() {
-        return false;
-    }
-
-    @Override
-    public Task<?> refreshAsync() {
-        return Task.runAsync(() -> {
-            List<String> gameVersions = getGameVersions(GAME_META_URL);
-            List<String> loaderVersions = getGameVersions(LOADER_META_URL);
-
-            lock.writeLock().lock();
-
-            try {
-                for (String gameVersion : gameVersions)
-                    for (String loaderVersion : loaderVersions)
-                        versions.put(gameVersion, new LegacyFabricRemoteVersion(gameVersion, loaderVersion,
-                                Collections.singletonList(getLaunchMetaUrl(gameVersion, loaderVersion))));
-            } finally {
-                lock.writeLock().unlock();
-            }
-        });
-    }
-
-    private static final String LOADER_META_URL = "https://meta.legacyfabric.net/v2/versions/loader";
-    private static final String GAME_META_URL = "https://meta.legacyfabric.net/v2/versions/game";
-
-    private List<String> getGameVersions(String metaUrl) throws IOException {
-        String json = NetworkUtils.doGet(downloadProvider.injectURLWithCandidates(metaUrl));
-        return JsonUtils.GSON.fromJson(json, listTypeOf(GameVersion.class))
-                .stream().map(GameVersion::getVersion).collect(Collectors.toList());
-    }
-
-    private static String getLaunchMetaUrl(String gameVersion, String loaderVersion) {
-        return String.format("https://meta.legacyfabric.net/v2/versions/loader/%s/%s", gameVersion, loaderVersion);
-    }
-
-    private static class GameVersion {
-        private final String version;
-        private final String maven;
-        private final boolean stable;
-
-        public GameVersion() {
-            this("", null, false);
-        }
-
-        public GameVersion(String version, String maven, boolean stable) {
-            this.version = version;
-            this.maven = maven;
-            this.stable = stable;
-        }
-
-        public String getVersion() {
-            return version;
-        }
-
-        @Nullable
-        public String getMaven() {
-            return maven;
-        }
-
-        public boolean isStable() {
-            return stable;
-        }
-    }
-}

HMCLCore/src/main/java/org/jackhuang/hmcl/download/quilt/QuiltAPIInstallTask.java

@@ -59,7 +59,7 @@ public final class QuiltAPIInstallTask extends Task<Version> {
     public void execute() throws IOException {
         dependencies.add(new FileDownloadTask(
                 remote.getVersion().getFile().getUrl(),
-                dependencyManager.getGameRepository().getModsDirectory(version.getId()).resolve("quilt-api-" + remote.getVersion().getVersion() + ".jar"),
+                dependencyManager.getGameRepository().getRunDirectory(version.getId()).resolve("mods").resolve("quilt-api-" + remote.getVersion().getVersion() + ".jar"),
                 remote.getVersion().getFile().getIntegrityCheck())
         );
     }

HMCLCore/src/main/java/org/jackhuang/hmcl/download/quilt/QuiltInstallTask.java

@@ -28,7 +28,6 @@ import org.jackhuang.hmcl.game.Library;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.task.GetTask;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.util.gson.JsonSerializable;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 
 import java.util.*;
@@ -136,7 +135,6 @@ public final class QuiltInstallTask extends Task<Version> {
         }
     }
 
-    @JsonSerializable
     public static class QuiltInfo {
         private final LoaderInfo loader;
         private final IntermediaryInfo hashed;
@@ -167,7 +165,6 @@ public final class QuiltInstallTask extends Task<Version> {
         }
     }
 
-    @JsonSerializable
     public static class LoaderInfo {
         private final String separator;
         private final int build;
@@ -204,7 +201,6 @@ public final class QuiltInstallTask extends Task<Version> {
         }
     }
 
-    @JsonSerializable
     public static class IntermediaryInfo {
         private final String maven;
         private final String version;

HMCLCore/src/main/java/org/jackhuang/hmcl/game/GameJavaVersion.java

@@ -17,18 +17,14 @@
  */
 package org.jackhuang.hmcl.game;
 
-import org.jackhuang.hmcl.util.gson.JsonSerializable;
 import org.jackhuang.hmcl.util.platform.Architecture;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 import org.jackhuang.hmcl.util.platform.Platform;
 import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
-@JsonSerializable
-public record GameJavaVersion(String component, int majorVersion) {
+public final class GameJavaVersion {
     public static final GameJavaVersion JAVA_25 = new GameJavaVersion("java-runtime-epsilon", 25);
     public static final GameJavaVersion JAVA_21 = new GameJavaVersion("java-runtime-delta", 21);
     public static final GameJavaVersion JAVA_17 = new GameJavaVersion("java-runtime-beta", 17);
@@ -90,13 +86,36 @@ public record GameJavaVersion(String component, int majorVersion) {
         return Collections.emptyList();
     }
 
+    private final String component;
+    private final int majorVersion;
+
+    public GameJavaVersion() {
+        this("", 0);
+    }
+
+    public GameJavaVersion(String component, int majorVersion) {
+        this.component = component;
+        this.majorVersion = majorVersion;
+    }
+
+    public String getComponent() {
+        return component;
+    }
+
+    public int getMajorVersion() {
+        return majorVersion;
+    }
+
     @Override
     public int hashCode() {
-        return majorVersion();
+        return getMajorVersion();
     }
 
     @Override
     public boolean equals(Object o) {
-        return this == o || o instanceof GameJavaVersion that && this.majorVersion == that.majorVersion;
+        if (this == o) return true;
+        if (!(o instanceof GameJavaVersion)) return false;
+        GameJavaVersion that = (GameJavaVersion) o;
+        return majorVersion == that.majorVersion;
     }
 }