Make DatapackListPage multiple-selectable

Add filter to hide world that version mismatch
Ignore all color formatting in world name.
2019-03-19 10:31:02 +08:00 · 2019-03-19 00:04:52 +08:00 · 2019-03-18 23:24:50 +08:00 · 2019-03-18 23:17:53 +08:00 · 2019-03-18 20:17:03 +08:00 · 2019-03-18 20:14:31 +08:00
51 changed files with 863 additions and 497 deletions
@@ -112,7 +112,7 @@ def createExecutable(String suffix, String header) {

 processResources {
    ext.convertToBSS = { String resource ->
-        exclude resource
+        // exclude resource
        doFirst {
            def cssFile = new File(this.projectDir, "src/main/resources/" + resource)
            def bssFile = new File(this.projectDir, "build/compiled-resources/" + resource[0..-4] + "bss")
@@ -17,7 +17,6 @@
 */
 package org.jackhuang.hmcl;

-import com.jfoenix.utils.JFXUtilities;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.stage.Stage;
@@ -25,7 +24,9 @@ import org.jackhuang.hmcl.setting.ConfigHolder;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.upgrade.UpdateChecker;
-import org.jackhuang.hmcl.util.*;
+import org.jackhuang.hmcl.util.CrashReporter;
+import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;

 import java.io.File;
@@ -39,6 +40,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;

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

@@ -97,7 +99,7 @@ public final class Launcher extends Application {
    public static void stopApplication() {
        LOG.info("Stopping application.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));

-        JFXUtilities.runInFX(() -> {
+        runInFX(() -> {
            if (Controllers.getStage() == null)
                return;
            Controllers.getStage().close();
@@ -111,7 +113,7 @@ public final class Launcher extends Application {
    public static void stopWithoutPlatform() {
        LOG.info("Stopping application without JavaFX Toolkit.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));

-        JFXUtilities.runInFX(() -> {
+        runInFX(() -> {
            if (Controllers.getStage() == null)
                return;
            Controllers.getStage().close();
@@ -19,7 +19,6 @@ package org.jackhuang.hmcl.setting;

 import com.google.gson.*;
 import com.google.gson.annotations.JsonAdapter;
-import com.jfoenix.utils.JFXUtilities;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
@@ -32,7 +31,7 @@ import org.jackhuang.hmcl.game.HMCLCacheRepository;
 import org.jackhuang.hmcl.game.HMCLGameRepository;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.ui.WeakListenerHolder;
-import org.jackhuang.hmcl.util.*;
+import org.jackhuang.hmcl.util.ToStringBuilder;
 import org.jackhuang.hmcl.util.javafx.ObservableHelper;

 import java.io.File;
@@ -40,6 +39,7 @@ import java.lang.reflect.Type;
 import java.util.Optional;

 import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
+import static org.jackhuang.hmcl.ui.FXUtils.runInFX;

 /**
 *
@@ -144,7 +144,7 @@ public final class Profile implements Observable {
    }

    private void checkSelectedVersion() {
-        JFXUtilities.runInFX(() -> {
+        runInFX(() -> {
            if (!repository.isLoaded()) return;
            String newValue = selectedVersion.get();
            if (!repository.hasVersion(newValue)) {
@@ -17,7 +17,6 @@
 */
 package org.jackhuang.hmcl.setting;

-import com.jfoenix.utils.JFXUtilities;
 import javafx.application.Platform;
 import javafx.beans.Observable;
 import javafx.beans.property.*;
@@ -36,6 +35,7 @@ import java.util.stream.Collectors;
 import static javafx.collections.FXCollections.observableArrayList;
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
+import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 public final class Profiles {
@@ -162,7 +162,7 @@ public final class Profiles {
        });

        EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).registerWeak(event -> {
-            JFXUtilities.runInFX(() -> {
+            runInFX(() -> {
                Profile profile = selectedProfile.get();
                if (profile != null && profile.getRepository() == event.getSource()) {
                    selectedVersion.bind(profile.selectedVersionProperty());
@@ -17,7 +17,6 @@
 */
 package org.jackhuang.hmcl.ui;

-import com.jfoenix.utils.JFXUtilities;
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.image.Image;
@@ -34,8 +33,11 @@ import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.ui.account.AccountList;
 import org.jackhuang.hmcl.ui.account.AuthlibInjectorServersPage;
-import org.jackhuang.hmcl.ui.construct.*;
+import org.jackhuang.hmcl.ui.construct.InputDialogPane;
+import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
+import org.jackhuang.hmcl.ui.construct.PopupMenu;
+import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane;
 import org.jackhuang.hmcl.ui.decorator.DecoratorController;
 import org.jackhuang.hmcl.ui.download.ModpackInstallWizardProvider;
 import org.jackhuang.hmcl.ui.profile.ProfileList;
@@ -58,6 +60,7 @@ import java.util.function.Consumer;
 import java.util.stream.Collectors;

 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 public final class Controllers {
@@ -174,7 +177,7 @@ public final class Controllers {
                            return node;
                        })
                        .collect(Collectors.toList());
-                JFXUtilities.runInFX(() -> {
+                runInFX(() -> {
                    if (profile == Profiles.getSelectedProfile())
                        mainPage.getVersions().setAll(children);
                });
@@ -17,7 +17,6 @@
 */
 package org.jackhuang.hmcl.ui;

-import com.jfoenix.utils.JFXUtilities;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.AuthInfo;
 import org.jackhuang.hmcl.auth.AuthenticationException;
@@ -29,13 +28,15 @@ import java.util.concurrent.CancellationException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;

+import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
+
 public final class DialogController {

    public static AuthInfo logIn(Account account) throws CancellationException, AuthenticationException, InterruptedException {
        if (account instanceof YggdrasilAccount) {
            CountDownLatch latch = new CountDownLatch(1);
            AtomicReference<AuthInfo> res = new AtomicReference<>(null);
-            JFXUtilities.runInFX(() -> {
+            runInFX(() -> {
                AccountLoginPane pane = new AccountLoginPane(account, it -> {
                        res.set(it);
                        latch.countDown();
@@ -17,7 +17,6 @@
 */
 package org.jackhuang.hmcl.ui;

-import com.jfoenix.utils.JFXUtilities;
 import com.jfoenix.controls.*;
 import javafx.animation.Animation;
 import javafx.animation.Interpolator;
@@ -31,6 +30,7 @@ import javafx.beans.value.ObservableValue;
 import javafx.beans.value.WeakChangeListener;
 import javafx.event.EventHandler;
 import javafx.fxml.FXMLLoader;
+import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.*;
@@ -44,7 +44,7 @@ import javafx.scene.shape.Rectangle;
 import javafx.util.Callback;
 import javafx.util.Duration;
 import javafx.util.StringConverter;
-import org.jackhuang.hmcl.util.*;
+import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.i18n.I18n;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.javafx.ExtendedProperties;
@@ -75,6 +75,14 @@ public final class FXUtils {
    private FXUtils() {
    }

+    public static void runInFX(Runnable runnable) {
+        if (Platform.isFxApplicationThread()) {
+            runnable.run();
+        } else {
+            Platform.runLater(runnable);
+        }
+    }
+
    public static void checkFxUserThread() {
        if (!Platform.isFxApplicationThread()) {
            throw new IllegalStateException("Not on FX application thread; currentThread = "
@@ -154,6 +162,20 @@ public final class FXUtils {
                });
    }

+    public static <K, T> void setupCellValueFactory(JFXTreeTableColumn<K, T> column, Function<K, ObservableValue<T>> mapper) {
+        column.setCellValueFactory(param -> {
+            if (column.validateValue(param))
+                return mapper.apply(param.getValue().getValue());
+            else
+                return column.getComputedValue(param);
+        });
+    }
+
+    public static Node wrapMargin(Node node, Insets insets) {
+        StackPane.setMargin(node, insets);
+        return new StackPane(node);
+    }
+
    public static void setValidateWhileTextChanged(Node field, boolean validate) {
        if (field instanceof JFXTextField) {
            if (validate) {
@@ -252,7 +274,7 @@ public final class FXUtils {
    }

    public static void installTooltip(Node node, double openDelay, double visibleDelay, double closeDelay, Tooltip tooltip) {
-        JFXUtilities.runInFX(() -> {
+        runInFX(() -> {
            try {
                // Java 8
                Class<?> behaviorClass = Class.forName("javafx.scene.control.Tooltip$TooltipBehavior");
@@ -17,10 +17,13 @@
 */
 package org.jackhuang.hmcl.ui;

+import com.jfoenix.controls.JFXButton;
 import com.jfoenix.effects.JFXDepthManager;
-import javafx.fxml.FXML;
-import javafx.scene.control.Label;
+import javafx.geometry.Pos;
 import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
+import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.ui.construct.TwoLineListItem;

 import java.util.function.Consumer;

@@ -30,26 +33,37 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 * @author huangyuhui
 */
 public class InstallerItem extends BorderPane {
-    private final Consumer<InstallerItem> deleteCallback;
-
-    @FXML
-    private Label lblInstallerArtifact;
-
-    @FXML
-    private Label lblInstallerVersion;
-
-    public InstallerItem(String artifact, String version, Consumer<InstallerItem> deleteCallback) {
-        this.deleteCallback = deleteCallback;
-        FXUtils.loadFXML(this, "/assets/fxml/version/installer-item.fxml");

+    public InstallerItem(String artifact, String version, Runnable upgrade, Consumer<InstallerItem> deleteCallback) {
+        getStyleClass().add("two-line-list-item");
        setStyle("-fx-background-radius: 2; -fx-background-color: white; -fx-padding: 8;");
        JFXDepthManager.setDepth(this, 1);
-        lblInstallerArtifact.setText(artifact);
-        lblInstallerVersion.setText(i18n("archive.version") + ": " + version);
+
+        {
+            TwoLineListItem item = new TwoLineListItem();
+            item.setTitle(artifact);
+            item.setSubtitle(i18n("archive.version") + ": " + version);
+            setCenter(item);
+        }
+
+        {
+            HBox hBox = new HBox();
+
+            JFXButton upgradeButton = new JFXButton();
+            upgradeButton.setGraphic(SVG.update(Theme.blackFillBinding(), -1, -1));
+            upgradeButton.getStyleClass().add("toggle-icon4");
+            FXUtils.installFastTooltip(upgradeButton, i18n("install.change_version"));
+            upgradeButton.setOnMouseClicked(e -> upgrade.run());
+
+            JFXButton deleteButton = new JFXButton();
+            deleteButton.setGraphic(SVG.close(Theme.blackFillBinding(), -1, -1));
+            deleteButton.getStyleClass().add("toggle-icon4");
+            deleteButton.setOnMouseClicked(e -> deleteCallback.accept(this));
+
+            hBox.setAlignment(Pos.CENTER_RIGHT);
+            hBox.getChildren().setAll(upgradeButton, deleteButton);
+            setRight(hBox);
+        }
    }

-    @FXML
-    private void onDelete() {
-        deleteCallback.accept(this);
-    }
 }
@@ -17,7 +17,6 @@
 */
 package org.jackhuang.hmcl.ui;

-import com.jfoenix.utils.JFXUtilities;
 import javafx.application.Platform;
 import javafx.scene.image.Image;
 import javafx.scene.layout.Region;
@@ -43,6 +42,7 @@ import org.jackhuang.hmcl.util.io.CompressingUtils;
 import java.io.File;
 import java.util.concurrent.atomic.AtomicReference;

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

 public final class LeftPaneController extends AdvancedListBox {
@@ -111,7 +111,7 @@ public final class LeftPaneController extends AdvancedListBox {
    private boolean checkedModpack = false;

    private void onRefreshedVersions(HMCLGameRepository repository) {
-        JFXUtilities.runInFX(() -> {
+        runInFX(() -> {
            if (!checkedModpack) {
                checkedModpack = true;

@@ -18,18 +18,11 @@
 package org.jackhuang.hmcl.ui;

 import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleListProperty;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
 import javafx.scene.Node;
-import javafx.scene.control.Control;
 import javafx.scene.control.Skin;

-public abstract class ListPage<T extends Node> extends Control {
-    private final ListProperty<T> items = new SimpleListProperty<>(this, "items", FXCollections.observableArrayList());
-    private final BooleanProperty loading = new SimpleBooleanProperty(this, "loading", false);
+public abstract class ListPage<T extends Node> extends ListPageBase<T> {
    private final BooleanProperty refreshable = new SimpleBooleanProperty(this, "refreshable", false);

    public abstract void add();
@@ -42,30 +35,6 @@ public abstract class ListPage<T extends Node> extends Control {
        return new ListPageSkin(this);
    }

-    public ObservableList<T> getItems() {
-        return items.get();
-    }
-
-    public void setItems(ObservableList<T> items) {
-        this.items.set(items);
-    }
-
-    public ListProperty<T> itemsProperty() {
-        return items;
-    }
-
-    public boolean isLoading() {
-        return loading.get();
-    }
-
-    public void setLoading(boolean loading) {
-        this.loading.set(loading);
-    }
-
-    public BooleanProperty loadingProperty() {
-        return loading;
-    }
-
    public boolean isRefreshable() {
        return refreshable.get();
    }
@@ -0,0 +1,55 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  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.ListProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.scene.control.Control;
+
+public class ListPageBase<T> extends Control {
+    private final ListProperty<T> items = new SimpleListProperty<>(this, "items", FXCollections.observableArrayList());
+    private final BooleanProperty loading = new SimpleBooleanProperty(this, "loading", false);
+
+    public ObservableList<T> getItems() {
+        return items.get();
+    }
+
+    public void setItems(ObservableList<T> items) {
+        this.items.set(items);
+    }
+
+    public ListProperty<T> itemsProperty() {
+        return items;
+    }
+
+    public boolean isLoading() {
+        return loading.get();
+    }
+
+    public void setLoading(boolean loading) {
+        this.loading.set(loading);
+    }
+
+    public BooleanProperty loadingProperty() {
+        return loading;
+    }
+}
@@ -29,6 +29,10 @@ public final class SVG {
    private SVG() {
    }

+    public interface SVGIcon {
+        Node createIcon(ObjectBinding<? extends Paint> fill, double width, double height);
+    }
+
    private static Node createSVGPath(String d, ObjectBinding<? extends Paint> fill, double width, double height) {
        SVGPath path = new SVGPath();
        path.getStyleClass().add("svg");
@@ -19,6 +19,7 @@ package org.jackhuang.hmcl.ui;

 import com.jfoenix.controls.*;
 import javafx.geometry.HPos;
+import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.geometry.VPos;
 import javafx.scene.Cursor;
@@ -72,7 +73,7 @@ public abstract class SettingsView extends StackPane {

        {
            VBox rootPane = new VBox();
-            rootPane.setStyle("-fx-padding: 18;");
+            rootPane.setPadding(new Insets(36, 18, 36, 18));
            {
                ComponentList settingsPane = new ComponentList();
                {
@@ -80,12 +81,31 @@ public abstract class SettingsView extends StackPane {
                        StackPane sponsorPane = new StackPane();
                        sponsorPane.setCursor(Cursor.HAND);
                        sponsorPane.setOnMouseClicked(e -> onSponsor());
+
+                        GridPane gridPane = new GridPane();
+
+                        ColumnConstraints col = new ColumnConstraints();
+                        col.setHgrow(Priority.SOMETIMES);
+                        col.setMaxWidth(Double.POSITIVE_INFINITY);
+
+                        gridPane.getColumnConstraints().setAll(col);
+
+                        RowConstraints row = new RowConstraints();
+                        row.setMinHeight(Double.NEGATIVE_INFINITY);
+                        row.setValignment(VPos.TOP);
+                        row.setVgrow(Priority.SOMETIMES);
+                        gridPane.getRowConstraints().setAll(row);
+
                        {
                            Label label = new Label(i18n("sponsor.hmcl"));
                            label.setWrapText(true);
-                            label.prefWidthProperty().bind(sponsorPane.widthProperty());
-                            sponsorPane.getChildren().add(label);
+                            label.setTextAlignment(TextAlignment.JUSTIFY);
+                            GridPane.setRowIndex(label, 0);
+                            GridPane.setColumnIndex(label, 0);
+                            gridPane.getChildren().add(label);
                        }
+
+                        sponsorPane.getChildren().setAll(gridPane);
                        settingsPane.getContent().add(sponsorPane);
                    }

@@ -0,0 +1,96 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  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 com.jfoenix.controls.JFXScrollPane;
+import com.jfoenix.effects.JFXDepthManager;
+import javafx.beans.binding.Bindings;
+import javafx.geometry.Insets;
+import javafx.scene.Node;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.SkinBase;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.ui.construct.SpinnerPane;
+
+import java.util.List;
+
+public abstract class ToolbarListPageSkin<T extends ListPageBase<? extends Node>> extends SkinBase<T> {
+
+    public ToolbarListPageSkin(T skinnable) {
+        super(skinnable);
+
+        SpinnerPane spinnerPane = new SpinnerPane();
+        spinnerPane.getStyleClass().add("large-spinner-pane");
+
+        BorderPane root = new BorderPane();
+
+        {
+            HBox toolbar = new HBox();
+            toolbar.getStyleClass().add("jfx-tool-bar-second");
+            JFXDepthManager.setDepth(toolbar, 1);
+            toolbar.setPickOnBounds(false);
+            toolbar.getChildren().setAll(initializeToolbar(skinnable));
+            root.setTop(toolbar);
+        }
+
+        {
+            ScrollPane scrollPane = new ScrollPane();
+            scrollPane.setFitToWidth(true);
+
+            VBox content = new VBox();
+            content.setSpacing(10);
+            content.setPadding(new Insets(10));
+
+            Bindings.bindContent(content.getChildren(), skinnable.itemsProperty());
+
+            scrollPane.setContent(content);
+            JFXScrollPane.smoothScrolling(scrollPane);
+
+            root.setCenter(scrollPane);
+        }
+
+        spinnerPane.loadingProperty().bind(skinnable.loadingProperty());
+        spinnerPane.setContent(root);
+
+        getChildren().setAll(spinnerPane);
+    }
+
+    public static Node wrap(Node node) {
+        StackPane stackPane = new StackPane();
+        stackPane.setPadding(new Insets(0, 5, 0, 2));
+        stackPane.getChildren().setAll(node);
+        return stackPane;
+    }
+
+    public static JFXButton createToolbarButton(String text, SVG.SVGIcon creator, Runnable onClick) {
+        JFXButton ret = new JFXButton();
+        ret.getStyleClass().add("jfx-tool-bar-button");
+        ret.textFillProperty().bind(Theme.foregroundFillBinding());
+        ret.setGraphic(wrap(creator.createIcon(Theme.foregroundFillBinding(), -1, -1)));
+        ret.setText(text);
+        ret.setOnMouseClicked(e -> onClick.run());
+        return ret;
+    }
+
+    protected abstract List<Node> initializeToolbar(T skinnable);
+}
@@ -17,12 +17,9 @@
 */
 package org.jackhuang.hmcl.ui.account;

-import com.jfoenix.utils.JFXUtilities;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXRadioButton;
 import com.jfoenix.effects.JFXDepthManager;
-
-import javafx.beans.binding.Bindings;
 import javafx.geometry.Pos;
 import javafx.scene.control.Label;
 import javafx.scene.control.SkinBase;
@@ -31,17 +28,16 @@ import javafx.scene.image.ImageView;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
-
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.util.javafx.BindingMapping;

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

-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
-
 public class AccountListItemSkin extends SkinBase<AccountListItem> {

    public AccountListItemSkin(AccountListItem skinnable) {
@@ -92,7 +88,7 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {
        btnRefresh.setOnMouseClicked(e -> skinnable.refresh());
        btnRefresh.getStyleClass().add("toggle-icon4");
        btnRefresh.setGraphic(SVG.refresh(Theme.blackFillBinding(), -1, -1));
-        JFXUtilities.runInFX(() -> FXUtils.installFastTooltip(btnRefresh, i18n("button.refresh")));
+        runInFX(() -> FXUtils.installFastTooltip(btnRefresh, i18n("button.refresh")));
        right.getChildren().add(btnRefresh);

        JFXButton btnRemove = new JFXButton();
@@ -100,7 +96,7 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {
        btnRemove.getStyleClass().add("toggle-icon4");
        BorderPane.setAlignment(btnRemove, Pos.CENTER);
        btnRemove.setGraphic(SVG.delete(Theme.blackFillBinding(), -1, -1));
-        JFXUtilities.runInFX(() -> FXUtils.installFastTooltip(btnRemove, i18n("button.delete")));
+        runInFX(() -> FXUtils.installFastTooltip(btnRemove, i18n("button.delete")));
        right.getChildren().add(btnRemove);
        root.setRight(right);

@@ -17,9 +17,10 @@
 */
 package org.jackhuang.hmcl.ui.account;

-import com.jfoenix.utils.JFXUtilities;
-import com.jfoenix.controls.*;
-
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXComboBox;
+import com.jfoenix.controls.JFXPasswordField;
+import com.jfoenix.controls.JFXTextField;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.ListProperty;
@@ -53,6 +54,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
+
 import static java.util.Collections.emptyList;
 import static java.util.Collections.unmodifiableList;
 import static java.util.Objects.requireNonNull;
@@ -293,7 +295,7 @@ public class AddAccountPane extends StackPane {
            } catch (InterruptedException ignore) {
                throw new NoSelectedCharacterException();
            } finally {
-                JFXUtilities.runInFX(() -> Selector.this.fireEvent(new DialogCloseEvent()));
+                runInFX(() -> Selector.this.fireEvent(new DialogCloseEvent()));
            }
        }
    }
@@ -26,11 +26,12 @@ import javafx.beans.value.ObservableValue;
 import javafx.geometry.Pos;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.TreeTableCell;
+import javafx.scene.layout.StackPane;
 import javafx.util.Callback;
 import javafx.util.StringConverter;

 public class JFXCheckBoxTreeTableCell<S,T> extends TreeTableCell<S,T> {
-
+    private final StackPane pane;
    private final CheckBox checkBox;
    private boolean showLabel;
    private ObservableValue<Boolean> booleanProperty;
@@ -49,6 +50,8 @@ public class JFXCheckBoxTreeTableCell<S,T> extends TreeTableCell<S,T> {
            final StringConverter<T> converter) {
        this.getStyleClass().add("check-box-tree-table-cell");
        this.checkBox = new JFXCheckBox();
+        this.pane = new StackPane(checkBox);
+        this.pane.setAlignment(Pos.CENTER);
        setGraphic(null);
        setSelectedStateCallback(getSelectedProperty);
        setConverter(converter);
@@ -101,7 +104,8 @@ public class JFXCheckBoxTreeTableCell<S,T> extends TreeTableCell<S,T> {
            if (showLabel) {
                setText(c.toString(item));
            }
-            setGraphic(checkBox);
+
+            setGraphic(pane);

            if (booleanProperty instanceof BooleanProperty) {
                checkBox.selectedProperty().unbindBidirectional((BooleanProperty)booleanProperty);
@@ -75,12 +75,12 @@ public class RipplerContainer extends StackPane {
        focusedProperty().addListener((a, b, newValue) -> {
            if (newValue) {
                if (!isPressed())
-                    buttonRippler.setOverlayVisible(true);
+                    buttonRippler.showOverlay();
            } else {
-                buttonRippler.setOverlayVisible(false);
+                buttonRippler.hideOverlay();
            }
        });
-        pressedProperty().addListener(o -> buttonRippler.setOverlayVisible(false));
+        pressedProperty().addListener(o -> buttonRippler.hideOverlay());
        setPickOnBounds(false);

        buttonContainer.setPickOnBounds(false);
@@ -17,7 +17,6 @@
 */
 package org.jackhuang.hmcl.ui.construct;

-import com.jfoenix.utils.JFXUtilities;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXProgressBar;
 import javafx.application.Platform;
@@ -34,6 +33,8 @@ import org.jackhuang.hmcl.ui.FXUtils;
 import java.util.Optional;
 import java.util.function.Consumer;

+import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
+
 public class TaskExecutorDialogPane extends StackPane {
    private TaskExecutor executor;
    private Consumer<Region> onCancel;
@@ -121,6 +122,6 @@ public class TaskExecutorDialogPane extends StackPane {
    public void setCancel(Consumer<Region> onCancel) {
        this.onCancel = onCancel;

-        JFXUtilities.runInFX(() -> btnCancel.setDisable(onCancel == null));
+        runInFX(() -> btnCancel.setDisable(onCancel == null));
    }
 }
@@ -22,6 +22,7 @@ import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.download.LibraryAnalyzer;
 import org.jackhuang.hmcl.download.RemoteVersion;
 import org.jackhuang.hmcl.download.game.LibraryDownloadException;
+import org.jackhuang.hmcl.download.optifine.OptiFineInstallTask;
 import org.jackhuang.hmcl.game.Library;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.setting.Profile;
@@ -125,6 +126,8 @@ public final class InstallerWizardProvider implements WizardProvider {
            Controllers.dialog(i18n("launch.failed.download_library", ((LibraryDownloadException) exception).getLibrary().getName()) + "\n" + StringUtils.getStackTrace(exception.getCause()), i18n("install.failed.downloading"), MessageType.ERROR, next);
        } else if (exception instanceof DownloadException) {
            Controllers.dialog(i18n("install.failed.downloading.detail", ((DownloadException) exception).getUrl()) + "\n" + StringUtils.getStackTrace(exception.getCause()), i18n("install.failed.downloading"), MessageType.ERROR, next);
+        } else if (exception instanceof OptiFineInstallTask.UnsupportedOptiFineInstallationException) {
+            Controllers.dialog(i18n("install.failed.optifine_conflict"), i18n("install.failed"), MessageType.ERROR, next);
        } else {
            Controllers.dialog(StringUtils.getStackTrace(exception), i18n("install.failed"), MessageType.ERROR, next);
        }
@@ -0,0 +1,88 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.download;
+
+import javafx.scene.Node;
+import org.jackhuang.hmcl.download.DownloadProvider;
+import org.jackhuang.hmcl.download.MaintainTask;
+import org.jackhuang.hmcl.download.RemoteVersion;
+import org.jackhuang.hmcl.game.Library;
+import org.jackhuang.hmcl.game.Version;
+import org.jackhuang.hmcl.setting.Profile;
+import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.wizard.WizardController;
+import org.jackhuang.hmcl.ui.wizard.WizardProvider;
+
+import java.util.LinkedList;
+import java.util.Map;
+
+import static org.jackhuang.hmcl.ui.download.InstallerWizardProvider.alertFailureMessage;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+public final class UpdateInstallerWizardProvider implements WizardProvider {
+    private final Profile profile;
+    private final String gameVersion;
+    private final Version version;
+    private final String libraryId;
+    private final Library oldLibrary;
+
+    public UpdateInstallerWizardProvider(Profile profile, String gameVersion, Version version, String libraryId, Library oldLibrary) {
+        this.profile = profile;
+        this.gameVersion = gameVersion;
+        this.version = version;
+        this.libraryId = libraryId;
+        this.oldLibrary = oldLibrary;
+    }
+
+    @Override
+    public void start(Map<String, Object> settings) {
+    }
+
+    @Override
+    public Object finish(Map<String, Object> settings) {
+        settings.put("success_message", i18n("install.success"));
+        settings.put("failure_callback", (FailureCallback) (settings1, exception, next) -> alertFailureMessage(exception, next));
+
+        // We remove library but not save it,
+        // so if installation failed will not break down current version.
+        LinkedList<Library> newList = new LinkedList<>(version.getLibraries());
+        newList.remove(oldLibrary);
+        return new MaintainTask(version.setLibraries(newList))
+                .thenCompose(profile.getDependency().installLibraryAsync((RemoteVersion) settings.get(libraryId)))
+                .then(profile.getRepository().refreshVersionsAsync());
+    }
+
+    @Override
+    public Node createPage(WizardController controller, int step, Map<String, Object> settings) {
+        DownloadProvider provider = profile.getDependency().getDownloadProvider();
+        switch (step) {
+            case 0:
+                return new VersionsPage(controller, i18n("install.installer.choose", i18n("install.installer." + libraryId)), gameVersion, provider, libraryId, () -> {
+                    Controllers.confirmDialog(i18n("install.change_version.confirm", i18n("install.installer." + libraryId), oldLibrary.getVersion(), ((RemoteVersion) settings.get(libraryId)).getSelfVersion()),
+                            i18n("install.change_version"), controller::onFinish, controller::onCancel);
+                });
+            default:
+                throw new IllegalStateException();
+        }
+    }
+
+    @Override
+    public boolean cancel() {
+        return true;
+    }
+}
@@ -1,60 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.ui.versions;
-
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXCheckBox;
-import com.jfoenix.effects.JFXDepthManager;
-import javafx.geometry.Pos;
-import javafx.scene.layout.BorderPane;
-import org.jackhuang.hmcl.mod.Datapack;
-import org.jackhuang.hmcl.setting.Theme;
-import org.jackhuang.hmcl.ui.FXUtils;
-import org.jackhuang.hmcl.ui.SVG;
-import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
-
-import java.util.function.Consumer;
-
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
-public class DatapackListItem extends BorderPane {
-
-    public DatapackListItem(Datapack.Pack info, Consumer<DatapackListItem> deleteCallback) {
-        JFXCheckBox chkEnabled = new JFXCheckBox();
-        BorderPane.setAlignment(chkEnabled, Pos.CENTER);
-        setLeft(chkEnabled);
-
-        TwoLineListItem modItem = new TwoLineListItem();
-        BorderPane.setAlignment(modItem, Pos.CENTER);
-        setCenter(modItem);
-
-        JFXButton btnRemove = new JFXButton();
-        FXUtils.installFastTooltip(btnRemove, i18n("datapack.remove"));
-        btnRemove.setOnMouseClicked(e -> deleteCallback.accept(this));
-        btnRemove.getStyleClass().add("toggle-icon4");
-        BorderPane.setAlignment(btnRemove, Pos.CENTER);
-        btnRemove.setGraphic(SVG.close(Theme.blackFillBinding(), 15, 15));
-        setRight(btnRemove);
-
-        setStyle("-fx-background-radius: 2; -fx-background-color: white; -fx-padding: 8;");
-        JFXDepthManager.setDepth(this, 1);
-        modItem.setTitle(info.getId());
-        modItem.setSubtitle(info.getDescription());
-        chkEnabled.selectedProperty().bindBidirectional(info.activeProperty());
-    }
-}
@@ -19,11 +19,15 @@ package org.jackhuang.hmcl.ui.versions;

 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
+import javafx.collections.ObservableList;
+import javafx.scene.control.Skin;
+import javafx.scene.control.TreeItem;
 import javafx.stage.FileChooser;
 import org.jackhuang.hmcl.mod.Datapack;
+import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
-import org.jackhuang.hmcl.ui.ListPage;
+import org.jackhuang.hmcl.ui.ListPageBase;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
 import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.io.FileUtils;
@@ -32,16 +36,19 @@ import org.jackhuang.hmcl.util.javafx.MappedObservableList;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
-import java.util.*;
+import java.util.List;
+import java.util.Objects;
 import java.util.logging.Level;

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

-public class DatapackListPage extends ListPage<DatapackListItem> implements DecoratorPage {
+public class DatapackListPage extends ListPageBase<DatapackListPageSkin.DatapackInfoObject> implements DecoratorPage {
    private final StringProperty title = new SimpleStringProperty();
    private final Path worldDir;
    private final Datapack datapack;

+    private final ObservableList<DatapackListPageSkin.DatapackInfoObject> items;
+
    public DatapackListPage(String worldName, Path worldDir) {
        this.worldDir = worldDir;

@@ -50,14 +57,7 @@ public class DatapackListPage extends ListPage<DatapackListItem> implements Deco
        datapack = new Datapack(worldDir.resolve("datapacks"));
        datapack.loadFromDir();

-        setItems(MappedObservableList.create(datapack.getInfo(),
-                pack -> new DatapackListItem(pack, item -> {
-                    try {
-                        datapack.deletePack(pack);
-                    } catch (IOException e) {
-                        Logging.LOG.warning("Failed to delete datapack");
-                    }
-                })));
+        setItems(items = MappedObservableList.create(datapack.getInfo(), DatapackListPageSkin.DatapackInfoObject::new));

        FXUtils.applyDragListener(this, it -> Objects.equals("zip", FileUtils.getExtension(it)), mods -> {
            mods.forEach(it -> {
@@ -69,7 +69,19 @@ public class DatapackListPage extends ListPage<DatapackListItem> implements Deco
                    Logging.LOG.log(Level.WARNING, "Unable to parse datapack file " + it, e);
                }
            });
-        }, datapack::loadFromDir);
+        }, this::refresh);
+    }
+
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new DatapackListPageSkin(this);
+    }
+
+    public void refresh() {
+        setLoading(true);
+        Task.of(datapack::loadFromDir)
+                .with(Task.of(() -> setLoading(false)))
+                .start();
    }

    @Override
@@ -77,7 +89,6 @@ public class DatapackListPage extends ListPage<DatapackListItem> implements Deco
        return title;
    }

-    @Override
    public void add() {
        FileChooser chooser = new FileChooser();
        chooser.setTitle(i18n("datapack.choose_datapack"));
@@ -97,4 +108,32 @@ public class DatapackListPage extends ListPage<DatapackListItem> implements Deco

        datapack.loadFromDir();
    }
+
+    void removeSelected(ObservableList<TreeItem<DatapackListPageSkin.DatapackInfoObject>> selectedItems) {
+        selectedItems.stream()
+                .map(TreeItem::getValue)
+                .map(DatapackListPageSkin.DatapackInfoObject::getPackInfo)
+                .forEach(pack -> {
+                    try {
+                        datapack.deletePack(pack);
+                    } catch (IOException e) {
+                        // Fail to remove mods if the game is running or the datapack is absent.
+                        Logging.LOG.warning("Failed to delete datapack " + pack);
+                    }
+                });
+    }
+
+    void enableSelected(ObservableList<TreeItem<DatapackListPageSkin.DatapackInfoObject>> selectedItems) {
+        selectedItems.stream()
+                .map(TreeItem::getValue)
+                .map(DatapackListPageSkin.DatapackInfoObject::getPackInfo)
+                .forEach(info -> info.setActive(true));
+    }
+
+    void disableSelected(ObservableList<TreeItem<DatapackListPageSkin.DatapackInfoObject>> selectedItems) {
+        selectedItems.stream()
+                .map(TreeItem::getValue)
+                .map(DatapackListPageSkin.DatapackInfoObject::getPackInfo)
+                .forEach(info -> info.setActive(false));
+    }
 }
@@ -0,0 +1,126 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.versions;
+
+import com.jfoenix.controls.JFXTreeTableColumn;
+import com.jfoenix.controls.JFXTreeTableView;
+import com.jfoenix.controls.RecursiveTreeItem;
+import com.jfoenix.controls.datamodels.treetable.RecursiveTreeObject;
+import com.jfoenix.effects.JFXDepthManager;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.geometry.Insets;
+import javafx.scene.Node;
+import javafx.scene.control.SelectionMode;
+import javafx.scene.control.SkinBase;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
+import org.jackhuang.hmcl.mod.Datapack;
+import org.jackhuang.hmcl.ui.SVG;
+import org.jackhuang.hmcl.ui.construct.JFXCheckBoxTreeTableCell;
+import org.jackhuang.hmcl.ui.construct.SpinnerPane;
+import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
+import org.jackhuang.hmcl.util.StringUtils;
+
+import static org.jackhuang.hmcl.ui.FXUtils.setupCellValueFactory;
+import static org.jackhuang.hmcl.ui.FXUtils.wrapMargin;
+import static org.jackhuang.hmcl.ui.ToolbarListPageSkin.createToolbarButton;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+class DatapackListPageSkin extends SkinBase<DatapackListPage> {
+
+    DatapackListPageSkin(DatapackListPage skinnable) {
+        super(skinnable);
+
+        BorderPane root = new BorderPane();
+        JFXTreeTableView<DatapackInfoObject> tableView = new JFXTreeTableView<>();
+
+        {
+            HBox toolbar = new HBox();
+            toolbar.getStyleClass().add("jfx-tool-bar-second");
+            JFXDepthManager.setDepth(toolbar, 1);
+            toolbar.setPickOnBounds(false);
+
+            toolbar.getChildren().add(createToolbarButton(i18n("button.refresh"), SVG::refresh, skinnable::refresh));
+            toolbar.getChildren().add(createToolbarButton(i18n("datapack.add"), SVG::plus, skinnable::add));
+            toolbar.getChildren().add(createToolbarButton(i18n("mods.remove"), SVG::delete, () ->
+                    skinnable.removeSelected(tableView.getSelectionModel().getSelectedItems())));
+            toolbar.getChildren().add(createToolbarButton(i18n("mods.enable"), SVG::check, () ->
+                    skinnable.enableSelected(tableView.getSelectionModel().getSelectedItems())));
+            toolbar.getChildren().add(createToolbarButton(i18n("mods.disable"), SVG::close, () ->
+                    skinnable.disableSelected(tableView.getSelectionModel().getSelectedItems())));
+            root.setTop(toolbar);
+        }
+
+        {
+            SpinnerPane center = new SpinnerPane();
+            center.getStyleClass().add("large-spinner-pane");
+            center.loadingProperty().bind(skinnable.loadingProperty());
+
+            tableView.getStyleClass().addAll("no-header");
+            tableView.setShowRoot(false);
+            tableView.setEditable(true);
+            tableView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
+            tableView.setRoot(new RecursiveTreeItem<>(skinnable.getItems(), RecursiveTreeObject::getChildren));
+
+            JFXTreeTableColumn<DatapackInfoObject, Boolean> activeColumn = new JFXTreeTableColumn<>();
+            setupCellValueFactory(activeColumn, DatapackInfoObject::activeProperty);
+            activeColumn.setCellFactory(c -> new JFXCheckBoxTreeTableCell<>());
+            activeColumn.setEditable(true);
+            activeColumn.setMaxWidth(40);
+            activeColumn.setMinWidth(40);
+
+            JFXTreeTableColumn<DatapackInfoObject, Node> detailColumn = new JFXTreeTableColumn<>();
+            setupCellValueFactory(detailColumn, DatapackInfoObject::nodeProperty);
+
+            tableView.getColumns().setAll(activeColumn, detailColumn);
+
+            tableView.setColumnResizePolicy(JFXTreeTableView.CONSTRAINED_RESIZE_POLICY);
+            center.setContent(tableView);
+            root.setCenter(center);
+        }
+
+        getChildren().setAll(root);
+    }
+
+    static class DatapackInfoObject extends RecursiveTreeObject<DatapackInfoObject> {
+        private final BooleanProperty active;
+        private final Datapack.Pack packInfo;
+        private final ObjectProperty<Node> node;
+
+        DatapackInfoObject(Datapack.Pack packInfo) {
+            this.packInfo = packInfo;
+            this.active = packInfo.activeProperty();
+            this.node = new SimpleObjectProperty<>(wrapMargin(new TwoLineListItem(packInfo.getId(), StringUtils.parseColorEscapes(packInfo.getDescription())),
+                    new Insets(8, 0, 8, 0)));
+        }
+
+        BooleanProperty activeProperty() {
+            return active;
+        }
+
+        ObjectProperty<Node> nodeProperty() {
+            return node;
+        }
+
+        Datapack.Pack getPackInfo() {
+            return packInfo;
+        }
+    }
+}
@@ -17,12 +17,10 @@
 */
 package org.jackhuang.hmcl.ui.versions;

-import com.jfoenix.utils.JFXUtilities;
 import javafx.application.Platform;
-import javafx.beans.property.*;
-import javafx.collections.FXCollections;
-import javafx.scene.control.Control;
-import javafx.scene.control.Skin;
+import javafx.beans.property.ReadOnlyStringProperty;
+import javafx.beans.property.ReadOnlyStringWrapper;
+import javafx.scene.Node;
 import javafx.scene.control.ToggleGroup;
 import org.jackhuang.hmcl.event.EventBus;
 import org.jackhuang.hmcl.event.RefreshingVersionsEvent;
@@ -30,32 +28,31 @@ import org.jackhuang.hmcl.game.HMCLGameRepository;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
-import org.jackhuang.hmcl.ui.Controllers;
-import org.jackhuang.hmcl.ui.WeakListenerHolder;
+import org.jackhuang.hmcl.ui.*;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
 import org.jackhuang.hmcl.ui.download.ModpackInstallWizardProvider;
 import org.jackhuang.hmcl.ui.download.VanillaInstallWizardProvider;
 import org.jackhuang.hmcl.util.i18n.I18n;
 import org.jackhuang.hmcl.util.versioning.VersionNumber;

+import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;

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

-public class GameList extends Control implements DecoratorPage {
+public class GameList extends ListPageBase<GameListItem> implements DecoratorPage {
    private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper(I18n.i18n("version.manage"));
-    private final BooleanProperty loading = new SimpleBooleanProperty(true);
-    private final ListProperty<GameListItem> items = new SimpleListProperty<>(FXCollections.observableArrayList());

    private ToggleGroup toggleGroup;

    public GameList() {
        EventBus.EVENT_BUS.channel(RefreshingVersionsEvent.class).register(event -> {
            if (event.getSource() == Profiles.getSelectedProfile().getRepository())
-                JFXUtilities.runInFX(() -> loading.set(true));
+                runInFX(() -> setLoading(true));
        });

        Profiles.registerVersionsListener(this::loadVersions);
@@ -72,10 +69,10 @@ public class GameList extends Control implements DecoratorPage {
                        .thenComparing(a -> VersionNumber.asVersion(a.getId())))
                .map(version -> new GameListItem(toggleGroup, profile, version.getId()))
                .collect(Collectors.toList());
-        JFXUtilities.runInFX(() -> {
+        runInFX(() -> {
            if (profile == Profiles.getSelectedProfile()) {
-                loading.set(false);
-                items.setAll(children);
+                setLoading(false);
+                itemsProperty().setAll(children);
                children.forEach(GameListItem::checkSelection);

                profile.selectedVersionProperty().addListener(listenerHolder.weak((a, b, newValue) -> {
@@ -97,8 +94,8 @@ public class GameList extends Control implements DecoratorPage {
    }

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

    void addNewGame() {
@@ -128,11 +125,20 @@ public class GameList extends Control implements DecoratorPage {
        return title.getReadOnlyProperty();
    }

-    public BooleanProperty loadingProperty() {
-        return loading;
-    }
+    private class GameListSkin extends ToolbarListPageSkin<GameList> {

-    public ListProperty<GameListItem> itemsProperty() {
-        return items;
+        public GameListSkin() {
+            super(GameList.this);
+        }
+
+        @Override
+        protected List<Node> initializeToolbar(GameList skinnable) {
+            return Arrays.asList(
+                    createToolbarButton(i18n("install.new_game"), SVG::plus, skinnable::addNewGame),
+                    createToolbarButton(i18n("install.modpack"), SVG::importIcon, skinnable::importModpack),
+                    createToolbarButton(i18n("button.refresh"), SVG::refresh, skinnable::refresh),
+                    createToolbarButton(i18n("settings.type.global.manage"), SVG::gear, skinnable::modifyGlobalGameSettings)
+            );
+        }
    }
 }
@@ -17,7 +17,6 @@
 */
 package org.jackhuang.hmcl.ui.versions;

-import com.jfoenix.utils.JFXUtilities;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXPopup;
 import com.jfoenix.controls.JFXRadioButton;
@@ -33,6 +32,7 @@ import org.jackhuang.hmcl.ui.construct.IconedMenuItem;
 import org.jackhuang.hmcl.ui.construct.MenuSeparator;
 import org.jackhuang.hmcl.ui.construct.PopupMenu;

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

 public class GameListItemSkin extends SkinBase<GameListItem> {
@@ -73,7 +73,7 @@ public class GameListItemSkin extends SkinBase<GameListItem> {
            btnUpgrade.setOnMouseClicked(e -> skinnable.update());
            btnUpgrade.getStyleClass().add("toggle-icon4");
            btnUpgrade.setGraphic(SVG.update(Theme.blackFillBinding(), -1, -1));
-            JFXUtilities.runInFX(() -> FXUtils.installFastTooltip(btnUpgrade, i18n("version.update")));
+            runInFX(() -> FXUtils.installFastTooltip(btnUpgrade, i18n("version.update")));
            right.getChildren().add(btnUpgrade);
        }

@@ -1,116 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.ui.versions;
-
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXScrollPane;
-import com.jfoenix.effects.JFXDepthManager;
-import javafx.beans.binding.Bindings;
-import javafx.geometry.Insets;
-import javafx.scene.Node;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.control.SkinBase;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.setting.Theme;
-import org.jackhuang.hmcl.ui.SVG;
-import org.jackhuang.hmcl.ui.construct.SpinnerPane;
-import org.jackhuang.hmcl.util.i18n.I18n;
-
-public class GameListSkin extends SkinBase<GameList> {
-
-    private static Node wrap(Node node) {
-        StackPane stackPane = new StackPane();
-        stackPane.setPadding(new Insets(0, 5, 0, 2));
-        stackPane.getChildren().setAll(node);
-        return stackPane;
-    }
-
-    public GameListSkin(GameList skinnable) {
-        super(skinnable);
-
-        BorderPane root = new BorderPane();
-
-        {
-            HBox toolbar = new HBox();
-            toolbar.getStyleClass().add("jfx-tool-bar-second");
-            JFXDepthManager.setDepth(toolbar, 1);
-            toolbar.setPickOnBounds(false);
-
-            JFXButton btnAddNewGame = new JFXButton();
-            btnAddNewGame.getStyleClass().add("jfx-tool-bar-button");
-            btnAddNewGame.textFillProperty().bind(Theme.foregroundFillBinding());
-            btnAddNewGame.setGraphic(wrap(SVG.plus(Theme.foregroundFillBinding(), -1, -1)));
-            btnAddNewGame.setText(I18n.i18n("install.new_game"));
-            btnAddNewGame.setOnMouseClicked(e -> skinnable.addNewGame());
-            toolbar.getChildren().add(btnAddNewGame);
-
-            JFXButton btnImportModpack = new JFXButton();
-            btnImportModpack.getStyleClass().add("jfx-tool-bar-button");
-            btnImportModpack.textFillProperty().bind(Theme.foregroundFillBinding());
-            btnImportModpack.setGraphic(wrap(SVG.importIcon(Theme.foregroundFillBinding(), -1, -1)));
-            btnImportModpack.setText(I18n.i18n("install.modpack"));
-            btnImportModpack.setOnMouseClicked(e -> skinnable.importModpack());
-            toolbar.getChildren().add(btnImportModpack);
-
-            JFXButton btnRefresh = new JFXButton();
-            btnRefresh.getStyleClass().add("jfx-tool-bar-button");
-            btnRefresh.textFillProperty().bind(Theme.foregroundFillBinding());
-            btnRefresh.setGraphic(wrap(SVG.refresh(Theme.foregroundFillBinding(), -1, -1)));
-            btnRefresh.setText(I18n.i18n("button.refresh"));
-            btnRefresh.setOnMouseClicked(e -> skinnable.refresh());
-            toolbar.getChildren().add(btnRefresh);
-
-            JFXButton btnModify = new JFXButton();
-            btnModify.getStyleClass().add("jfx-tool-bar-button");
-            btnModify.textFillProperty().bind(Theme.foregroundFillBinding());
-            btnModify.setGraphic(wrap(SVG.gear(Theme.foregroundFillBinding(), -1, -1)));
-            btnModify.setText(I18n.i18n("settings.type.global.manage"));
-            btnModify.setOnMouseClicked(e -> skinnable.modifyGlobalGameSettings());
-            toolbar.getChildren().add(btnModify);
-
-            root.setTop(toolbar);
-        }
-
-        {
-            SpinnerPane center = new SpinnerPane();
-            center.loadingProperty().bind(skinnable.loadingProperty());
-            center.getStyleClass().add("large-spinner-pane");
-
-            ScrollPane scrollPane = new ScrollPane();
-            scrollPane.setFitToWidth(true);
-
-            VBox gameList = new VBox();
-            gameList.maxWidthProperty().bind(scrollPane.widthProperty());
-            gameList.setSpacing(10);
-            gameList.setStyle("-fx-padding: 10 10 10 10;");
-
-            Bindings.bindContent(gameList.getChildren(), skinnable.itemsProperty());
-
-            scrollPane.setContent(gameList);
-            JFXScrollPane.smoothScrolling(scrollPane);
-
-            center.setContent(scrollPane);
-            root.setCenter(center);
-        }
-
-        getChildren().setAll(root);
-    }
-}
@@ -30,9 +30,9 @@ import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.InstallerItem;
 import org.jackhuang.hmcl.ui.ListPage;
 import org.jackhuang.hmcl.ui.download.InstallerWizardProvider;
+import org.jackhuang.hmcl.ui.download.UpdateInstallerWizardProvider;

 import java.util.LinkedList;
-import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Function;

@@ -42,37 +42,50 @@ public class InstallerListPage extends ListPage<InstallerItem> {
    private Profile profile;
    private String versionId;
    private Version version;
+    private String gameVersion;

    public void loadVersion(Profile profile, String versionId) {
        this.profile = profile;
        this.versionId = versionId;
        this.version = profile.getRepository().getResolvedVersion(versionId);
+        this.gameVersion = null;

-        LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(version);
+        Task.ofResult(() -> {
+            gameVersion = GameVersion.minecraftVersion(profile.getRepository().getVersionJar(version)).orElse(null);

-        Function<Library, Consumer<InstallerItem>> removeAction = library -> x -> {
-            LinkedList<Library> newList = new LinkedList<>(version.getLibraries());
-            newList.remove(library);
-            new MaintainTask(version.setLibraries(newList))
-                    .then(maintainedVersion -> new VersionJsonSaveTask(profile.getRepository(), maintainedVersion))
-                    .with(profile.getRepository().refreshVersionsAsync())
-                    .with(Task.of(Schedulers.javafx(), () -> loadVersion(this.profile, this.versionId)))
-                    .start();
-        };
+            return LibraryAnalyzer.analyze(version);
+        }).thenAccept(Schedulers.javafx(), analyzer -> {
+            Function<Library, Consumer<InstallerItem>> removeAction = library -> x -> {
+                LinkedList<Library> newList = new LinkedList<>(version.getLibraries());
+                newList.remove(library);
+                new MaintainTask(version.setLibraries(newList))
+                        .then(maintainedVersion -> new VersionJsonSaveTask(profile.getRepository(), maintainedVersion))
+                        .with(profile.getRepository().refreshVersionsAsync())
+                        .with(Task.of(Schedulers.javafx(), () -> loadVersion(this.profile, this.versionId)))
+                        .start();
+            };

-        itemsProperty().clear();
-        analyzer.getForge().ifPresent(library -> itemsProperty().add(new InstallerItem("Forge", library.getVersion(), removeAction.apply(library))));
-        analyzer.getLiteLoader().ifPresent(library -> itemsProperty().add(new InstallerItem("LiteLoader", library.getVersion(), removeAction.apply(library))));
-        analyzer.getOptiFine().ifPresent(library -> itemsProperty().add(new InstallerItem("OptiFine", library.getVersion(), removeAction.apply(library))));
+            itemsProperty().clear();
+            analyzer.getForge().ifPresent(library -> itemsProperty().add(
+                    new InstallerItem("Forge", library.getVersion(), () -> {
+                        Controllers.getDecorator().startWizard(new UpdateInstallerWizardProvider(profile, gameVersion, version, "forge", library));
+                    }, removeAction.apply(library))));
+            analyzer.getLiteLoader().ifPresent(library -> itemsProperty().add(
+                    new InstallerItem("LiteLoader", library.getVersion(), () -> {
+                        Controllers.getDecorator().startWizard(new UpdateInstallerWizardProvider(profile, gameVersion, version, "liteloader", library));
+                    }, removeAction.apply(library))));
+            analyzer.getOptiFine().ifPresent(library -> itemsProperty().add(
+                    new InstallerItem("OptiFine", library.getVersion(), () -> {
+                        Controllers.getDecorator().startWizard(new UpdateInstallerWizardProvider(profile, gameVersion, version, "optifine", library));
+                    }, removeAction.apply(library))));
+        }).start();
    }

    @Override
    public void add() {
-        Optional<String> gameVersion = GameVersion.minecraftVersion(profile.getRepository().getVersionJar(version));
-
-        if (!gameVersion.isPresent())
+        if (gameVersion == null)
            Controllers.dialog(i18n("version.cannot_read"));
        else
-            Controllers.getDecorator().startWizard(new InstallerWizardProvider(profile, gameVersion.get(), version));
+            Controllers.getDecorator().startWizard(new InstallerWizardProvider(profile, gameVersion, version));
    }
 }
@@ -17,18 +17,14 @@
 */
 package org.jackhuang.hmcl.ui.versions;

-import com.jfoenix.utils.JFXUtilities;
 import com.jfoenix.controls.JFXTabPane;
 import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleListProperty;
-import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import javafx.scene.control.Control;
 import javafx.scene.control.Skin;
 import javafx.scene.control.TreeItem;
 import javafx.stage.FileChooser;
+import org.jackhuang.hmcl.download.LibraryAnalyzer;
 import org.jackhuang.hmcl.mod.ModInfo;
 import org.jackhuang.hmcl.mod.ModManager;
 import org.jackhuang.hmcl.setting.Profile;
@@ -36,6 +32,7 @@ import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.ListPageBase;
 import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.io.FileUtils;

@@ -47,14 +44,15 @@ import java.util.List;
 import java.util.logging.Level;
 import java.util.stream.Collectors;

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

-public final class ModListPage extends Control {
-    private final ListProperty<ModListPageSkin.ModInfoObject> items = new SimpleListProperty<>(this, "items", FXCollections.observableArrayList());
-    private final BooleanProperty loading = new SimpleBooleanProperty(this, "loading", false);
+public final class ModListPage extends ListPageBase<ModListPageSkin.ModInfoObject> {
+    private final BooleanProperty modded = new SimpleBooleanProperty(this, "modded", false);

    private JFXTabPane parentTab;
    private ModManager modManager;
+    private LibraryAnalyzer libraryAnalyzer;

    public ModListPage() {

@@ -80,14 +78,16 @@ public final class ModListPage extends Control {
    }

    public void loadVersion(Profile profile, String id) {
+        libraryAnalyzer = LibraryAnalyzer.analyze(profile.getRepository().getResolvedVersion(id));
+        modded.set(libraryAnalyzer.hasForge() || libraryAnalyzer.hasLiteLoader());
        loadMods(profile.getRepository().getModManager(id));
    }

-    public void loadMods(ModManager modManager) {
+    private void loadMods(ModManager modManager) {
        this.modManager = modManager;
        Task.ofResult(() -> {
            synchronized (ModListPage.this) {
-                JFXUtilities.runInFX(() -> loadingProperty().set(true));
+                runInFX(() -> loadingProperty().set(true));
                modManager.refreshMods();
                return new LinkedList<>(modManager.getMods());
            }
@@ -138,7 +138,7 @@ public final class ModListPage extends Control {
        this.parentTab = parentTab;
    }

-    public void removeSelectedMods(ObservableList<TreeItem<ModListPageSkin.ModInfoObject>> selectedItems) {
+    public void removeSelected(ObservableList<TreeItem<ModListPageSkin.ModInfoObject>> selectedItems) {
        try {
            modManager.removeMods(selectedItems.stream()
                    .map(TreeItem::getValue)
@@ -150,41 +150,29 @@ public final class ModListPage extends Control {
        }
    }

-    public void enableSelectedMods(ObservableList<TreeItem<ModListPageSkin.ModInfoObject>> selectedItems) {
+    public void enableSelected(ObservableList<TreeItem<ModListPageSkin.ModInfoObject>> selectedItems) {
        selectedItems.stream()
                .map(TreeItem::getValue)
                .map(ModListPageSkin.ModInfoObject::getModInfo)
                .forEach(info -> info.setActive(true));
    }

-    public void disableSelectedMods(ObservableList<TreeItem<ModListPageSkin.ModInfoObject>> selectedItems) {
+    public void disableSelected(ObservableList<TreeItem<ModListPageSkin.ModInfoObject>> selectedItems) {
        selectedItems.stream()
                .map(TreeItem::getValue)
                .map(ModListPageSkin.ModInfoObject::getModInfo)
                .forEach(info -> info.setActive(false));
    }

-    public ObservableList<ModListPageSkin.ModInfoObject> getItems() {
-        return items.get();
+    public boolean isModded() {
+        return modded.get();
    }

-    public void setItems(ObservableList<ModListPageSkin.ModInfoObject> items) {
-        this.items.set(items);
+    public BooleanProperty moddedProperty() {
+        return modded;
    }

-    public ListProperty<ModListPageSkin.ModInfoObject> itemsProperty() {
-        return items;
-    }
-
-    public boolean isLoading() {
-        return loading.get();
-    }
-
-    public void setLoading(boolean loading) {
-        this.loading.set(loading);
-    }
-
-    public BooleanProperty loadingProperty() {
-        return loading;
+    public void setModded(boolean modded) {
+        this.modded.set(modded);
    }
 }
@@ -17,42 +17,43 @@
 */
 package org.jackhuang.hmcl.ui.versions;

-import com.jfoenix.controls.*;
+import com.jfoenix.controls.JFXTreeTableColumn;
+import com.jfoenix.controls.JFXTreeTableView;
+import com.jfoenix.controls.RecursiveTreeItem;
 import com.jfoenix.controls.datamodels.treetable.RecursiveTreeObject;
 import com.jfoenix.effects.JFXDepthManager;
 import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.beans.value.ObservableValue;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.geometry.Insets;
 import javafx.scene.Node;
-import javafx.scene.control.*;
+import javafx.scene.control.Label;
+import javafx.scene.control.SelectionMode;
+import javafx.scene.control.SkinBase;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
-import javafx.util.Callback;
 import org.jackhuang.hmcl.mod.ModInfo;
-import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.construct.JFXCheckBoxTreeTableCell;
 import org.jackhuang.hmcl.ui.construct.SpinnerPane;
+import org.jackhuang.hmcl.ui.construct.TwoLineListItem;

-import java.util.function.Function;
-
+import static org.jackhuang.hmcl.ui.FXUtils.setupCellValueFactory;
+import static org.jackhuang.hmcl.ui.FXUtils.wrapMargin;
+import static org.jackhuang.hmcl.ui.ToolbarListPageSkin.createToolbarButton;
+import static org.jackhuang.hmcl.util.StringUtils.isNotBlank;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

-public class ModListPageSkin extends SkinBase<ModListPage> {
+class ModListPageSkin extends SkinBase<ModListPage> {

-    private static Node wrap(Node node) {
-        StackPane stackPane = new StackPane();
-        stackPane.setPadding(new Insets(0, 5, 0, 2));
-        stackPane.getChildren().setAll(node);
-        return stackPane;
-    }
-
-    public ModListPageSkin(ModListPage skinnable) {
+    ModListPageSkin(ModListPage skinnable) {
        super(skinnable);

+        StackPane pane = new StackPane();
+        pane.getStyleClass().addAll("notice-pane", "white-background");
+
        BorderPane root = new BorderPane();
        JFXTreeTableView<ModInfoObject> tableView = new JFXTreeTableView<>();

@@ -62,46 +63,14 @@ public class ModListPageSkin extends SkinBase<ModListPage> {
            JFXDepthManager.setDepth(toolbar, 1);
            toolbar.setPickOnBounds(false);

-            JFXButton btnRefresh = new JFXButton();
-            btnRefresh.getStyleClass().add("jfx-tool-bar-button");
-            btnRefresh.textFillProperty().bind(Theme.foregroundFillBinding());
-            btnRefresh.setGraphic(wrap(SVG.refresh(Theme.foregroundFillBinding(), -1, -1)));
-            btnRefresh.setText(i18n("button.refresh"));
-            btnRefresh.setOnMouseClicked(e -> skinnable.refresh());
-            toolbar.getChildren().add(btnRefresh);
-
-            JFXButton btnAddMod = new JFXButton();
-            btnAddMod.getStyleClass().add("jfx-tool-bar-button");
-            btnAddMod.textFillProperty().bind(Theme.foregroundFillBinding());
-            btnAddMod.setGraphic(wrap(SVG.plus(Theme.foregroundFillBinding(), -1, -1)));
-            btnAddMod.setText(i18n("mods.add"));
-            btnAddMod.setOnMouseClicked(e -> skinnable.add());
-            toolbar.getChildren().add(btnAddMod);
-
-            JFXButton btnRemove = new JFXButton();
-            btnRemove.getStyleClass().add("jfx-tool-bar-button");
-            btnRemove.textFillProperty().bind(Theme.foregroundFillBinding());
-            btnRemove.setGraphic(wrap(SVG.delete(Theme.foregroundFillBinding(), -1, -1)));
-            btnRemove.setText(i18n("mods.remove"));
-            btnRemove.setOnMouseClicked(e -> skinnable.removeSelectedMods(tableView.getSelectionModel().getSelectedItems()));
-            toolbar.getChildren().add(btnRemove);
-
-            JFXButton btnEnable = new JFXButton();
-            btnEnable.getStyleClass().add("jfx-tool-bar-button");
-            btnEnable.textFillProperty().bind(Theme.foregroundFillBinding());
-            btnEnable.setGraphic(wrap(SVG.check(Theme.foregroundFillBinding(), -1, -1)));
-            btnEnable.setText(i18n("mods.enable"));
-            btnEnable.setOnMouseClicked(e -> skinnable.enableSelectedMods(tableView.getSelectionModel().getSelectedItems()));
-            toolbar.getChildren().add(btnEnable);
-
-            JFXButton btnDisable = new JFXButton();
-            btnDisable.getStyleClass().add("jfx-tool-bar-button");
-            btnDisable.textFillProperty().bind(Theme.foregroundFillBinding());
-            btnDisable.setGraphic(wrap(SVG.close(Theme.foregroundFillBinding(), -1, -1)));
-            btnDisable.setText(i18n("mods.disable"));
-            btnDisable.setOnMouseClicked(e -> skinnable.disableSelectedMods(tableView.getSelectionModel().getSelectedItems()));
-            toolbar.getChildren().add(btnDisable);
-
+            toolbar.getChildren().add(createToolbarButton(i18n("button.refresh"), SVG::refresh, skinnable::refresh));
+            toolbar.getChildren().add(createToolbarButton(i18n("mods.add"), SVG::plus, skinnable::add));
+            toolbar.getChildren().add(createToolbarButton(i18n("mods.remove"), SVG::delete, () ->
+                    skinnable.removeSelected(tableView.getSelectionModel().getSelectedItems())));
+            toolbar.getChildren().add(createToolbarButton(i18n("mods.enable"), SVG::check, () ->
+                    skinnable.enableSelected(tableView.getSelectionModel().getSelectedItems())));
+            toolbar.getChildren().add(createToolbarButton(i18n("mods.disable"), SVG::close, () ->
+                    skinnable.disableSelected(tableView.getSelectionModel().getSelectedItems())));
            root.setTop(toolbar);
        }

@@ -110,6 +79,7 @@ public class ModListPageSkin extends SkinBase<ModListPage> {
            center.getStyleClass().add("large-spinner-pane");
            center.loadingProperty().bind(skinnable.loadingProperty());

+            tableView.getStyleClass().add("no-header");
            tableView.setShowRoot(false);
            tableView.setEditable(true);
            tableView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
@@ -122,65 +92,54 @@ public class ModListPageSkin extends SkinBase<ModListPage> {
            activeColumn.setMaxWidth(40);
            activeColumn.setMinWidth(40);

-            JFXTreeTableColumn<ModInfoObject, String> fileNameColumn = new JFXTreeTableColumn<>();
-            fileNameColumn.setText(i18n("archive.name"));
-            setupCellValueFactory(fileNameColumn, ModInfoObject::fileNameProperty);
-            fileNameColumn.prefWidthProperty().bind(tableView.widthProperty().subtract(40).multiply(0.8));
+            JFXTreeTableColumn<ModInfoObject, Node> detailColumn = new JFXTreeTableColumn<>();
+            setupCellValueFactory(detailColumn, ModInfoObject::nodeProperty);

-            JFXTreeTableColumn<ModInfoObject, String> versionColumn = new JFXTreeTableColumn<>();
-            versionColumn.setText(i18n("archive.version"));
-            versionColumn.setPrefWidth(100);
-            setupCellValueFactory(versionColumn, ModInfoObject::versionProperty);
-            versionColumn.prefWidthProperty().bind(tableView.widthProperty().subtract(40).multiply(0.2));
-
-            tableView.getColumns().setAll(activeColumn, fileNameColumn, versionColumn);
+            tableView.getColumns().setAll(activeColumn, detailColumn);

            tableView.setColumnResizePolicy(JFXTreeTableView.CONSTRAINED_RESIZE_POLICY);
            center.setContent(tableView);
            root.setCenter(center);
        }

-        getChildren().setAll(root);
-    }
+        Label label = new Label(i18n("mods.not_modded"));
+        label.prefWidthProperty().bind(pane.widthProperty().add(-100));

-    private <T> void setupCellValueFactory(JFXTreeTableColumn<ModInfoObject, T> column, Function<ModInfoObject, ObservableValue<T>> mapper) {
-        column.setCellValueFactory(new Callback<TreeTableColumn.CellDataFeatures<ModInfoObject, T>, ObservableValue<T>>() {
-            @Override
-            public ObservableValue<T> call(TreeTableColumn.CellDataFeatures<ModInfoObject, T> param) {
-                if (column.validateValue(param))
-                    return mapper.apply(param.getValue().getValue());
-                else
-                    return column.getComputedValue(param);
-            }
+        FXUtils.onChangeAndOperate(skinnable.moddedProperty(), modded -> {
+            if (modded) pane.getChildren().setAll(root);
+            else pane.getChildren().setAll(label);
        });
+
+        getChildren().setAll(pane);
    }

-    public static class ModInfoObject extends RecursiveTreeObject<ModInfoObject> {
+    static class ModInfoObject extends RecursiveTreeObject<ModInfoObject> {
        private final BooleanProperty active;
-        private final StringProperty fileName;
-        private final StringProperty version;
        private final ModInfo modInfo;
+        private final ObjectProperty<Node> node;

-        public ModInfoObject(ModInfo modInfo) {
+        ModInfoObject(ModInfo modInfo) {
            this.modInfo = modInfo;
            this.active = modInfo.activeProperty();
-            this.fileName = new SimpleStringProperty(modInfo.getFileName());
-            this.version = new SimpleStringProperty(modInfo.getVersion());
+            StringBuilder message = new StringBuilder(modInfo.getName());
+            if (isNotBlank(modInfo.getVersion()))
+                message.append(", ").append(i18n("archive.version")).append(": ").append(modInfo.getVersion());
+            if (isNotBlank(modInfo.getGameVersion()))
+                message.append(", ").append(i18n("archive.game_version")).append(": ").append(modInfo.getGameVersion());
+            if (isNotBlank(modInfo.getAuthors()))
+                message.append(", ").append(i18n("archive.author")).append(": ").append(modInfo.getAuthors());
+            this.node = new SimpleObjectProperty<>(wrapMargin(new TwoLineListItem(modInfo.getFileName(), message.toString()), new Insets(8, 0, 8, 0)));
        }

-        public BooleanProperty activeProperty() {
+        BooleanProperty activeProperty() {
            return active;
        }

-        public StringProperty fileNameProperty() {
-            return fileName;
+        ObjectProperty<Node> nodeProperty() {
+            return node;
        }

-        public StringProperty versionProperty() {
-            return version;
-        }
-
-        public ModInfo getModInfo() {
+        ModInfo getModInfo() {
            return modInfo;
        }
    }
@@ -35,6 +35,7 @@ import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.Date;

+import static org.jackhuang.hmcl.util.StringUtils.parseColorEscapes;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 public class WorldListItem extends Control {
@@ -48,7 +49,7 @@ public class WorldListItem extends Control {
        this.world = world;
        this.simpleDateFormat = new SimpleDateFormat(i18n("world.time"));

-        title.set(world.getWorldName());
+        title.set(parseColorEscapes(world.getWorldName()));
        subtitle.set(i18n("world.description", world.getFileName(), simpleDateFormat.format(new Date(world.getLastPlayed())), world.getGameVersion() == null ? i18n("message.unknown") : world.getGameVersion()));
    }

@@ -17,48 +17,83 @@
 */
 package org.jackhuang.hmcl.ui.versions;

+import com.jfoenix.controls.JFXCheckBox;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.scene.Node;
 import javafx.stage.FileChooser;
+import org.jackhuang.hmcl.game.GameVersion;
 import org.jackhuang.hmcl.game.World;
 import org.jackhuang.hmcl.setting.Profile;
+import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.ui.Controllers;
-import org.jackhuang.hmcl.ui.FXUtils;
-import org.jackhuang.hmcl.ui.ListPage;
+import org.jackhuang.hmcl.ui.*;
 import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.io.FileUtils;

 import java.io.File;
 import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.stream.Collectors;

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

-public class WorldListPage extends ListPage<WorldListItem> {
+public class WorldListPage extends ListPageBase<WorldListItem> {
+    private final BooleanProperty showAll = new SimpleBooleanProperty(this, "showAll", false);
+
    private Path savesDir;
+    private List<World> worlds;
+    private Profile profile;
+    private String id;
+    private String gameVersion;

    public WorldListPage() {
        FXUtils.applyDragListener(this, it -> "zip".equals(FileUtils.getExtension(it)), modpacks -> {
            installWorld(modpacks.get(0));
        });
-    }

-    public void loadVersion(Profile profile, String id) {
-        this.savesDir = profile.getRepository().getRunDirectory(id).toPath().resolve("saves");
-
-        setLoading(true);
-        Task.ofResult(() -> World.getWorlds(savesDir).parallel().collect(Collectors.toList()))
-                .whenComplete(Schedulers.javafx(), (result, isDependentSucceeded, exception) -> {
-                    setLoading(false);
-                    if (isDependentSucceeded)
-                        itemsProperty().setAll(result.stream().map(WorldListItem::new).collect(Collectors.toList()));
-                }).start();
+        showAll.addListener(e -> {
+            if (worlds != null)
+                itemsProperty().setAll(worlds.stream()
+                        .filter(world -> isShowAll() || world.getGameVersion() == null || world.getGameVersion().equals(gameVersion))
+                        .map(WorldListItem::new).collect(Collectors.toList()));
+        });
    }

    @Override
+    protected ToolbarListPageSkin createDefaultSkin() {
+        return new WorldListPageSkin();
+    }
+
+    public void loadVersion(Profile profile, String id) {
+        this.profile = profile;
+        this.id = id;
+        this.savesDir = profile.getRepository().getRunDirectory(id).toPath().resolve("saves");
+        refresh();
+    }
+
+    public void refresh() {
+        if (profile == null || id == null)
+            return;
+
+        setLoading(true);
+        Task
+                .of(() -> gameVersion = GameVersion.minecraftVersion(profile.getRepository().getVersionJar(id)).orElse(null))
+                .thenSupply(() -> World.getWorlds(savesDir).parallel().collect(Collectors.toList()))
+                .whenComplete(Schedulers.javafx(), (result, isDependentSucceeded, exception) -> {
+                    worlds = result;
+                    setLoading(false);
+                    if (isDependentSucceeded)
+                        itemsProperty().setAll(result.stream()
+                                .filter(world -> isShowAll() || world.getGameVersion() == null || world.getGameVersion().equals(gameVersion))
+                                .map(WorldListItem::new).collect(Collectors.toList()));
+                }).start();
+    }
+
    public void add() {
        FileChooser chooser = new FileChooser();
        chooser.setTitle(i18n("world.import.choose"));
@@ -91,4 +126,36 @@ public class WorldListPage extends ListPage<WorldListItem> {
                    Controllers.dialog(i18n("world.import.invalid"));
                }).start();
    }
+
+    public boolean isShowAll() {
+        return showAll.get();
+    }
+
+    public BooleanProperty showAllProperty() {
+        return showAll;
+    }
+
+    public void setShowAll(boolean showAll) {
+        this.showAll.set(showAll);
+    }
+
+    private class WorldListPageSkin extends ToolbarListPageSkin<WorldListPage> {
+
+        WorldListPageSkin() {
+            super(WorldListPage.this);
+        }
+
+        @Override
+        protected List<Node> initializeToolbar(WorldListPage skinnable) {
+            JFXCheckBox chkShowAll = new JFXCheckBox();
+            chkShowAll.getStyleClass().add("jfx-tool-bar-checkbox");
+            chkShowAll.textFillProperty().bind(Theme.foregroundFillBinding());
+            chkShowAll.setText(i18n("world.show_all"));
+            chkShowAll.selectedProperty().bindBidirectional(skinnable.showAllProperty());
+
+            return Arrays.asList(chkShowAll,
+                    createToolbarButton(i18n("button.refresh"), SVG::refresh, skinnable::refresh),
+                    createToolbarButton(i18n("world.add"), SVG::plus, skinnable::add));
+        }
+    }
 }
@@ -17,7 +17,6 @@
 */
 package org.jackhuang.hmcl.ui.wizard;

-import com.jfoenix.utils.JFXUtilities;
 import javafx.beans.property.StringProperty;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
@@ -30,6 +29,7 @@ import org.jackhuang.hmcl.util.StringUtils;

 import java.util.Map;

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

 public interface TaskExecutorDialogWizardDisplayer extends AbstractWizardDisplayer {
@@ -59,11 +59,11 @@ public interface TaskExecutorDialogWizardDisplayer extends AbstractWizardDisplay
                pane.setSubtitle((String) subtitle);
        }

-        JFXUtilities.runInFX(() -> {
+        runInFX(() -> {
            TaskExecutor executor = task.executor(new TaskListener() {
                @Override
                public void onStop(boolean success, TaskExecutor executor) {
-                    JFXUtilities.runInFX(() -> {
+                    runInFX(() -> {
                        pane.fireEvent(new DialogCloseEvent());
                        if (success) {
                            if (settings.containsKey("success_message") && settings.get("success_message") instanceof String)
@@ -57,8 +57,11 @@
    -fx-text-fill: -fx-base-text-fill;
 }

-.rippler-container= .label {
-    -fx-text-fill: white;
+.notice-pane > .label {
+    -fx-text-fill: #0079FF;
+    -fx-font-size: 20;
+    -fx-wrap-text: true;
+    -fx-text-alignment: CENTER;
 }

 .class-title {
@@ -379,6 +382,8 @@
    -fx-pref-height: 42;
    -fx-padding: 2 2 2 2;
    -fx-background-color: -fx-base-check-color;
+    -fx-alignment: CENTER-LEFT;
+    -fx-spacing: 8;
 }

 .jfx-tool-bar-second .jfx-rippler {
@@ -992,7 +997,8 @@
 }

 .jfx-decorator-title {
-    -fx-text-fill: -fx-base-text-fill; -fx-font-size: 15;
+    -fx-text-fill: -fx-base-text-fill;
+    -fx-font-size: 15;
 }

 .resize-border {
@@ -1010,7 +1016,7 @@
 }

 .white-background {
-    -fx-background-color: rgba(255, 255, 255);
+    -fx-background-color: rgb(255, 255, 255);
 }

 /*******************************************************************************
@@ -1019,6 +1025,12 @@
 *                                                                              *
 *******************************************************************************/

+.no-header .column-header-background {
+    -fx-max-height: 0;
+    -fx-pref-height: 0;
+    -fx-min-height: 0;
+}
+
 .tree-table-view {
    -fx-tree-table-color: rgba(82, 100, 174, 0.4);
    -fx-tree-table-rippler-color: rgba(82, 100, 174, 0.6);
@@ -1069,7 +1081,7 @@

 .tree-table-view .tree-table-cell {
    -fx-border-width: 0 0 0 0;
-    -fx-padding: 8 0 8 0;
+    -fx-padding: 0 0 0 0;
    /*-fx-alignment: top-center;*/
 }

@@ -1115,7 +1127,7 @@
 }

 .tree-table-row-group {
-    -fx-background-color: rgba(230, 230, 230);
+    -fx-background-color: rgb(230, 230, 230);
 }

 .tree-table-view .menu-item:focused {
@@ -24,11 +24,11 @@
                <JFXListView fx:id="list" styleClass="jfx-list-view" VBox.vgrow="ALWAYS">
                </JFXListView>
            </VBox>
-            <StackPane fx:id="failedPane">
-                <Label onMouseClicked="#onRefresh" style="-fx-text-fill: #0079FF; -fx-font-size: 20;" text="%download.failed.refresh" />
+            <StackPane fx:id="failedPane" styleClass="notice-pane">
+                <Label onMouseClicked="#onRefresh" text="%download.failed.refresh" />
            </StackPane>
-            <StackPane fx:id="emptyPane">
-                <Label onMouseClicked="#onBack" style="-fx-text-fill: #0079FF; -fx-font-size: 20;" text="%download.failed.empty" />
+            <StackPane fx:id="emptyPane" styleClass="notice-pane">
+                <Label onMouseClicked="#onBack" text="%download.failed.empty" />
            </StackPane>
        </StackPane>
    </center>
@@ -95,7 +95,7 @@ download.failed=Failed to download
 download.failed.empty=No candidates. Click here to return.
 download.failed.refresh=Unable to load version list. Click here to retry.
 download.provider.bmclapi=BMCLAPI (bangbang93, https://bmclapi2.bangbang93.com/)
-download.provider.mojang=Mojang
+download.provider.mojang=Mojang (Forge and OptiFine installation being downloaded from BMCLAPI)

 extension.bat=Windows Bat file
 extension.mod=Mod file
@@ -124,9 +124,12 @@ input.not_empty=Required field
 input.url=Must be a valid URL.

 install=Install New Game
+install.change_version=Change version
+install.change_version.confirm=Sure to update %s from verison %s to %s?
 install.failed=Failed to install
 install.failed.downloading=Failed to install due to some files not downloaded successfully
 install.failed.downloading.detail=Failed to download file: %s
+install.failed.optifine_conflict=OptiFine and Forge are both installed simultaneously on Minecraft 1.13
 install.installer.choose=Choose a %s version
 install.installer.forge=Forge
 install.installer.game=Game
@@ -258,6 +261,7 @@ mods.enable=Enable
 mods.disable=Disable
 mods.name=Name
 mods.remove=Remove
+mods.not_modded=You should install a mod loader first (Forge, or LiteLoader)

 datapack=Data packs
 datapack.add=Add data pack
@@ -267,6 +271,7 @@ datapack.title=World %s - Datapacks
 datapack.remove=Remove

 world=Worlds/Datapacks
+world.add=Add world(.zip)
 world.datapack=Manage data packs
 world.datapack.1_13=Only Minecraft 1.13 and later versions support data packs.
 world.description=%s. Last played time: %s. Game version: %s.
@@ -283,6 +288,7 @@ world.import.invalid=Not a valid world zip
 world.name=World Name
 world.name.enter=Enter the world name
 world.reveal=Reveal in Explorer
+world.show_all=Show all
 world.time=EEE, MMM d, yyyy HH:mm:ss

 profile=Game Directories
@@ -94,7 +94,7 @@ download.failed=下載失敗
 download.failed.empty=沒有可供安裝的版本，點擊此處返回。
 download.failed.refresh=載入版本列表失敗，點擊此處重試。
 download.provider.bmclapi=BMCLAPI（bangbang93，https://bmclapi2.bangbang93.com/）
-download.provider.mojang=官方伺服器（Mojang）
+download.provider.mojang=官方伺服器（Forge 和 OptiFine 自動安裝的下載來源是 BMCLAPI）

 extension.bat=Windows 腳本
 extension.mod=模組檔案
@@ -123,9 +123,12 @@ input.not_empty=必填
 input.url=必須為有效連結

 install=新增遊戲
+install.change_version=更換版本
+install.change_version.confirm=你確定要將 %s 從 %s 更新到 %s 嗎？
 install.failed=安裝失敗
 install.failed.downloading=安裝失敗，部分文件未能完成下載
 install.failed.downloading.detail=未能下載檔案：%s
+install.failed.optifine_conflict=暫不支持 OptiFine 與 Forge 同時安裝於 Minecraft 1.13
 install.installer.choose=選擇 %s 版本
 install.installer.forge=Forge
 install.installer.game=遊戲
@@ -256,6 +259,7 @@ mods.choose_mod=選擇模組
 mods.enable=啟用
 mods.disable=禁用
 mods.remove=刪除
+mods.not_modded=你需要先在自動安裝頁面安裝 Forge 或 LiteLoader 才能進行模組管理。

 datapack=資料包
 datapack.add=添加資料包
@@ -265,6 +269,7 @@ datapack.title=世界 %s - 資料包
 datapack.remove=刪除

 world=世界/資料包
+world.add=添加世界
 world.datapack=管理資料包
 world.datapack.1_13=僅 Minecraft 1.13 及之後的版本支持資料包
 world.description=%s. 上一次遊戲時間: %s. 遊戲版本: %s
@@ -281,6 +286,7 @@ world.game_version=遊戲版本
 world.name=世界名稱
 world.name.enter=輸入世界名稱
 world.reveal=打開資料夾
+world.show_all=顯示全部
 world.time=yyyy 年 MM 月 dd 日 HH:mm:ss

 profile=遊戲目錄
@@ -94,7 +94,7 @@ download.failed=下载失败
 download.failed.empty=没有可供安装的版本，点击此处返回。
 download.failed.refresh=加载版本列表失败，点击此处重试。
 download.provider.bmclapi=BMCLAPI（bangbang93，https://bmclapi2.bangbang93.com/）
-download.provider.mojang=官方（Mojang）
+download.provider.mojang=官方（Forge 和 OptiFine 自动安装使用 BMCLAPI 下载源）

 extension.bat=Windows 脚本
 extension.mod=模组文件
@@ -123,9 +123,12 @@ input.not_empty=必填项
 input.url=必须是合法的链接

 install=添加游戏
+install.change_version=更换版本
+install.change_version.confirm=你确定要将 %s 从 %s 更新到 %s 吗？
 install.failed=安装失败
 install.failed.downloading=安装失败，部分文件未能完成下载
 install.failed.downloading.detail=未能下载文件：%s
+install.failed.optifine_conflict=暂不支持 OptiFine 与 Forge 同时安装于 Minecraft 1.13
 install.installer.choose=选择 %s 版本
 install.installer.forge=Forge
 install.installer.game=游戏
@@ -256,6 +259,7 @@ mods.choose_mod=选择模组
 mods.enable=启用
 mods.disable=禁用
 mods.remove=删除
+mods.not_modded=你需要先在自动安装页面安装 Forge 或 LiteLoader 才能进行模组管理。

 datapack=数据包
 datapack.add=添加数据包
@@ -265,6 +269,7 @@ datapack.title=世界 %s - 数据包
 datapack.remove=删除

 world=世界/数据包
+world.add=添加世界
 world.datapack=管理数据包
 world.datapack.1_13=仅 Minecraft 1.13 及之后的版本支持数据包
 world.description=%s. 上一次游戏时间: %s. 游戏版本: %s
@@ -281,6 +286,7 @@ world.import.invalid=无法识别的存档压缩包
 world.name=世界名称
 world.name.enter=输入世界名称
 world.reveal=打开文件夹
+world.show_all=显示全部
 world.time=yyyy 年 MM 月 dd 日 HH:mm:ss

 profile=游戏目录
@@ -72,7 +72,7 @@ public class DefaultGameBuilder extends GameBuilder {
            return libraryTask;
        }).whenComplete((isDependentSucceeded, exception) -> {
            if (!isDependentSucceeded)
-                dependencyManager.getGameRepository().getVersionRoot(name).delete();
+                dependencyManager.getGameRepository().removeVersionFromDisk(name);
        });
    }

@@ -78,7 +78,7 @@ public final class ForgeBMCLVersionList extends VersionList<ForgeRemoteVersion>
                            continue;
                        String jar = null;
                        for (ForgeVersion.File file : version.getFiles())
-                            if ("installer".equals(file.getCategory())) {
+                            if ("installer".equals(file.getCategory()) && "jar".equals(file.getFormat())) {
                                String classifier = gameVersion + "-" + version.getVersion()
                                        + (StringUtils.isNotBlank(version.getBranch()) ? "-" + version.getBranch() : "");
                                String fileName = "forge-" + classifier + "-" + file.getCategory() + "." + file.getFormat();
@@ -58,7 +58,8 @@ public final class ForgeInstallTask extends TaskResult<Version> {
    public void preExecute() throws Exception {
        installer = Files.createTempFile("forge-installer", ".jar");

-        dependent = new FileDownloadTask(NetworkUtils.toURL(remote.getUrl()), installer.toFile());
+        dependent = new FileDownloadTask(NetworkUtils.toURL(remote.getUrl()), installer.toFile())
+                .setCaching(true);
    }

    @Override
@@ -82,11 +83,6 @@ public final class ForgeInstallTask extends TaskResult<Version> {
        return Collections.singleton(dependency);
    }

-    @Override
-    public boolean isRelyingOnDependencies() {
-        return false;
-    }
-
    @Override
    public void execute() {
        if (VersionNumber.VERSION_COMPARATOR.compare("1.13", remote.getGameVersion()) <= 0)
@@ -34,14 +34,16 @@ public class ForgeNewInstallProfile {
    private final int spec;
    private final String minecraft;
    private final String json;
+    private final Artifact path;
    private final List<Library> libraries;
    private final List<Processor> processors;
    private final Map<String, Datum> data;

-    public ForgeNewInstallProfile(int spec, String minecraft, String json, List<Library> libraries, List<Processor> processors, Map<String, Datum> data) {
+    public ForgeNewInstallProfile(int spec, String minecraft, String json, Artifact path, List<Library> libraries, List<Processor> processors, Map<String, Datum> data) {
        this.spec = spec;
        this.minecraft = minecraft;
        this.json = json;
+        this.path = path;
        this.libraries = libraries;
        this.processors = processors;
        this.data = data;
@@ -69,6 +71,14 @@ public class ForgeNewInstallProfile {
        return json;
    }

+    /**
+     * Maven artifact path for the main jar to install.
+     * @return artifact path of the main jar.
+     */
+    public Artifact getPath() {
+        return path;
+    }
+
    /**
     * Libraries that processors depend on.
     * @return the required dependencies.
@@ -19,6 +19,7 @@ package org.jackhuang.hmcl.download.forge;

 import org.jackhuang.hmcl.download.DefaultDependencyManager;
 import org.jackhuang.hmcl.download.game.GameLibrariesTask;
+import org.jackhuang.hmcl.download.optifine.OptiFineInstallTask;
 import org.jackhuang.hmcl.game.*;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskResult;
@@ -66,6 +67,8 @@ public class ForgeNewInstallTask extends TaskResult<Version> {
        this.gameRepository = dependencyManager.getGameRepository();
        this.version = version;
        this.installer = installer;
+
+        setSignificance(TaskSignificance.MINOR);
    }

    private <E extends Exception> String parseLiteral(String literal, Map<String, String> var, ExceptionalFunction<String, String, E> plainConverter) throws E {
@@ -107,6 +110,14 @@ public class ForgeNewInstallTask extends TaskResult<Version> {
                    FileUtils.copyFile(file, dest);
                }
            }
+
+            {
+                Path mainJar = profile.getPath().getPath(fs.getPath("maven"));
+                if (Files.exists(mainJar)) {
+                    Path dest = gameRepository.getArtifactFile(version, profile.getPath());
+                    FileUtils.copyFile(mainJar, dest);
+                }
+            }
        }

        dependents.add(new GameLibrariesTask(dependencyManager, version, profile.getLibraries()));
@@ -114,6 +125,9 @@ public class ForgeNewInstallTask extends TaskResult<Version> {

    @Override
    public void execute() throws Exception {
+        if ("net.minecraft.launchwrapper.Launch".equals(version.getMainClass()))
+            throw new OptiFineInstallTask.UnsupportedOptiFineInstallationException();
+
        Path temp  = Files.createTempDirectory("forge_installer");
        int finished = 0;
        try (FileSystem fs = CompressingUtils.createReadOnlyZipFileSystem(installer)) {
@@ -42,6 +42,8 @@ public class ForgeOldInstallTask extends TaskResult<Version> {
        this.dependencyManager = dependencyManager;
        this.version = version;
        this.installer = installer;
+
+        setSignificance(TaskSignificance.MINOR);
    }

    @Override
@@ -89,6 +89,7 @@ public final class GameAssetDownloadTask extends Task {
                    String url = dependencyManager.getDownloadProvider().getAssetBaseURL() + assetObject.getLocation();
                    FileDownloadTask task = new FileDownloadTask(NetworkUtils.toURL(url), file, new FileDownloadTask.IntegrityCheck("SHA-1", assetObject.getHash()));
                    task.setName(assetObject.getHash());
+                    task.setCaching(true);
                    dependencies.add(task
                            .setCacheRepository(dependencyManager.getCacheRepository())
                            .setCaching(true)
@@ -128,12 +128,12 @@ public class LibraryDownloadTask extends Task {
        try {
            URL packXz = NetworkUtils.toURL(url + ".pack.xz");
            if (NetworkUtils.urlExists(packXz)) {
-                task = new FileDownloadTask(packXz, xzFile, null);
+                task = new FileDownloadTask(packXz, xzFile, null).setCaching(true);
                xz = true;
            } else {
                task = new FileDownloadTask(NetworkUtils.toURL(url),
                        jar,
-                        library.getDownload().getSha1() != null ? new IntegrityCheck("SHA-1", library.getDownload().getSha1()) : null);
+                        library.getDownload().getSha1() != null ? new IntegrityCheck("SHA-1", library.getDownload().getSha1()) : null).setCaching(true);
                xz = false;
            }
        } catch (IOException e) {
@@ -66,6 +66,9 @@ public final class OptiFineInstallTask extends TaskResult<Version> {

    @Override
    public void execute() {
+        if ("cpw.mods.modlauncher.Launcher".equals(version.getMainClass()))
+            throw new UnsupportedOptiFineInstallationException();
+
        String remoteVersion = remote.getGameVersion() + "_" + remote.getSelfVersion();

        Library library = new Library(
@@ -90,4 +93,6 @@ public final class OptiFineInstallTask extends TaskResult<Version> {
        dependencies.add(dependencyManager.checkLibraryCompletionAsync(version.setLibraries(libraries)));
    }

+    public static class UnsupportedOptiFineInstallationException extends UnsupportedOperationException {
+    }
 }
@@ -140,7 +140,7 @@ public final class CurseCompletionTask extends Task {
        for (CurseManifestFile file : newManifest.getFiles())
            if (StringUtils.isNotBlank(file.getFileName())) {
                if (!modManager.hasSimpleMod(file.getFileName())) {
-                    dependencies.add(new FileDownloadTask(file.getUrl(), modManager.getSimpleModPath(file.getFileName()).toFile()));
+                    dependencies.add(new FileDownloadTask(file.getUrl(), modManager.getSimpleModPath(file.getFileName()).toFile()).setCaching(true));
                }
            }

@@ -24,7 +24,8 @@ import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import org.jackhuang.hmcl.util.*;
+import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.gson.Validation;
 import org.jackhuang.hmcl.util.io.CompressingUtils;
@@ -128,7 +129,7 @@ public class Datapack {
                isMultiple = false;
                try {
                    PackMcMeta pack = JsonUtils.fromNonNullJson(FileUtils.readText(mcmeta), PackMcMeta.class);
-                    info.add(new Pack(path, FileUtils.getNameWithoutExtension(path), pack.getPackInfo().getDescription(), this));
+                    Platform.runLater(() -> info.add(new Pack(path, FileUtils.getNameWithoutExtension(path), pack.getPackInfo().getDescription(), this)));
                } catch (IOException | JsonParseException e) {
                    Logging.LOG.log(Level.WARNING, "Failed to read datapack " + path, e);
                }
@@ -192,7 +193,7 @@ public class Datapack {
                }
            }

-        this.info.setAll(info);
+        Platform.runLater(() -> this.info.setAll(info));
    }

    public static class Pack {
@@ -213,4 +213,8 @@ public final class StringUtils {

        return result;
    }
+
+    public static String parseColorEscapes(String original) {
+        return original.replaceAll("\u00A7\\d", "");
+    }
 }
Author	SHA1	Message	Date
huanghongxun	3d008dcab5	Make DatapackListPage multiple-selectable	2019-03-19 10:31:02 +08:00
huanghongxun	5953cc6411	Add filter to hide world that version mismatch	2019-03-19 00:04:52 +08:00
huanghongxun	2dce675fe2	Ignore all color formatting in world name.	2019-03-18 23:24:50 +08:00
huanghongxun	aa013a86dd	Add upgrade button on Forge, LiteLoader, OptiFine	2019-03-18 23:17:53 +08:00
huanghongxun	f866f692e2	Hide ForgeNew/OldInstallTask	2019-03-18 20:17:03 +08:00
huanghongxun	68a2514cef	Disable mod pane when Forge/Liteloader is not installed.	2019-03-18 20:14:31 +08:00
huanghongxun	32562d7435	Revert JFoenix	2019-03-18 13:44:38 +08:00
huanghongxun	78be1aaa7c	Fix blank space in bottom of settings page	2019-03-18 13:43:17 +08:00
huanghongxun	1eb4b1ca9e	Fix unable to delete the version which failed to download	2019-03-05 19:37:37 +08:00
huanghongxun	bf37db2cbe	Fix #538	2019-03-05 19:32:24 +08:00
huanghongxun	5b30617a6b	Forbid user from installing both Forge 1.13 and OptiFine simultaneously	2019-03-04 12:27:09 +08:00
huanghongxun	266c686a3a	Fix forge 1.13 installation	2019-03-04 11:39:30 +08:00