Fix forge 1.13 installation

see https://github.com/huanghongxun/HMCL/commit/639bc58e84b68a7b508ed9ba0a701a13b2fac1b4#r32215378

.github/ISSUE_TEMPLATE.md

@@ -6,7 +6,7 @@
 
 
 
-我们发现，对于不经常检查邮箱的人来说，GitHub issues 的反馈效率太低，时隔几个小时甚至一天的情况很多。为了改善反馈效率，并将积极为 HMCL 提供问题反馈和建议的人聚集起来，我们希望在这里反馈的人可以在 HMCL 3 用户 QQ 群：219177735 中反馈信息，**而不在 GitHub Issues 中反馈问题**。
+我们发现，对于不经常检查邮箱的人来说，GitHub Issues 的反馈效率太低，时隔几个小时甚至一天的情况很多。为了改善反馈效率，并将积极为 HMCL 提供问题反馈和建议的人聚集起来，我们希望在这里反馈的人可以在 HMCL 3 用户 QQ 群：219177735 中反馈信息，**而不在 GitHub Issues 中反馈问题**。
 
 如果你希望在 QQ 群中反馈问题，也请将下面的信息表填好直接发在群中，加快我们的沟通速度。
 
@@ -24,5 +24,5 @@
 * 对游戏做的修改（是否自行通过安装器安装 Rift 等 API，以及 mod）：
 * 游戏崩溃报告（如果有）：
 * 启动器崩溃报告（如果有）：
-* 启动器日志文件（在启动器设置中打开日志文件夹并将文件夹内所有文件打包发在这里）：
-* 问题描述（如何触发问题）：
+* 启动器日志文件（出现问题后点击启动器设置中的【导出启动器日志】按钮）：
+* 问题描述（如何触发问题）：

HMCL/build.gradle

@@ -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")

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

@@ -17,7 +17,7 @@
  */
 package org.jackhuang.hmcl;
 
-import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.utils.JFXUtilities;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.stage.Stage;

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

@@ -20,9 +20,6 @@ package org.jackhuang.hmcl.game;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import javafx.scene.image.Image;
-import org.jackhuang.hmcl.event.EventBus;
-import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
-import org.jackhuang.hmcl.event.RefreshingVersionsEvent;
 import org.jackhuang.hmcl.setting.EnumGameDirectory;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.VersionSetting;
@@ -80,13 +77,6 @@ public class HMCLGameRepository extends DefaultGameRepository {
         }
     }
 
-    @Override
-    public void refreshVersions() {
-        EventBus.EVENT_BUS.fireEvent(new RefreshingVersionsEvent(this));
-        refreshVersionsImpl();
-        EventBus.EVENT_BUS.fireEvent(new RefreshedVersionsEvent(this));
-    }
-
     public void changeDirectory(File newDirectory) {
         setBaseDirectory(newDirectory);
         refreshVersionsAsync().start();
@@ -168,6 +158,8 @@ public class HMCLGameRepository extends DefaultGameRepository {
             return new Image("file:" + iconFile.getAbsolutePath());
         else if ("net.minecraft.launchwrapper.Launch".equals(version.getMainClass()))
             return new Image("/assets/img/furnace.png");
+        else if ("cpw.mods.modlauncher.Launcher".equals(version.getMainClass()))
+            return new Image("/assets/img/furnace.png");
         else
             return new Image("/assets/img/grass.png");
     }

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

@@ -38,7 +38,7 @@ import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.DialogController;
 import org.jackhuang.hmcl.ui.LogWindow;
 import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
-import org.jackhuang.hmcl.ui.construct.MessageBox;
+import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
 import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane;
 import org.jackhuang.hmcl.util.Log4jLevel;
 import org.jackhuang.hmcl.util.Logging;
@@ -122,14 +122,14 @@ public final class LauncherHelper {
         Optional<String> gameVersion = GameVersion.minecraftVersion(repository.getVersionJar(version));
 
         TaskExecutor executor = Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.DEPENDENCIES))
-                .then(variables -> {
+                .then(() -> {
                     if (setting.isNotCheckGame())
                         return null;
                     else
                         return dependencyManager.checkGameCompletionAsync(version);
                 })
                 .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.MODS)))
-                .then(var -> {
+                .then(() -> {
                     try {
                         ModpackConfiguration<?> configuration = ModpackHelper.readModpackConfiguration(repository.getModpackConfiguration(selectedVersion));
                         if ("Curse".equals(configuration.getType()))
@@ -141,44 +141,42 @@ public final class LauncherHelper {
                     }
                 })
                 .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.LOGGING_IN)))
-                .then(Task.of(i18n("account.methods"), variables -> {
+                .thenCompose(() -> Task.ofResult(i18n("account.methods"), () -> {
                     try {
-                        variables.set("account", account.logIn());
+                        return account.logIn();
                     } catch (CredentialExpiredException e) {
                         LOG.info("Credential has expired: " + e);
-                        variables.set("account", DialogController.logIn(account));
+                        return DialogController.logIn(account);
                     } catch (AuthenticationException e) {
                         LOG.warning("Authentication failed, try playing offline: " + e);
-                        variables.set("account",
-                                account.playOffline().orElseThrow(() -> e));
+                        return account.playOffline().orElseThrow(() -> e);
                     }
                 }))
-                .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.LAUNCHING)))
-                .then(Task.of(variables -> {
-                    variables.set("launcher", new HMCLGameLauncher(
-                            repository,
-                            selectedVersion,
-                            variables.get("account"),
-                            setting.toLaunchOptions(profile.getGameDir()),
-                            launcherVisibility == LauncherVisibility.CLOSE
-                                    ? null // Unnecessary to start listening to game process output when close launcher immediately after game launched.
-                                    : new HMCLProcessListener(variables.get("account"), setting, gameVersion.isPresent())
-                    ));
-                }))
-                .then(variables -> {
-                    DefaultLauncher launcher = variables.get("launcher");
+                .thenApply(Schedulers.javafx(), authInfo -> {
+                    emitStatus(LoadingState.LAUNCHING);
+                    return authInfo;
+                })
+                .thenApply(authInfo -> new HMCLGameLauncher(
+                        repository,
+                        selectedVersion,
+                        authInfo,
+                        setting.toLaunchOptions(profile.getGameDir()),
+                        launcherVisibility == LauncherVisibility.CLOSE
+                                ? null // Unnecessary to start listening to game process output when close launcher immediately after game launched.
+                                : new HMCLProcessListener(authInfo, setting, gameVersion.isPresent())
+                ))
+                .thenCompose(launcher -> { // launcher is prev task's result
                     if (scriptFile == null) {
                         return new LaunchTask<>(launcher::launch).setName(i18n("version.launch"));
                     } else {
-                        return new LaunchTask<>(() -> {
+                        return new LaunchTask<ManagedProcess>(() -> {
                             launcher.makeLaunchScript(scriptFile);
                             return null;
                         }).setName(i18n("version.launch_script"));
                     }
                 })
-                .then(Task.of(variables -> {
+                .thenAccept(process -> { // process is LaunchTask's result
                     if (scriptFile == null) {
-                        ManagedProcess process = variables.get(LaunchTask.LAUNCH_ID);
                         PROCESSES.add(process);
                         if (launcherVisibility == LauncherVisibility.CLOSE)
                             Launcher.stopApplication();
@@ -187,13 +185,13 @@ public final class LauncherHelper {
                                 process.stop();
                                 it.fireEvent(new DialogCloseEvent());
                             });
-                    } else
+                    } else {
                         Platform.runLater(() -> {
                             launchingStepsPane.fireEvent(new DialogCloseEvent());
                             Controllers.dialog(i18n("version.launch_script.success", scriptFile.getAbsolutePath()));
                         });
-
-                }))
+                    }
+                })
                 .executor();
 
         launchingStepsPane.setExecutor(executor, false);
@@ -236,7 +234,7 @@ public final class LauncherHelper {
                                 }
                                 Controllers.dialog(message,
                                         scriptFile == null ? i18n("launch.failed") : i18n("version.launch_script.failed"),
-                                        MessageBox.ERROR_MESSAGE);
+                                        MessageType.ERROR);
                             }
                         }
                     });
@@ -263,7 +261,7 @@ public final class LauncherHelper {
         VersionNumber gameVersion = VersionNumber.asVersion(GameVersion.minecraftVersion(profile.getRepository().getVersionJar(version)).orElse("Unknown"));
         JavaVersion java = setting.getJavaVersion();
         if (java == null) {
-            Controllers.dialog(i18n("launch.wrong_javadir"), i18n("message.warning"), MessageBox.WARNING_MESSAGE, onAccept);
+            Controllers.dialog(i18n("launch.wrong_javadir"), i18n("message.warning"), MessageType.WARNING, onAccept);
             setting.setJava(null);
             setting.setDefaultJavaPath(null);
             java = JavaVersion.fromCurrentEnvironment();
@@ -282,10 +280,10 @@ public final class LauncherHelper {
                 if (gameVersion.compareTo(VersionNumber.asVersion("1.13")) >= 0) {
                     // Minecraft 1.13 and later versions only support Java 8 or later.
                     // Terminate launching operation.
-                    Controllers.dialog(i18n("launch.advice.java8_1_13"), i18n("message.error"), MessageBox.ERROR_MESSAGE, null);
+                    Controllers.dialog(i18n("launch.advice.java8_1_13"), i18n("message.error"), MessageType.ERROR, null);
                 } else {
                     // Most mods require Java 8 or later version.
-                    Controllers.dialog(i18n("launch.advice.newer_java"), i18n("message.warning"), MessageBox.WARNING_MESSAGE, onAccept);
+                    Controllers.dialog(i18n("launch.advice.newer_java"), i18n("message.warning"), MessageType.WARNING, onAccept);
                 }
                 flag = true;
             }
@@ -301,10 +299,10 @@ public final class LauncherHelper {
             if (java8.isPresent()) {
                 java8required = true;
                 setting.setJavaVersion(java8.get());
-                Controllers.dialog(i18n("launch.advice.java9") + "\n" + i18n("launch.advice.corrected"), i18n("message.info"), MessageBox.INFORMATION_MESSAGE, onAccept);
+                Controllers.dialog(i18n("launch.advice.java9") + "\n" + i18n("launch.advice.corrected"), i18n("message.info"), MessageType.INFORMATION, onAccept);
                 flag = true;
             } else {
-                Controllers.dialog(i18n("launch.advice.java9") + "\n" + i18n("launch.advice.uncorrected"), i18n("message.error"), MessageBox.ERROR_MESSAGE, null);
+                Controllers.dialog(i18n("launch.advice.java9") + "\n" + i18n("launch.advice.uncorrected"), i18n("message.error"), MessageType.ERROR, null);
                 flag = true;
             }
         }
@@ -319,7 +317,7 @@ public final class LauncherHelper {
                 newJavaRequired = true;
                 setting.setJavaVersion(java8.get());
             } else {
-                Controllers.dialog(i18n("launch.advice.java8_51_1_13"), i18n("message.warning"), MessageBox.WARNING_MESSAGE, onAccept);
+                Controllers.dialog(i18n("launch.advice.java8_51_1_13"), i18n("message.warning"), MessageType.WARNING, onAccept);
                 flag = true;
             }
         }
@@ -351,7 +349,7 @@ public final class LauncherHelper {
             if (java64.isPresent()) {
                 setting.setJavaVersion(java64.get());
             } else {
-                Controllers.dialog(i18n("launch.advice.different_platform"), i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
+                Controllers.dialog(i18n("launch.advice.different_platform"), i18n("message.error"), MessageType.ERROR, onAccept);
                 flag = true;
             }
         }
@@ -361,13 +359,13 @@ public final class LauncherHelper {
                 setting.getMaxMemory() > 1.5 * 1024) {
             // 1.5 * 1024 is an inaccurate number.
             // Actual memory limit depends on operating system and memory.
-            Controllers.dialog(i18n("launch.advice.too_large_memory_for_32bit"), i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
+            Controllers.dialog(i18n("launch.advice.too_large_memory_for_32bit"), i18n("message.error"), MessageType.ERROR, onAccept);
             flag = true;
         }
 
         // Cannot allocate too much memory exceeding free space.
         if (!flag && OperatingSystem.TOTAL_MEMORY > 0 && OperatingSystem.TOTAL_MEMORY < setting.getMaxMemory()) {
-            Controllers.dialog(i18n("launch.advice.not_enough_space", OperatingSystem.TOTAL_MEMORY), i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
+            Controllers.dialog(i18n("launch.advice.not_enough_space", OperatingSystem.TOTAL_MEMORY), i18n("message.error"), MessageType.ERROR, onAccept);
             flag = true;
         }
 
@@ -379,7 +377,7 @@ public final class LauncherHelper {
                                     VersionNumber.VERSION_COMPARATOR.compare(it.getVersion(), "1.12.2-14.23.5.2773") < 0);
             boolean hasLiteLoader = version.getLibraries().stream().anyMatch(it -> it.is("com.mumfrey", "liteloader"));
             if (hasForge2760 && hasLiteLoader && gameVersion.compareTo(VersionNumber.asVersion("1.12.2")) == 0) {
-                Controllers.dialog(i18n("launch.advice.forge2760_liteloader"), i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
+                Controllers.dialog(i18n("launch.advice.forge2760_liteloader"), i18n("message.error"), MessageType.ERROR, onAccept);
                 flag = true;
             }
         }
@@ -429,13 +427,6 @@ public final class LauncherHelper {
         public void execute() throws Exception {
             setResult(supplier.get());
         }
-
-        @Override
-        public String getId() {
-            return LAUNCH_ID;
-        }
-
-        static final String LAUNCH_ID = "launch";
     }
 
     /**

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

@@ -110,13 +110,13 @@ public final class ModpackHelper {
 
         if (modpack.getManifest() instanceof CurseManifest)
             return new CurseInstallTask(profile.getDependency(), zipFile, modpack, ((CurseManifest) modpack.getManifest()), name)
-                    .finalized(Schedulers.defaultScheduler(), ExceptionalConsumer.fromRunnable(success), failure);
+                    .whenComplete(Schedulers.defaultScheduler(), success, failure);
         else if (modpack.getManifest() instanceof HMCLModpackManifest)
             return new HMCLModpackInstallTask(profile, zipFile, modpack, name)
-                    .finalized(Schedulers.defaultScheduler(), ExceptionalConsumer.fromRunnable(success), failure);
+                    .whenComplete(Schedulers.defaultScheduler(), success, failure);
         else if (modpack.getManifest() instanceof MultiMCInstanceConfiguration)
             return new MultiMCModpackInstallTask(profile.getDependency(), zipFile, modpack, ((MultiMCInstanceConfiguration) modpack.getManifest()), name)
-                    .finalized(Schedulers.defaultScheduler(), ExceptionalConsumer.fromRunnable(success), failure)
+                    .whenComplete(Schedulers.defaultScheduler(), success, failure)
                     .then(new MultiMCInstallVersionSettingTask(profile, ((MultiMCInstanceConfiguration) modpack.getManifest()), name));
         else throw new IllegalStateException("Unrecognized modpack: " + modpack);
     }

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

@@ -17,7 +17,9 @@
  */
 package org.jackhuang.hmcl.game;
 
+import static java.util.Collections.emptyMap;
 import static java.util.Collections.singletonMap;
+import static java.util.Objects.requireNonNull;
 import static org.jackhuang.hmcl.util.Lang.threadPool;
 import static org.jackhuang.hmcl.util.Logging.LOG;
 
@@ -33,6 +35,7 @@ import java.util.EnumMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
@@ -48,7 +51,8 @@ import org.jackhuang.hmcl.auth.yggdrasil.TextureType;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilService;
 import org.jackhuang.hmcl.task.FileDownloadTask;
-import org.jackhuang.hmcl.util.javafx.MultiStepBinding;
+import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.javafx.BindingMapping;
 
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.ObjectBinding;
@@ -69,8 +73,8 @@ public final class TexturesLoader {
         private final Map<String, String> metadata;
 
         public LoadedTexture(BufferedImage image, Map<String, String> metadata) {
-            this.image = image;
-            this.metadata = metadata;
+            this.image = requireNonNull(image);
+            this.metadata = requireNonNull(metadata);
         }
 
         public BufferedImage getImage() {
@@ -98,6 +102,10 @@ public final class TexturesLoader {
     }
 
     public static LoadedTexture loadTexture(Texture texture) throws IOException {
+        if (StringUtils.isBlank(texture.getUrl())) {
+            throw new IOException("Texture url is empty");
+        }
+
         Path file = getTexturePath(texture);
         if (!Files.isRegularFile(file)) {
             // download it
@@ -118,7 +126,11 @@ public final class TexturesLoader {
         try (InputStream in = Files.newInputStream(file)) {
             img = ImageIO.read(in);
         }
-        return new LoadedTexture(img, texture.getMetadata());
+        Map<String, String> metadata = texture.getMetadata();
+        if (metadata == null) {
+            metadata = emptyMap();
+        }
+        return new LoadedTexture(img, metadata);
     }
     // ====
 
@@ -142,7 +154,7 @@ public final class TexturesLoader {
 
     public static ObjectBinding<LoadedTexture> skinBinding(YggdrasilService service, UUID uuid) {
         LoadedTexture uuidFallback = getDefaultSkin(TextureModel.detectUUID(uuid));
-        return MultiStepBinding.of(service.getProfileRepository().binding(uuid))
+        return BindingMapping.of(service.getProfileRepository().binding(uuid))
                 .map(profile -> profile
                         .flatMap(it -> {
                             try {
@@ -152,20 +164,23 @@ public final class TexturesLoader {
                                 return Optional.empty();
                             }
                         })
-                        .flatMap(it -> Optional.ofNullable(it.get(TextureType.SKIN))))
+                        .flatMap(it -> Optional.ofNullable(it.get(TextureType.SKIN)))
+                        .filter(it -> StringUtils.isNotBlank(it.getUrl())))
                 .asyncMap(it -> {
                     if (it.isPresent()) {
                         Texture texture = it.get();
-                        try {
-                            return loadTexture(texture);
-                        } catch (IOException e) {
-                            LOG.log(Level.WARNING, "Failed to load texture " + texture.getUrl() + ", using fallback texture", e);
-                            return getDefaultSkin(TextureModel.detectModelName(texture.getMetadata()));
-                        }
+                        return CompletableFuture.supplyAsync(() -> {
+                            try {
+                                return loadTexture(texture);
+                            } catch (IOException e) {
+                                LOG.log(Level.WARNING, "Failed to load texture " + texture.getUrl() + ", using fallback texture", e);
+                                return uuidFallback;
+                            }
+                        }, POOL);
                     } else {
-                        return uuidFallback;
+                        return CompletableFuture.completedFuture(uuidFallback);
                     }
-                }, uuidFallback, POOL);
+                }, uuidFallback);
     }
     // ====
 
@@ -180,19 +195,16 @@ public final class TexturesLoader {
                 faceOffset, faceOffset, size - faceOffset, size - faceOffset,
                 8 * scale, 8 * scale, 16 * scale, 16 * scale,
                 null);
-
-        if (skin.getWidth() == skin.getHeight()) {
-            g.drawImage(skin,
-                    0, 0, size, size,
-                    40 * scale, 8 * scale, 48 * scale, 16 * scale, null);
-        }
+        g.drawImage(skin,
+                0, 0, size, size,
+                40 * scale, 8 * scale, 48 * scale, 16 * scale, null);
 
         g.dispose();
         return avatar;
     }
 
     public static ObjectBinding<Image> fxAvatarBinding(YggdrasilService service, UUID uuid, int size) {
-        return MultiStepBinding.of(skinBinding(service, uuid))
+        return BindingMapping.of(skinBinding(service, uuid))
                 .map(it -> toAvatar(it.image, size))
                 .map(img -> SwingFXUtils.toFXImage(img, null));
     }

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

@@ -19,7 +19,7 @@ package org.jackhuang.hmcl.setting;
 
 import com.google.gson.*;
 import com.google.gson.annotations.JsonAdapter;
-import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.utils.JFXUtilities;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
@@ -33,8 +33,6 @@ 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.javafx.ImmediateObjectProperty;
-import org.jackhuang.hmcl.util.javafx.ImmediateStringProperty;
 import org.jackhuang.hmcl.util.javafx.ObservableHelper;
 
 import java.io.File;
@@ -90,9 +88,9 @@ public final class Profile implements Observable {
         return global.get();
     }
 
-    private final ImmediateStringProperty name;
+    private final SimpleStringProperty name;
 
-    public ImmediateStringProperty nameProperty() {
+    public StringProperty nameProperty() {
         return name;
     }
 
@@ -131,8 +129,8 @@ public final class Profile implements Observable {
     }
 
     public Profile(String name, File initialGameDir, VersionSetting global, String selectedVersion, boolean useRelativePath) {
-        this.name = new ImmediateStringProperty(this, "name", name);
-        gameDir = new ImmediateObjectProperty<>(this, "gameDir", initialGameDir);
+        this.name = new SimpleStringProperty(this, "name", name);
+        gameDir = new SimpleObjectProperty<>(this, "gameDir", initialGameDir);
         repository = new HMCLGameRepository(this, initialGameDir);
         this.global.set(global == null ? new VersionSetting() : global);
         this.selectedVersion.set(selectedVersion);

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

@@ -17,7 +17,7 @@
  */
 package org.jackhuang.hmcl.setting;
 
-import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.utils.JFXUtilities;
 import javafx.application.Platform;
 import javafx.beans.Observable;
 import javafx.beans.property.*;

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

@@ -27,6 +27,7 @@ import javafx.scene.paint.Color;
 import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.io.IOUtils;
+import org.jackhuang.hmcl.util.javafx.BindingMapping;
 
 import java.io.File;
 import java.io.IOException;
@@ -132,7 +133,8 @@ public class Theme {
     }
 
     public static ObjectBinding<Color> foregroundFillBinding() {
-        return Bindings.createObjectBinding(() -> config().getTheme().getForegroundColor(), config().themeProperty());
+        return BindingMapping.of(config().themeProperty())
+                .map(Theme::getForegroundColor);
     }
 
     public static ObjectBinding<Color> blackFillBinding() {

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

@@ -21,13 +21,18 @@ import com.google.gson.*;
 import com.google.gson.annotations.JsonAdapter;
 
 import javafx.beans.InvalidationListener;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleIntegerProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.game.LaunchOptions;
 import org.jackhuang.hmcl.util.*;
-import org.jackhuang.hmcl.util.javafx.ImmediateBooleanProperty;
-import org.jackhuang.hmcl.util.javafx.ImmediateIntegerProperty;
-import org.jackhuang.hmcl.util.javafx.ImmediateObjectProperty;
-import org.jackhuang.hmcl.util.javafx.ImmediateStringProperty;
 import org.jackhuang.hmcl.util.platform.JavaVersion;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 
@@ -60,9 +65,9 @@ public final class VersionSetting {
         this.global = global;
     }
 
-    private final ImmediateBooleanProperty usesGlobalProperty = new ImmediateBooleanProperty(this, "usesGlobal", false);
+    private final BooleanProperty usesGlobalProperty = new SimpleBooleanProperty(this, "usesGlobal", false);
 
-    public ImmediateBooleanProperty usesGlobalProperty() {
+    public BooleanProperty usesGlobalProperty() {
         return usesGlobalProperty;
     }
 
@@ -84,9 +89,9 @@ public final class VersionSetting {
 
     // java
 
-    private final ImmediateStringProperty javaProperty = new ImmediateStringProperty(this, "java", "");
+    private final StringProperty javaProperty = new SimpleStringProperty(this, "java", "");
 
-    public ImmediateStringProperty javaProperty() {
+    public StringProperty javaProperty() {
         return javaProperty;
     }
 
@@ -110,7 +115,7 @@ public final class VersionSetting {
         setDefaultJavaPath(null);
     }
 
-    private final ImmediateStringProperty defaultJavaPathProperty = new ImmediateStringProperty(this, "defaultJavaPath", "");
+    private final StringProperty defaultJavaPathProperty = new SimpleStringProperty(this, "defaultJavaPath", "");
 
     /**
      * Path to Java executable, or null if user customizes java directory.
@@ -124,9 +129,9 @@ public final class VersionSetting {
         defaultJavaPathProperty.set(defaultJavaPath);
     }
 
-    private final ImmediateStringProperty javaDirProperty = new ImmediateStringProperty(this, "javaDir", "");
+    private final StringProperty javaDirProperty = new SimpleStringProperty(this, "javaDir", "");
 
-    public ImmediateStringProperty javaDirProperty() {
+    public StringProperty javaDirProperty() {
         return javaDirProperty;
     }
 
@@ -141,9 +146,9 @@ public final class VersionSetting {
         javaDirProperty.set(javaDir);
     }
 
-    private final ImmediateStringProperty wrapperProperty = new ImmediateStringProperty(this, "wrapper", "");
+    private final StringProperty wrapperProperty = new SimpleStringProperty(this, "wrapper", "");
 
-    public ImmediateStringProperty wrapperProperty() {
+    public StringProperty wrapperProperty() {
         return wrapperProperty;
     }
 
@@ -158,9 +163,9 @@ public final class VersionSetting {
         wrapperProperty.set(wrapper);
     }
 
-    private final ImmediateStringProperty permSizeProperty = new ImmediateStringProperty(this, "permSize", "");
+    private final StringProperty permSizeProperty = new SimpleStringProperty(this, "permSize", "");
 
-    public ImmediateStringProperty permSizeProperty() {
+    public StringProperty permSizeProperty() {
         return permSizeProperty;
     }
 
@@ -175,9 +180,9 @@ public final class VersionSetting {
         permSizeProperty.set(permSize);
     }
 
-    private final ImmediateIntegerProperty maxMemoryProperty = new ImmediateIntegerProperty(this, "maxMemory", OperatingSystem.SUGGESTED_MEMORY);
+    private final IntegerProperty maxMemoryProperty = new SimpleIntegerProperty(this, "maxMemory", OperatingSystem.SUGGESTED_MEMORY);
 
-    public ImmediateIntegerProperty maxMemoryProperty() {
+    public IntegerProperty maxMemoryProperty() {
         return maxMemoryProperty;
     }
 
@@ -195,9 +200,9 @@ public final class VersionSetting {
     /**
      * The minimum memory that JVM can allocate for heap.
      */
-    private final ImmediateObjectProperty<Integer> minMemoryProperty = new ImmediateObjectProperty<>(this, "minMemory", null);
+    private final ObjectProperty<Integer> minMemoryProperty = new SimpleObjectProperty<>(this, "minMemory", null);
 
-    public ImmediateObjectProperty<Integer> minMemoryProperty() {
+    public ObjectProperty<Integer> minMemoryProperty() {
         return minMemoryProperty;
     }
 
@@ -209,9 +214,9 @@ public final class VersionSetting {
         minMemoryProperty.set(minMemory);
     }
 
-    private final ImmediateStringProperty preLaunchCommandProperty = new ImmediateStringProperty(this, "precalledCommand", "");
+    private final StringProperty preLaunchCommandProperty = new SimpleStringProperty(this, "precalledCommand", "");
 
-    public ImmediateStringProperty preLaunchCommandProperty() {
+    public StringProperty preLaunchCommandProperty() {
         return preLaunchCommandProperty;
     }
 
@@ -229,9 +234,9 @@ public final class VersionSetting {
 
     // options
 
-    private final ImmediateStringProperty javaArgsProperty = new ImmediateStringProperty(this, "javaArgs", "");
+    private final StringProperty javaArgsProperty = new SimpleStringProperty(this, "javaArgs", "");
 
-    public ImmediateStringProperty javaArgsProperty() {
+    public StringProperty javaArgsProperty() {
         return javaArgsProperty;
     }
 
@@ -246,9 +251,9 @@ public final class VersionSetting {
         javaArgsProperty.set(javaArgs);
     }
 
-    private final ImmediateStringProperty minecraftArgsProperty = new ImmediateStringProperty(this, "minecraftArgs", "");
+    private final StringProperty minecraftArgsProperty = new SimpleStringProperty(this, "minecraftArgs", "");
 
-    public ImmediateStringProperty minecraftArgsProperty() {
+    public StringProperty minecraftArgsProperty() {
         return minecraftArgsProperty;
     }
 
@@ -263,9 +268,9 @@ public final class VersionSetting {
         minecraftArgsProperty.set(minecraftArgs);
     }
 
-    private final ImmediateBooleanProperty noJVMArgsProperty = new ImmediateBooleanProperty(this, "noJVMArgs", false);
+    private final BooleanProperty noJVMArgsProperty = new SimpleBooleanProperty(this, "noJVMArgs", false);
 
-    public ImmediateBooleanProperty noJVMArgsProperty() {
+    public BooleanProperty noJVMArgsProperty() {
         return noJVMArgsProperty;
     }
 
@@ -280,9 +285,9 @@ public final class VersionSetting {
         noJVMArgsProperty.set(noJVMArgs);
     }
 
-    private final ImmediateBooleanProperty notCheckJVMProperty = new ImmediateBooleanProperty(this, "notCheckJVM", false);
+    private final BooleanProperty notCheckJVMProperty = new SimpleBooleanProperty(this, "notCheckJVM", false);
 
-    public ImmediateBooleanProperty notCheckJVMProperty() {
+    public BooleanProperty notCheckJVMProperty() {
         return notCheckJVMProperty;
     }
 
@@ -297,9 +302,9 @@ public final class VersionSetting {
         notCheckJVMProperty.set(notCheckJVM);
     }
 
-    private final ImmediateBooleanProperty notCheckGameProperty = new ImmediateBooleanProperty(this, "notCheckGame", false);
+    private final BooleanProperty notCheckGameProperty = new SimpleBooleanProperty(this, "notCheckGame", false);
 
-    public ImmediateBooleanProperty notCheckGameProperty() {
+    public BooleanProperty notCheckGameProperty() {
         return notCheckGameProperty;
     }
 
@@ -314,9 +319,9 @@ public final class VersionSetting {
         notCheckGameProperty.set(notCheckGame);
     }
 
-    private final ImmediateBooleanProperty showLogsProperty = new ImmediateBooleanProperty(this, "showLogs", false);
+    private final BooleanProperty showLogsProperty = new SimpleBooleanProperty(this, "showLogs", false);
 
-    public ImmediateBooleanProperty showLogsProperty() {
+    public BooleanProperty showLogsProperty() {
         return showLogsProperty;
     }
 
@@ -333,14 +338,14 @@ public final class VersionSetting {
 
     // Minecraft settings.
 
-    private final ImmediateStringProperty serverIpProperty = new ImmediateStringProperty(this, "serverIp", "");
+    private final StringProperty serverIpProperty = new SimpleStringProperty(this, "serverIp", "");
 
-    public ImmediateStringProperty serverIpProperty() {
+    public StringProperty serverIpProperty() {
         return serverIpProperty;
     }
 
     /**
-     * The server ip that will be entered after Minecraft successfully loaded immediately.
+     * The server ip that will be entered after Minecraft successfully loaded ly.
      *
      * Format: ip:port or without port.
      */
@@ -353,9 +358,9 @@ public final class VersionSetting {
     }
 
 
-    private final ImmediateBooleanProperty fullscreenProperty = new ImmediateBooleanProperty(this, "fullscreen", false);
+    private final BooleanProperty fullscreenProperty = new SimpleBooleanProperty(this, "fullscreen", false);
 
-    public ImmediateBooleanProperty fullscreenProperty() {
+    public BooleanProperty fullscreenProperty() {
         return fullscreenProperty;
     }
 
@@ -370,9 +375,9 @@ public final class VersionSetting {
         fullscreenProperty.set(fullscreen);
     }
 
-    private final ImmediateIntegerProperty widthProperty = new ImmediateIntegerProperty(this, "width", 854);
+    private final IntegerProperty widthProperty = new SimpleIntegerProperty(this, "width", 854);
 
-    public ImmediateIntegerProperty widthProperty() {
+    public IntegerProperty widthProperty() {
         return widthProperty;
     }
 
@@ -392,9 +397,9 @@ public final class VersionSetting {
     }
 
 
-    private final ImmediateIntegerProperty heightProperty = new ImmediateIntegerProperty(this, "height", 480);
+    private final IntegerProperty heightProperty = new SimpleIntegerProperty(this, "height", 480);
 
-    public ImmediateIntegerProperty heightProperty() {
+    public IntegerProperty heightProperty() {
         return heightProperty;
     }
 
@@ -417,9 +422,9 @@ public final class VersionSetting {
      * 0 - .minecraft<br/>
      * 1 - .minecraft/versions/&lt;version&gt;/<br/>
      */
-    private final ImmediateObjectProperty<EnumGameDirectory> gameDirTypeProperty = new ImmediateObjectProperty<>(this, "gameDirType", EnumGameDirectory.ROOT_FOLDER);
+    private final ObjectProperty<EnumGameDirectory> gameDirTypeProperty = new SimpleObjectProperty<>(this, "gameDirType", EnumGameDirectory.ROOT_FOLDER);
 
-    public ImmediateObjectProperty<EnumGameDirectory> gameDirTypeProperty() {
+    public ObjectProperty<EnumGameDirectory> gameDirTypeProperty() {
         return gameDirTypeProperty;
     }
 
@@ -434,9 +439,9 @@ public final class VersionSetting {
     /**
      * Your custom gameDir
      */
-    private final ImmediateStringProperty gameDirProperty = new ImmediateStringProperty(this, "gameDir", "");
+    private final StringProperty gameDirProperty = new SimpleStringProperty(this, "gameDir", "");
 
-    public ImmediateStringProperty gameDirProperty() {
+    public StringProperty gameDirProperty() {
         return gameDirProperty;
     }
 
@@ -455,9 +460,9 @@ public final class VersionSetting {
      * 1 - Hide the launcher when the game starts.<br/>
      * 2 - Keep the launcher open.<br/>
      */
-    private final ImmediateObjectProperty<LauncherVisibility> launcherVisibilityProperty = new ImmediateObjectProperty<>(this, "launcherVisibility", LauncherVisibility.HIDE);
+    private final ObjectProperty<LauncherVisibility> launcherVisibilityProperty = new SimpleObjectProperty<>(this, "launcherVisibility", LauncherVisibility.HIDE);
 
-    public ImmediateObjectProperty<LauncherVisibility> launcherVisibilityProperty() {
+    public ObjectProperty<LauncherVisibility> launcherVisibilityProperty() {
         return launcherVisibilityProperty;
     }
 

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

@@ -17,7 +17,7 @@
  */
 package org.jackhuang.hmcl.ui;
 
-import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.utils.JFXUtilities;
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.image.Image;
@@ -35,6 +35,7 @@ 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.MessageDialogPane.MessageType;
 import org.jackhuang.hmcl.ui.decorator.DecoratorController;
 import org.jackhuang.hmcl.ui.download.ModpackInstallWizardProvider;
 import org.jackhuang.hmcl.ui.profile.ProfileList;
@@ -45,7 +46,7 @@ import org.jackhuang.hmcl.upgrade.UpdateChecker;
 import org.jackhuang.hmcl.util.FutureCallback;
 import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.io.FileUtils;
-import org.jackhuang.hmcl.util.javafx.MultiStepBinding;
+import org.jackhuang.hmcl.util.javafx.BindingMapping;
 import org.jackhuang.hmcl.util.platform.JavaVersion;
 import org.jackhuang.hmcl.util.versioning.VersionNumber;
 
@@ -158,7 +159,7 @@ public final class Controllers {
             });
             mainPage.showUpdateProperty().bind(UpdateChecker.outdatedProperty());
             mainPage.latestVersionProperty().bind(
-                    MultiStepBinding.of(UpdateChecker.latestVersionProperty())
+                    BindingMapping.of(UpdateChecker.latestVersionProperty())
                             .map(version -> version == null ? "" : i18n("update.bubble.title", version.getVersion())));
 
             Profiles.registerVersionsListener(profile -> {
@@ -223,14 +224,14 @@ public final class Controllers {
     }
 
     public static void dialog(String text, String title) {
-        dialog(text, title, MessageBox.INFORMATION_MESSAGE);
+        dialog(text, title, MessageType.INFORMATION);
     }
 
-    public static void dialog(String text, String title, int type) {
+    public static void dialog(String text, String title, MessageType type) {
         dialog(text, title, type, null);
     }
 
-    public static void dialog(String text, String title, int type, Runnable onAccept) {
+    public static void dialog(String text, String title, MessageType type, Runnable onAccept) {
         dialog(new MessageDialogPane(text, title, type, onAccept));
     }
 

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

@@ -17,20 +17,21 @@
  */
 package org.jackhuang.hmcl.ui;
 
-import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.utils.JFXUtilities;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.AuthInfo;
+import org.jackhuang.hmcl.auth.AuthenticationException;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
-import org.jackhuang.hmcl.task.SilentException;
 import org.jackhuang.hmcl.ui.account.AccountLoginPane;
 
 import java.util.Optional;
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
 
 public final class DialogController {
 
-    public static AuthInfo logIn(Account account) throws Exception {
+    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);
@@ -42,7 +43,7 @@ public final class DialogController {
                 Controllers.dialog(pane);
             });
             latch.await();
-            return Optional.ofNullable(res.get()).orElseThrow(SilentException::new);
+            return Optional.ofNullable(res.get()).orElseThrow(CancellationException::new);
         }
         return account.logIn();
     }

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

@@ -17,7 +17,7 @@
  */
 package org.jackhuang.hmcl.ui;
 
-import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.utils.JFXUtilities;
 import com.jfoenix.controls.*;
 import javafx.animation.Animation;
 import javafx.animation.Interpolator;
@@ -48,6 +48,7 @@ import org.jackhuang.hmcl.util.*;
 import org.jackhuang.hmcl.util.i18n.I18n;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.javafx.ExtendedProperties;
+import org.jackhuang.hmcl.util.javafx.SafeStringConverter;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 
 import java.io.File;
@@ -331,7 +332,7 @@ public final class FXUtils {
     }
 
     public static void bindInt(JFXTextField textField, Property<Number> property) {
-        textField.textProperty().bindBidirectional(property, SafeIntStringConverter.INSTANCE);
+        textField.textProperty().bindBidirectional(property, SafeStringConverter.fromInteger());
     }
 
     public static void unbindInt(JFXTextField textField, Property<Number> property) {
@@ -510,6 +511,7 @@ public final class FXUtils {
             public void updateItem(T item, boolean empty) {
                 super.updateItem(item, empty);
                 if (!empty) {
+                    setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
                     setGraphic(graphicBuilder.apply(item));
                 }
             }

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

@@ -17,7 +17,7 @@
  */
 package org.jackhuang.hmcl.ui;
 
-import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.utils.JFXUtilities;
 import javafx.application.Platform;
 import javafx.scene.image.Image;
 import javafx.scene.layout.Region;
@@ -25,7 +25,6 @@ import org.jackhuang.hmcl.event.EventBus;
 import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
 import org.jackhuang.hmcl.game.HMCLGameRepository;
 import org.jackhuang.hmcl.game.ModpackHelper;
-import org.jackhuang.hmcl.mod.Modpack;
 import org.jackhuang.hmcl.setting.Accounts;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
@@ -120,14 +119,13 @@ public final class LeftPaneController extends AdvancedListBox {
                     File modpackFile = new File("modpack.zip").getAbsoluteFile();
                     if (modpackFile.exists()) {
                         Task.ofResult(() -> CompressingUtils.findSuitableEncoding(modpackFile.toPath()))
-                                .thenResult(encoding -> ModpackHelper.readModpackManifest(modpackFile.toPath(), encoding))
-                                .thenResult(modpack -> {
+                                .thenApply(encoding -> ModpackHelper.readModpackManifest(modpackFile.toPath(), encoding))
+                                .thenAccept(modpack -> {
                                     AtomicReference<Region> region = new AtomicReference<>();
                                     TaskExecutor executor = ModpackHelper.getInstallTask(repository.getProfile(), modpackFile, modpack.getName(), modpack)
                                             .with(Task.of(Schedulers.javafx(), this::checkAccount)).executor();
                                     region.set(Controllers.taskDialog(executor, i18n("modpack.installing")));
                                     executor.start();
-                                    return null;
                                 }).start();
                     }
                 }

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

@@ -19,12 +19,13 @@ package org.jackhuang.hmcl.ui;
 
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXScrollPane;
-
 import javafx.beans.binding.Bindings;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.SkinBase;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.Pane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import org.jackhuang.hmcl.setting.Theme;
@@ -36,6 +37,8 @@ public class ListPageSkin extends SkinBase<ListPage<?>> {
         super(skinnable);
 
         SpinnerPane spinnerPane = new SpinnerPane();
+        spinnerPane.getStyleClass().add("large-spinner-pane");
+        Pane placeholder = new Pane();
 
         StackPane contentPane = new StackPane();
         {
@@ -48,9 +51,12 @@ public class ListPageSkin extends SkinBase<ListPage<?>> {
                 list.setSpacing(10);
                 list.setPadding(new Insets(10));
 
+                VBox content = new VBox();
+                content.getChildren().setAll(list, placeholder);
+
                 Bindings.bindContent(list.getChildren(), skinnable.itemsProperty());
 
-                scrollPane.setContent(list);
+                scrollPane.setContent(content);
                 JFXScrollPane.smoothScrolling(scrollPane);
             }
             
@@ -64,7 +70,7 @@ public class ListPageSkin extends SkinBase<ListPage<?>> {
                 JFXButton btnAdd = new JFXButton();
                 FXUtils.setLimitWidth(btnAdd, 40);
                 FXUtils.setLimitHeight(btnAdd, 40);
-                btnAdd.getStyleClass().setAll("jfx-button-raised-round");
+                btnAdd.getStyleClass().add("jfx-button-raised-round");
                 btnAdd.setButtonType(JFXButton.ButtonType.RAISED);
                 btnAdd.setGraphic(SVG.plus(Theme.whiteFillBinding(), -1, -1));
                 btnAdd.setOnMouseClicked(e -> skinnable.add());
@@ -72,7 +78,7 @@ public class ListPageSkin extends SkinBase<ListPage<?>> {
                 JFXButton btnRefresh = new JFXButton();
                 FXUtils.setLimitWidth(btnRefresh, 40);
                 FXUtils.setLimitHeight(btnRefresh, 40);
-                btnRefresh.getStyleClass().setAll("jfx-button-raised-round");
+                btnRefresh.getStyleClass().add("jfx-button-raised-round");
                 btnRefresh.setButtonType(JFXButton.ButtonType.RAISED);
                 btnRefresh.setGraphic(SVG.refresh(Theme.whiteFillBinding(), -1, -1));
                 btnRefresh.setOnMouseClicked(e -> skinnable.refresh());
@@ -86,7 +92,13 @@ public class ListPageSkin extends SkinBase<ListPage<?>> {
                         });
             }
 
-            contentPane.getChildren().setAll(scrollPane, vBox);
+            // Keep a blank space to prevent buttons from blocking up mod items.
+            BorderPane group = new BorderPane();
+            group.setPickOnBounds(false);
+            group.setBottom(vBox);
+            placeholder.minHeightProperty().bind(vBox.heightProperty());
+
+            contentPane.getChildren().setAll(scrollPane, group);
         }
 
         spinnerPane.loadingProperty().bind(skinnable.loadingProperty());

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

@@ -201,11 +201,11 @@ public final class LogWindow extends Stage {
             if (!flag)
                 cboLines.getSelectionModel().select(0);
 
-            btnFatals.textProperty().bind(Bindings.createStringBinding(() -> Integer.toString(fatal.get()) + " fatals", fatal));
-            btnErrors.textProperty().bind(Bindings.createStringBinding(() -> Integer.toString(error.get()) + " errors", error));
-            btnWarns.textProperty().bind(Bindings.createStringBinding(() -> Integer.toString(warn.get()) + " warns", warn));
-            btnInfos.textProperty().bind(Bindings.createStringBinding(() -> Integer.toString(info.get()) + " infos", info));
-            btnDebugs.textProperty().bind(Bindings.createStringBinding(() -> Integer.toString(debug.get()) + " debugs", debug));
+            btnFatals.textProperty().bind(Bindings.concat(fatal, " fatals"));
+            btnErrors.textProperty().bind(Bindings.concat(error, " errors"));
+            btnWarns.textProperty().bind(Bindings.concat(warn, " warns"));
+            btnInfos.textProperty().bind(Bindings.concat(info, " infos"));
+            btnDebugs.textProperty().bind(Bindings.concat(debug, " debugs"));
 
             btnFatals.selectedProperty().addListener(o -> specificChanged());
             btnErrors.selectedProperty().addListener(o -> specificChanged());

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

@@ -162,4 +162,8 @@ public final class SVG {
     public static Node viewList(ObjectBinding<? extends Paint> fill, double width, double height) {
         return createSVGPath("M7,5H21V7H7V5M7,13V11H21V13H7M4,4.5A1.5,1.5 0 0,1 5.5,6A1.5,1.5 0 0,1 4,7.5A1.5,1.5 0 0,1 2.5,6A1.5,1.5 0 0,1 4,4.5M4,10.5A1.5,1.5 0 0,1 5.5,12A1.5,1.5 0 0,1 4,13.5A1.5,1.5 0 0,1 2.5,12A1.5,1.5 0 0,1 4,10.5M7,19V17H21V19H7M4,16.5A1.5,1.5 0 0,1 5.5,18A1.5,1.5 0 0,1 4,19.5A1.5,1.5 0 0,1 2.5,18A1.5,1.5 0 0,1 4,16.5Z", fill, width, height);
     }
+
+    public static Node check(ObjectBinding<? extends Paint> fill, double width, double height) {
+        return createSVGPath("M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z", fill, width, height);
+    }
 }

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

@@ -1,43 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> 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.util.StringConverter;
-import org.jackhuang.hmcl.util.Lang;
-
-import java.util.Optional;
-
-/**
- * @author huangyuhui
- */
-public final class SafeIntStringConverter extends StringConverter<Number> {
-    public static final SafeIntStringConverter INSTANCE = new SafeIntStringConverter();
-
-    private SafeIntStringConverter() {
-    }
-
-    @Override
-    public Number fromString(String string) {
-        return Optional.ofNullable(string).map(Lang::toIntOrNull).orElse(null);
-    }
-
-    @Override
-    public String toString(Number object) {
-        return Optional.ofNullable(object).map(Object::toString).orElse("");
-    }
-}

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

@@ -31,7 +31,7 @@ import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.setting.*;
-import org.jackhuang.hmcl.ui.construct.MessageBox;
+import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
 import org.jackhuang.hmcl.ui.construct.Validator;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
 import org.jackhuang.hmcl.upgrade.RemoteVersion;
@@ -228,7 +228,7 @@ public final class SettingsPage extends SettingsView implements DecoratorPage {
             try {
                 Files.write(logFile, Logging.getRawLogs());
             } catch (IOException e) {
-                Platform.runLater(() -> Controllers.dialog(i18n("settings.launcher.launcher_log.export.failed") + "\n" + e, null, MessageBox.ERROR_MESSAGE));
+                Platform.runLater(() -> Controllers.dialog(i18n("settings.launcher.launcher_log.export.failed") + "\n" + e, null, MessageType.ERROR));
                 LOG.log(Level.WARNING, "Failed to export logs", e);
                 return;
             }
@@ -247,4 +247,9 @@ public final class SettingsPage extends SettingsView implements DecoratorPage {
     protected void onHelp() {
         FXUtils.openLink(Metadata.HELP_URL);
     }
+
+    @Override
+    protected void onSponsor() {
+        FXUtils.openLink("https://hmcl.huangyuhui.net/api/redirect/sponsor");
+    }
 }

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

@@ -21,6 +21,7 @@ import com.jfoenix.controls.*;
 import javafx.geometry.HPos;
 import javafx.geometry.Pos;
 import javafx.geometry.VPos;
+import javafx.scene.Cursor;
 import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.*;
@@ -75,6 +76,19 @@ public abstract class SettingsView extends StackPane {
             {
                 ComponentList settingsPane = new ComponentList();
                 {
+                    {
+                        StackPane sponsorPane = new StackPane();
+                        sponsorPane.setCursor(Cursor.HAND);
+                        sponsorPane.setOnMouseClicked(e -> onSponsor());
+                        {
+                            Label label = new Label(i18n("sponsor.hmcl"));
+                            label.setWrapText(true);
+                            label.prefWidthProperty().bind(sponsorPane.widthProperty());
+                            sponsorPane.getChildren().add(label);
+                        }
+                        settingsPane.getContent().add(sponsorPane);
+                    }
+
                     ComponentSublist updatePane = new ComponentSublist();
                     updatePane.setTitle(i18n("update"));
                     updatePane.setHasSubtitle(true);
@@ -83,7 +97,7 @@ public abstract class SettingsView extends StackPane {
 
                         lblUpdate = new Label(i18n("update"));
                         lblUpdateSub = new Label();
-                        lblUpdateSub.getStyleClass().setAll("subtitle-label");
+                        lblUpdateSub.getStyleClass().add("subtitle-label");
 
                         headerLeft.getChildren().setAll(lblUpdate, lblUpdateSub);
                         updatePane.setHeaderLeft(headerLeft);
@@ -92,7 +106,7 @@ public abstract class SettingsView extends StackPane {
                     {
                         btnUpdate = new JFXButton();
                         btnUpdate.setOnMouseClicked(e -> onUpdate());
-                        btnUpdate.getStyleClass().setAll("toggle-icon4");
+                        btnUpdate.getStyleClass().add("toggle-icon4");
                         btnUpdate.setGraphic(SVG.update(Theme.blackFillBinding(), 20, 20));
 
                         updatePane.setHeaderRight(btnUpdate);
@@ -124,7 +138,7 @@ public abstract class SettingsView extends StackPane {
 
                         Label help = new Label(i18n("help"));
                         Label helpSubtitle = new Label(i18n("help.detail"));
-                        helpSubtitle.getStyleClass().setAll("subtitle-label");
+                        helpSubtitle.getStyleClass().add("subtitle-label");
 
                         headerLeft.getChildren().setAll(help, helpSubtitle);
                         updatePane.setLeft(headerLeft);
@@ -133,7 +147,7 @@ public abstract class SettingsView extends StackPane {
                     {
                         JFXButton btnExternal = new JFXButton();
                         btnExternal.setOnMouseClicked(e -> onHelp());
-                        btnExternal.getStyleClass().setAll("toggle-icon4");
+                        btnExternal.getStyleClass().add("toggle-icon4");
                         btnExternal.setGraphic(SVG.openInNew(Theme.blackFillBinding(), -1, -1));
 
                         updatePane.setRight(btnExternal);
@@ -337,7 +351,7 @@ public abstract class SettingsView extends StackPane {
                     {
                         JFXButton logButton = new JFXButton(i18n("settings.launcher.launcher_log.export"));
                         logButton.setOnMouseClicked(e -> onExportLogs());
-                        logButton.getStyleClass().setAll("jfx-button-border");
+                        logButton.getStyleClass().add("jfx-button-border");
 
                         logPane.setHeaderRight(logButton);
                     }
@@ -491,4 +505,5 @@ public abstract class SettingsView extends StackPane {
     protected abstract void onUpdate();
     protected abstract void onHelp();
     protected abstract void onExportLogs();
+    protected abstract void onSponsor();
 }

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

@@ -37,6 +37,7 @@ import static org.jackhuang.hmcl.util.Lang.thread;
 import static org.jackhuang.hmcl.util.Logging.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
+import java.util.concurrent.CancellationException;
 import java.util.logging.Level;
 
 public class AccountListItem extends RadioButton {
@@ -84,6 +85,8 @@ public class AccountListItem extends RadioButton {
             } catch (CredentialExpiredException e) {
                 try {
                     DialogController.logIn(account);
+                } catch (CancellationException e1) {
+                    // ignore cancellation
                 } catch (Exception e1) {
                     LOG.log(Level.WARNING, "Failed to refresh " + account + " with password", e1);
                 }

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

@@ -17,7 +17,7 @@
  */
 package org.jackhuang.hmcl.ui.account;
 
-import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.utils.JFXUtilities;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXRadioButton;
 import com.jfoenix.effects.JFXDepthManager;
@@ -35,6 +35,7 @@ import javafx.scene.layout.VBox;
 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.util.i18n.I18n.i18n;
 
@@ -75,7 +76,7 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {
         if (skinnable.getAccount() instanceof AuthlibInjectorAccount) {
             Tooltip tooltip = new Tooltip();
             AuthlibInjectorServer server = ((AuthlibInjectorAccount) skinnable.getAccount()).getServer();
-            tooltip.textProperty().bind(Bindings.createStringBinding(server::toString, server));
+            tooltip.textProperty().bind(BindingMapping.of(server, AuthlibInjectorServer::toString));
             FXUtils.installSlowTooltip(subtitle, tooltip);
         }
         VBox item = new VBox(title, subtitle);
@@ -103,7 +104,7 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {
         right.getChildren().add(btnRemove);
         root.setRight(right);
 
-        root.setStyle("-fx-background-color: white; -fx-padding: 8 8 8 0;");
+        root.setStyle("-fx-background-color: white; -fx-padding: 8 8 8 12;");
         JFXDepthManager.setDepth(root, 1);
 
         getChildren().setAll(root);

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

@@ -31,6 +31,9 @@ import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 
 import java.util.function.Consumer;
+import java.util.logging.Level;
+
+import static org.jackhuang.hmcl.util.Logging.LOG;
 
 public class AccountLoginPane extends StackPane {
     private final Account oldAccount;
@@ -59,11 +62,12 @@ public class AccountLoginPane extends StackPane {
         progressBar.setVisible(true);
         lblCreationWarning.setText("");
         Task.ofResult(() -> oldAccount.logInWithPassword(password))
-                .finalizedResult(Schedulers.javafx(), authInfo -> {
+                .whenComplete(Schedulers.javafx(), authInfo -> {
                     success.accept(authInfo);
                     fireEvent(new DialogCloseEvent());
                     progressBar.setVisible(false);
                 }, e -> {
+                    LOG.log(Level.INFO, "Failed to login with password: " + oldAccount, e);
                     if (e instanceof NoSelectedCharacterException) {
                         fireEvent(new DialogCloseEvent());
                     } else {

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

@@ -17,7 +17,7 @@
  */
 package org.jackhuang.hmcl.ui.account;
 
-import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.utils.JFXUtilities;
 import com.jfoenix.controls.*;
 
 import javafx.application.Platform;
@@ -47,7 +47,7 @@ import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.construct.*;
-import org.jackhuang.hmcl.util.javafx.MultiStepBinding;
+import org.jackhuang.hmcl.util.javafx.BindingMapping;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -126,7 +126,7 @@ public class AddAccountPane extends StackPane {
                 cboServers.getSelectionModel().selectedItemProperty(), cboServers.visibleProperty()));
 
         // authlib-injector links
-        links.bind(MultiStepBinding.of(cboServers.getSelectionModel().selectedItemProperty())
+        links.bind(BindingMapping.of(cboServers.getSelectionModel().selectedItemProperty())
                 .map(AddAccountPane::createHyperlinks)
                 .map(FXCollections::observableList));
         Bindings.bindContent(linksContainer.getChildren(), links);
@@ -196,7 +196,7 @@ public class AddAccountPane extends StackPane {
         Object additionalData = getAuthAdditionalData();
 
         Task.ofResult(() -> factory.create(new Selector(), username, password, additionalData))
-                .finalizedResult(Schedulers.javafx(), account -> {
+                .whenComplete(Schedulers.javafx(), account -> {
                     int oldIndex = Accounts.getAccounts().indexOf(account);
                     if (oldIndex == -1) {
                         Accounts.getAccounts().add(account);

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

@@ -106,11 +106,11 @@ public class AddAuthlibInjectorServerPane extends StackPane implements DialogAwa
 
         Task.of(() -> {
             serverBeingAdded = AuthlibInjectorServer.locateServer(url);
-        }).finalized(Schedulers.javafx(), (variables, isDependentsSucceeded) -> {
+        }).whenComplete(Schedulers.javafx(), (isDependentSucceeded, exception) -> {
             addServerPane.setDisable(false);
             nextPane.hideSpinner();
 
-            if (isDependentsSucceeded) {
+            if (isDependentSucceeded) {
                 lblServerName.setText(serverBeingAdded.getName());
                 lblServerUrl.setText(serverBeingAdded.getUrl());
 
@@ -118,7 +118,6 @@ public class AddAuthlibInjectorServerPane extends StackPane implements DialogAwa
 
                 transitionHandler.setContent(confirmServerPane, ContainerAnimations.SWIPE_LEFT.getAnimationProducer());
             } else {
-                Exception exception = variables.get("lastException");
                 LOG.log(Level.WARNING, "Failed to resolve auth server: " + url, exception);
                 lblCreationWarning.setText(resolveFetchExceptionMessage(exception));
             }

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

@@ -83,7 +83,7 @@ public class AdvancedListItemSkin extends SkinBase<AdvancedListItem> {
         HBox right = new HBox();
         right.setAlignment(Pos.CENTER);
         right.setMouseTransparent(true);
-        right.getStyleClass().setAll("toggle-icon4");
+        right.getStyleClass().add("toggle-icon4");
         FXUtils.setLimitWidth(right, 40);
         FXUtils.onChangeAndOperate(skinnable.rightGraphicProperty(),
                 newGraphic -> {
@@ -99,7 +99,7 @@ public class AdvancedListItemSkin extends SkinBase<AdvancedListItem> {
                 visible -> root.setRight(visible ? right : null));
 
         stackPane.setStyle("-fx-padding: 10 16 10 16;");
-        stackPane.getStyleClass().setAll("transparent");
+        stackPane.getStyleClass().add("transparent");
         stackPane.setPickOnBounds(false);
         stackPane.getChildren().setAll(root);
 

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

@@ -21,7 +21,7 @@ import static javafx.collections.FXCollections.emptyObservableList;
 import static javafx.collections.FXCollections.observableList;
 import static javafx.collections.FXCollections.singletonObservableList;
 
-import org.jackhuang.hmcl.util.javafx.MultiStepBinding;
+import org.jackhuang.hmcl.util.javafx.BindingMapping;
 
 import com.jfoenix.controls.JFXComboBox;
 import com.jfoenix.controls.JFXListCell;
@@ -49,7 +49,7 @@ public class FontComboBox extends JFXComboBox<String> {
             }
         });
 
-        itemsProperty().bind(MultiStepBinding.of(valueProperty())
+        itemsProperty().bind(BindingMapping.of(valueProperty())
                         .map(value -> value == null ? emptyObservableList() : singletonObservableList(value)));
 
         setOnMouseClicked(e -> {

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

@@ -45,7 +45,7 @@ public class IconedItem extends RipplerContainer {
             hBox.getChildren().add(icon);
         }
 
-        hBox.getStyleClass().setAll("iconed-item-container");
+        hBox.getStyleClass().add("iconed-item-container");
         Label textLabel = new Label();
         textLabel.setId("label");
         textLabel.setMouseTransparent(true);

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

@@ -0,0 +1,133 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.construct;
+
+import com.jfoenix.controls.JFXCheckBox;
+import javafx.beans.binding.Bindings;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.value.ObservableValue;
+import javafx.geometry.Pos;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.TreeTableCell;
+import javafx.util.Callback;
+import javafx.util.StringConverter;
+
+public class JFXCheckBoxTreeTableCell<S,T> extends TreeTableCell<S,T> {
+
+    private final CheckBox checkBox;
+    private boolean showLabel;
+    private ObservableValue<Boolean> booleanProperty;
+
+    public JFXCheckBoxTreeTableCell() {
+        this(null, null);
+    }
+
+    public JFXCheckBoxTreeTableCell(
+            final Callback<Integer, ObservableValue<Boolean>> getSelectedProperty) {
+        this(getSelectedProperty, null);
+    }
+
+    public JFXCheckBoxTreeTableCell(
+            final Callback<Integer, ObservableValue<Boolean>> getSelectedProperty,
+            final StringConverter<T> converter) {
+        this.getStyleClass().add("check-box-tree-table-cell");
+        this.checkBox = new JFXCheckBox();
+        setGraphic(null);
+        setSelectedStateCallback(getSelectedProperty);
+        setConverter(converter);
+    }
+
+    private ObjectProperty<StringConverter<T>> converter =
+            new SimpleObjectProperty<StringConverter<T>>(this, "converter") {
+                protected void invalidated() {
+                    updateShowLabel();
+                }
+            };
+
+    public final ObjectProperty<StringConverter<T>> converterProperty() {
+        return converter;
+    }
+    public final void setConverter(StringConverter<T> value) {
+        converterProperty().set(value);
+    }
+    public final StringConverter<T> getConverter() {
+        return converterProperty().get();
+    }
+
+    private ObjectProperty<Callback<Integer, ObservableValue<Boolean>>>
+            selectedStateCallback =
+            new SimpleObjectProperty<Callback<Integer, ObservableValue<Boolean>>>(
+                    this, "selectedStateCallback");
+
+    public final ObjectProperty<Callback<Integer, ObservableValue<Boolean>>> selectedStateCallbackProperty() {
+        return selectedStateCallback;
+    }
+
+    public final void setSelectedStateCallback(Callback<Integer, ObservableValue<Boolean>> value) {
+        selectedStateCallbackProperty().set(value);
+    }
+
+    public final Callback<Integer, ObservableValue<Boolean>> getSelectedStateCallback() {
+        return selectedStateCallbackProperty().get();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override public void updateItem(T item, boolean empty) {
+        super.updateItem(item, empty);
+
+        if (empty) {
+            setText(null);
+            setGraphic(null);
+        } else {
+            StringConverter<T> c = getConverter();
+
+            if (showLabel) {
+                setText(c.toString(item));
+            }
+            setGraphic(checkBox);
+
+            if (booleanProperty instanceof BooleanProperty) {
+                checkBox.selectedProperty().unbindBidirectional((BooleanProperty)booleanProperty);
+            }
+            ObservableValue<?> obsValue = getSelectedProperty();
+            if (obsValue instanceof BooleanProperty) {
+                booleanProperty = (ObservableValue<Boolean>) obsValue;
+                checkBox.selectedProperty().bindBidirectional((BooleanProperty)booleanProperty);
+            }
+
+            checkBox.disableProperty().bind(Bindings.not(
+                    getTreeTableView().editableProperty().and(
+                            getTableColumn().editableProperty()).and(
+                            editableProperty())
+            ));
+        }
+    }
+
+    private void updateShowLabel() {
+        this.showLabel = converter != null;
+        this.checkBox.setAlignment(showLabel ? Pos.CENTER_LEFT : Pos.CENTER);
+    }
+
+    private ObservableValue<?> getSelectedProperty() {
+        return getSelectedStateCallback() != null ?
+                getSelectedStateCallback().call(getIndex()) :
+                getTableColumn().getCellObservableValue(getIndex());
+    }
+}

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

@@ -1,172 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.ui.construct;
-
-import javafx.scene.control.Alert;
-import javafx.scene.control.ButtonType;
-import javafx.scene.control.TextInputDialog;
-import org.jackhuang.hmcl.ui.FXUtils;
-
-import javax.swing.*;
-import java.util.Optional;
-
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
-public final class MessageBox {
-    private MessageBox() {
-    }
-
-    private static final String TITLE = i18n("message.info");
-
-    /**
-     * User Operation: Yes
-     */
-    public static final int YES_OPTION = 0;
-
-    /**
-     * User Operation: No
-     */
-    public static final int NO_OPTION = 1;
-
-    /**
-     * User Operation: Cancel
-     */
-    public static final int CANCEL_OPTION = 2;
-
-    /**
-     * User Operation: OK
-     */
-    public static final int OK_OPTION = 0;
-
-    /**
-     * User Operation: Closed Message Box
-     */
-    public static final int CLOSED_OPTION = -1;
-
-    /**
-     * Buttons: Yes No
-     */
-    public static final int YES_NO_OPTION = 10;
-    /**
-     * Buttons: Yes No Cancel
-     */
-    public static final int YES_NO_CANCEL_OPTION = 11;
-    /**
-     * Buttons: OK Cancel
-     */
-    public static final int OK_CANCEL_OPTION = 12;
-
-    /**
-     * Message Box Type: Error
-     */
-    public static final int ERROR_MESSAGE = 0;
-    /**
-     * Message Box Type: Info
-     */
-    public static final int INFORMATION_MESSAGE = 1;
-    /**
-     * Message Box Type: Warning
-     */
-    public static final int WARNING_MESSAGE = 2;
-    /**
-     * Message Box Type: Question
-     */
-    public static final int QUESTION_MESSAGE = 3;
-    /**
-     * Message Box Type: Fine
-     */
-    public static final int FINE_MESSAGE = 4;
-    /**
-     * Message Box Type: Plain
-     */
-    public static final int PLAIN_MESSAGE = -1;
-
-
-    public static void show(String message) {
-        show(message, TITLE);
-    }
-
-    /**
-     * Show MsgBox with title and options
-     *
-     * @param message The Message
-     * @param title   The title of MsgBox.
-     * @return user operation.
-     */
-    public static Optional<ButtonType> show(String message, String title) {
-        Alert alert = new Alert(Alert.AlertType.INFORMATION);
-        alert.setTitle(title);
-        alert.setHeaderText(title);
-        alert.setContentText(message);
-        return alert.showAndWait();
-    }
-
-    public static int confirm(String message, String title) {
-        return confirm(message, title, -1);
-    }
-
-    public static int confirm(String message, int option) {
-        return confirm(message, TITLE, option);
-    }
-
-    public static int confirm(String message, String title, int option) {
-        return FXUtils.runInUIThread(() -> {
-            Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
-            alert.setTitle(title);
-            alert.setHeaderText(title);
-            alert.setContentText(message);
-            switch (option) {
-                case YES_NO_OPTION:
-                    alert.getButtonTypes().setAll(ButtonType.YES, ButtonType.NO);
-                    break;
-                case YES_NO_CANCEL_OPTION:
-                    alert.getButtonTypes().setAll(ButtonType.YES, ButtonType.NO, ButtonType.CANCEL);
-                    break;
-                case OK_CANCEL_OPTION:
-                    alert.getButtonTypes().setAll(ButtonType.OK, ButtonType.CANCEL);
-                    break;
-                default:
-                    throw new IllegalArgumentException("Unrecognized message box option " + option);
-            }
-            Optional<ButtonType> buttonType = alert.showAndWait();
-            if (!buttonType.isPresent()) return CLOSED_OPTION;
-            else if (buttonType.get() == ButtonType.OK) return OK_OPTION;
-            else if (buttonType.get() == ButtonType.YES) return YES_OPTION;
-            else if (buttonType.get() == ButtonType.NO) return NO_OPTION;
-            else if (buttonType.get() == ButtonType.CANCEL) return CANCEL_OPTION;
-            else throw new IllegalStateException("Unexpected button type:" + buttonType.get());
-        });
-    }
-
-    public static Optional<String> input(String message) {
-        return input(message, UIManager.getString("OptionPane.inputDialogTitle"));
-    }
-
-    public static Optional<String> input(String message, String title) {
-        return input(message, title, "");
-    }
-
-    public static Optional<String> input(String message, String title, String initialValue) {
-        TextInputDialog dialog = new TextInputDialog(initialValue);
-        dialog.setTitle(title);
-        dialog.setHeaderText(message);
-        dialog.setContentText(message);
-
-        return dialog.showAndWait();
-    }
-}

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

@@ -32,6 +32,15 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class MessageDialogPane extends StackPane {
 
+    public static enum MessageType {
+        ERROR,
+        INFORMATION,
+        WARNING,
+        QUESTION,
+        FINE,
+        PLAIN,
+    }
+
     @FXML
     private JFXButton acceptButton;
     @FXML
@@ -45,7 +54,7 @@ public final class MessageDialogPane extends StackPane {
     @FXML
     private HBox actions;
 
-    public MessageDialogPane(String text, String title, int type, Runnable onAccept) {
+    public MessageDialogPane(String text, String title, MessageType type, Runnable onAccept) {
         FXUtils.loadFXML(this, "/assets/fxml/message-dialog.fxml");
 
         if (title != null)
@@ -60,19 +69,19 @@ public final class MessageDialogPane extends StackPane {
         actions.getChildren().remove(cancelButton);
 
         switch (type) {
-            case MessageBox.INFORMATION_MESSAGE:
+            case INFORMATION:
                 graphic.setGraphic(SVG.infoCircle(Theme.blackFillBinding(), 40, 40));
                 break;
-            case MessageBox.ERROR_MESSAGE:
+            case ERROR:
                 graphic.setGraphic(SVG.closeCircle(Theme.blackFillBinding(), 40, 40));
                 break;
-            case MessageBox.FINE_MESSAGE:
+            case FINE:
                 graphic.setGraphic(SVG.checkCircle(Theme.blackFillBinding(), 40, 40));
                 break;
-            case MessageBox.WARNING_MESSAGE:
+            case WARNING:
                 graphic.setGraphic(SVG.alert(Theme.blackFillBinding(), 40, 40));
                 break;
-            case MessageBox.QUESTION_MESSAGE:
+            case QUESTION:
                 graphic.setGraphic(SVG.helpCircle(Theme.blackFillBinding(), 40, 40));
                 break;
             default:
@@ -81,7 +90,7 @@ public final class MessageDialogPane extends StackPane {
     }
 
     public MessageDialogPane(String text, String title, Runnable onAccept, Runnable onCancel) {
-        this(text, title, MessageBox.QUESTION_MESSAGE, onAccept);
+        this(text, title, MessageType.QUESTION, onAccept);
 
         cancelButton.setVisible(true);
         cancelButton.setOnMouseClicked(e -> {

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

@@ -64,7 +64,7 @@ public class PopupMenu extends Control {
     public static Node wrapPopupMenuItem(Node node) {
         StackPane pane = new StackPane();
         pane.getChildren().setAll(node);
-        pane.getStyleClass().setAll("menu-container");
+        pane.getStyleClass().add("menu-container");
         node.setMouseTransparent(true);
         return new RipplerContainer(pane);
     }

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

@@ -18,7 +18,6 @@
 package org.jackhuang.hmcl.ui.construct;
 
 import com.jfoenix.controls.JFXRippler;
-import javafx.animation.Transition;
 import javafx.beans.DefaultProperty;
 import javafx.beans.InvalidationListener;
 import javafx.beans.NamedArg;
@@ -64,68 +63,28 @@ public class RipplerContainer extends StackPane {
             mask.resize(buttonContainer.getWidth() - buttonContainer.snappedRightInset() - buttonContainer.snappedLeftInset(), buttonContainer.getHeight() - buttonContainer.snappedBottomInset() - buttonContainer.snappedTopInset());
             return mask;
         }
-
-        @Override
-        protected void initListeners() {
-            this.ripplerPane.setOnMousePressed(event -> {
-                if (releaseManualRippler != null)
-                    releaseManualRippler.run();
-                releaseManualRippler = null;
-                createRipple(event.getX(), event.getY());
-            });
-        }
     };
 
-    private Transition clickedAnimation;
     private final CornerRadii defaultRadii = new CornerRadii(3);
-    private Runnable releaseManualRippler;
 
     public RipplerContainer(@NamedArg("container") Node container) {
         setContainer(container);
 
         getStyleClass().add(DEFAULT_STYLE_CLASS);
         buttonContainer.getChildren().add(buttonRippler);
-        setOnMousePressed(event -> {
-            if (clickedAnimation != null) {
-                clickedAnimation.setRate(1);
-                clickedAnimation.play();
-            }
-        });
-        setOnMouseReleased(event -> {
-            if (clickedAnimation != null) {
-                clickedAnimation.setRate(-1);
-                clickedAnimation.play();
-            }
-        });
         focusedProperty().addListener((a, b, newValue) -> {
             if (newValue) {
                 if (!isPressed())
-                    buttonRippler.showOverlay();
+                    buttonRippler.setOverlayVisible(true);
             } else {
-                buttonRippler.hideOverlay();
+                buttonRippler.setOverlayVisible(false);
             }
         });
-        pressedProperty().addListener(o -> buttonRippler.hideOverlay());
+        pressedProperty().addListener(o -> buttonRippler.setOverlayVisible(false));
         setPickOnBounds(false);
 
         buttonContainer.setPickOnBounds(false);
-        buttonContainer.shapeProperty().bind(shapeProperty());
-        buttonContainer.borderProperty().bind(borderProperty());
-        buttonContainer.backgroundProperty().bind(Bindings.createObjectBinding(() -> {
-            if (getBackground() == null || isJavaDefaultBackground(getBackground()) || isJavaDefaultClickedBackground(getBackground()))
-                setBackground(new Background(new BackgroundFill(Color.TRANSPARENT, defaultRadii, null)));
-
-            try {
-                return new Background(new BackgroundFill(getBackground() != null ? getBackground().getFills().get(0).getFill() : Color.TRANSPARENT,
-                        getBackground() != null ? getBackground().getFills().get(0).getRadii() : defaultRadii, Insets.EMPTY));
-            } catch (Exception e) {
-                return getBackground();
-            }
-        }, backgroundProperty()));
-
-        ripplerFillProperty().addListener((a, b, newValue) -> buttonRippler.setRipplerFill(newValue));
-        if (getBackground() == null || isJavaDefaultBackground(getBackground()))
-            setBackground(new Background(new BackgroundFill(Color.TRANSPARENT, defaultRadii, null)));
+        buttonRippler.ripplerFillProperty().bind(ripplerFillProperty());
 
         containerProperty().addListener(o -> updateChildren());
         updateChildren();
@@ -153,24 +112,6 @@ public class RipplerContainer extends StackPane {
             getChildren().get(i).setPickOnBounds(false);
     }
 
-    private boolean isJavaDefaultBackground(Background background) {
-        try {
-            String firstFill = background.getFills().get(0).getFill().toString();
-            return "0xffffffba".equals(firstFill) || "0xffffffbf".equals(firstFill) || "0xffffffbd".equals(firstFill);
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    private boolean isJavaDefaultClickedBackground(Background background) {
-        try {
-            String firstFill = background.getFills().get(0).getFill().toString();
-            return "0x039ed3ff".equals(firstFill);
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
     public Node getContainer() {
         return container.get();
     }

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

@@ -17,7 +17,7 @@
  */
 package org.jackhuang.hmcl.ui.construct;
 
-import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.utils.JFXUtilities;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXProgressBar;
 import javafx.application.Platform;

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

@@ -17,15 +17,11 @@
  */
 package org.jackhuang.hmcl.ui.construct;
 
-import com.jfoenix.controls.JFXListView;
 import com.jfoenix.controls.JFXProgressBar;
 import javafx.application.Platform;
-import javafx.beans.binding.Bindings;
 import javafx.beans.property.ReadOnlyIntegerProperty;
 import javafx.beans.property.ReadOnlyIntegerWrapper;
-import javafx.geometry.Insets;
 import javafx.scene.control.Label;
-import javafx.scene.control.ListCell;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.download.forge.ForgeInstallTask;
@@ -45,16 +41,15 @@ import java.util.Map;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class TaskListPane extends StackPane {
-    private final JFXListView<Task> listBox = new JFXListView<>();
+    private final AdvancedListBox listBox = new AdvancedListBox();
     private final Map<Task, ProgressListNode> nodes = new HashMap<>();
     private final ReadOnlyIntegerWrapper finishedTasks = new ReadOnlyIntegerWrapper();
     private final ReadOnlyIntegerWrapper totTasks = new ReadOnlyIntegerWrapper();
 
     public TaskListPane() {
-        getChildren().setAll(listBox);
+        listBox.setSpacing(0);
 
-        listBox.setPadding(Insets.EMPTY);
-        listBox.setCellFactory(listView -> new ProgressListNode());
+        getChildren().setAll(listBox);
     }
 
     public ReadOnlyIntegerProperty finishedTasksProperty() {
@@ -70,7 +65,7 @@ public final class TaskListPane extends StackPane {
             @Override
             public void onStart() {
                 Platform.runLater(() -> {
-                    listBox.getItems().clear();
+                    listBox.clear();
                     finishedTasks.set(0);
                     totTasks.set(0);
                 });
@@ -112,66 +107,64 @@ public final class TaskListPane extends StackPane {
                     task.setName(i18n("modpack.scan"));
                 }
 
-                Platform.runLater(() -> listBox.getItems().add(task));
+                ProgressListNode node = new ProgressListNode(task);
+                nodes.put(task, node);
+                Platform.runLater(() -> listBox.add(node));
             }
 
             @Override
             public void onFinished(Task task) {
+                ProgressListNode node = nodes.remove(task);
+                if (node == null)
+                    return;
+                node.unbind();
                 Platform.runLater(() -> {
-                    if (listBox.getItems().remove(task))
-                        finishedTasks.set(finishedTasks.getValue() + 1);
+                    listBox.remove(node);
+                    finishedTasks.set(finishedTasks.getValue() + 1);
+                });
+            }
+
+            @Override
+            public void onFailed(Task task, Throwable throwable) {
+                ProgressListNode node = nodes.remove(task);
+                if (node == null)
+                    return;
+                Platform.runLater(() -> {
+                    node.setThrowable(throwable);
+                    finishedTasks.set(finishedTasks.getValue() + 1);
                 });
             }
         });
     }
 
-    private static class ProgressListNode extends ListCell<Task> {
-        private final BorderPane borderPane = new BorderPane();
+    private static class ProgressListNode extends BorderPane {
         private final JFXProgressBar bar = new JFXProgressBar();
         private final Label title = new Label();
         private final Label state = new Label();
 
-        {
-            borderPane.setLeft(title);
-            borderPane.setRight(state);
-            borderPane.setBottom(bar);
-            borderPane.setMinWidth(0);
-            borderPane.setPrefWidth(1);
+        public ProgressListNode(Task task) {
+            bar.progressProperty().bind(task.progressProperty());
+            title.setText(task.getName());
+            state.textProperty().bind(task.messageProperty());
 
-            setPadding(Insets.EMPTY);
+            setLeft(title);
+            setRight(state);
+            setBottom(bar);
 
             bar.minWidthProperty().bind(widthProperty());
             bar.prefWidthProperty().bind(widthProperty());
             bar.maxWidthProperty().bind(widthProperty());
         }
 
-        @Override
-        protected void updateItem(Task item, boolean empty) {
-            boolean wasEmpty = isEmpty();
-            Task oldTask = getItem();
+        public void unbind() {
+            bar.progressProperty().unbind();
+            state.textProperty().unbind();
+        }
 
-            if (!wasEmpty && oldTask != null) {
-                bar.progressProperty().unbind();
-                state.textProperty().unbind();
-            }
-
-            super.updateItem(item, empty);
-
-            if (empty || item == null) {
-                setGraphic(null);
-            } else {
-                setGraphic(borderPane);
-                bar.visibleProperty().bind(Bindings.createBooleanBinding(() -> item.progressProperty().get() != -1, item.progressProperty()));
-                bar.progressProperty().bind(item.progressProperty());
-                state.textProperty().bind(Bindings.createObjectBinding(() -> {
-                    if (item.getState() == Task.TaskState.FAILED) {
-                        return item.getLastException().getLocalizedMessage();
-                    } else {
-                        return item.messageProperty().get();
-                    }
-                }, item.messageProperty(), item.stateProperty()));
-                title.setText(item.getName());
-            }
+        public void setThrowable(Throwable throwable) {
+            unbind();
+            state.setText(throwable.getLocalizedMessage());
+            bar.setProgress(0);
         }
     }
 }

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

@@ -73,7 +73,7 @@ public class DecoratorSkin extends SkinBase<Decorator> {
         Decorator skinnable = getSkinnable();
 
         BorderPane root = new BorderPane();
-        root.getStyleClass().setAll("jfx-decorator", "resize-border");
+        root.getStyleClass().addAll("jfx-decorator", "resize-border");
         root.setPrefHeight(519);
         root.setPrefWidth(800);
         root.setMaxHeight(Region.USE_PREF_SIZE);
@@ -83,7 +83,7 @@ public class DecoratorSkin extends SkinBase<Decorator> {
 
         StackPane drawerWrapper = new StackPane();
         skinnable.setDrawerWrapper(drawerWrapper);
-        drawerWrapper.getStyleClass().setAll("jfx-decorator-drawer");
+        drawerWrapper.getStyleClass().add("jfx-decorator-drawer");
         drawerWrapper.backgroundProperty().bind(skinnable.backgroundProperty());
         FXUtils.setOverflowHidden(drawerWrapper, true);
         {
@@ -92,10 +92,10 @@ public class DecoratorSkin extends SkinBase<Decorator> {
             {
                 BorderPane leftRootPane = new BorderPane();
                 FXUtils.setLimitWidth(leftRootPane, 200);
-                leftRootPane.getStyleClass().setAll("jfx-decorator-content-container");
+                leftRootPane.getStyleClass().add("jfx-decorator-content-container");
 
                 StackPane drawerContainer = new StackPane();
-                drawerContainer.getStyleClass().setAll("gray-background");
+                drawerContainer.getStyleClass().add("gray-background");
                 Bindings.bindContent(drawerContainer.getChildren(), skinnable.drawerProperty());
                 leftRootPane.setCenter(drawerContainer);
 
@@ -111,7 +111,7 @@ public class DecoratorSkin extends SkinBase<Decorator> {
 
             {
                 contentPlaceHolder = new StackPane();
-                contentPlaceHolder.getStyleClass().setAll("jfx-decorator-content-container");
+                contentPlaceHolder.getStyleClass().add("jfx-decorator-content-container");
                 contentPlaceHolder.backgroundProperty().bind(skinnable.contentBackgroundProperty());
                 FXUtils.setOverflowHidden(contentPlaceHolder, true);
                 Bindings.bindContent(contentPlaceHolder.getChildren(), skinnable.contentProperty());
@@ -189,14 +189,14 @@ public class DecoratorSkin extends SkinBase<Decorator> {
                 {
                     JFXButton backNavButton = new JFXButton();
                     backNavButton.setGraphic(SVG.back(Theme.foregroundFillBinding(), -1, -1));
-                    backNavButton.getStyleClass().setAll("jfx-decorator-button");
+                    backNavButton.getStyleClass().add("jfx-decorator-button");
                     backNavButton.ripplerFillProperty().bind(Theme.whiteFillBinding());
                     backNavButton.onActionProperty().bind(skinnable.onBackNavButtonActionProperty());
                     backNavButton.visibleProperty().bind(skinnable.canBackProperty());
 
                     closeNavButton = new JFXButton();
                     closeNavButton.setGraphic(SVG.close(Theme.foregroundFillBinding(), -1, -1));
-                    closeNavButton.getStyleClass().setAll("jfx-decorator-button");
+                    closeNavButton.getStyleClass().add("jfx-decorator-button");
                     closeNavButton.ripplerFillProperty().bind(Theme.whiteFillBinding());
                     closeNavButton.onActionProperty().bind(skinnable.onCloseNavButtonActionProperty());
 
@@ -219,7 +219,7 @@ public class DecoratorSkin extends SkinBase<Decorator> {
                 VBox navCenter = new VBox();
                 navCenter.setAlignment(Pos.CENTER_LEFT);
                 Label titleLabel = new Label();
-                titleLabel.getStyleClass().setAll("jfx-decorator-title");
+                titleLabel.getStyleClass().add("jfx-decorator-title");
                 titleLabel.textProperty().bind(skinnable.drawerTitleProperty());
                 navCenter.getChildren().setAll(titleLabel);
                 navBar.setCenter(navCenter);
@@ -228,7 +228,7 @@ public class DecoratorSkin extends SkinBase<Decorator> {
                 navRight.setAlignment(Pos.CENTER_RIGHT);
                 refreshNavButton = new JFXButton();
                 refreshNavButton.setGraphic(SVG.refresh(Theme.foregroundFillBinding(), -1, -1));
-                refreshNavButton.getStyleClass().setAll("jfx-decorator-button");
+                refreshNavButton.getStyleClass().add("jfx-decorator-button");
                 refreshNavButton.ripplerFillProperty().bind(Theme.whiteFillBinding());
                 refreshNavButton.onActionProperty().bind(skinnable.onRefreshNavButtonActionProperty());
                 refreshNavButton.visibleProperty().bind(skinnable.canRefreshProperty());
@@ -251,12 +251,12 @@ public class DecoratorSkin extends SkinBase<Decorator> {
                 StackPane pane = new StackPane(minus);
                 pane.setAlignment(Pos.CENTER);
                 btnMin.setGraphic(pane);
-                btnMin.getStyleClass().setAll("jfx-decorator-button");
+                btnMin.getStyleClass().add("jfx-decorator-button");
                 btnMin.setOnAction(e -> skinnable.minimize());
 
                 JFXButton btnClose = new JFXButton();
                 btnClose.setGraphic(SVG.close(Theme.foregroundFillBinding(), -1, -1));
-                btnClose.getStyleClass().setAll("jfx-decorator-button");
+                btnClose.getStyleClass().add("jfx-decorator-button");
                 btnClose.setOnAction(e -> skinnable.close());
 
                 buttonsContainer.getChildren().setAll(separator, btnMin, btnClose);

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

@@ -52,7 +52,7 @@ public class DecoratorWizardDisplayer extends StackPane implements TaskExecutorD
         wizardController.setProvider(provider);
         wizardController.onStart();
 
-        getStyleClass().setAll("white-background");
+        getStyleClass().add("white-background");
     }
 
     @Override

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

@@ -21,12 +21,18 @@ import javafx.scene.Node;
 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.game.Library;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.setting.Profile;
+import org.jackhuang.hmcl.task.DownloadException;
 import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.task.TaskResult;
+import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardProvider;
+import org.jackhuang.hmcl.util.StringUtils;
 
 import java.util.Map;
 
@@ -82,18 +88,18 @@ public final class InstallerWizardProvider implements WizardProvider {
     @Override
     public Object finish(Map<String, Object> settings) {
         settings.put("success_message", i18n("install.success"));
-        settings.put("failure_message", i18n("install.failed"));
+        settings.put("failure_callback", (FailureCallback) (settings1, exception, next) -> alertFailureMessage(exception, next));
 
-        Task ret = Task.ofResult("version", () -> version);
+        TaskResult<Version> ret = Task.ofResult(() -> version);
 
         if (settings.containsKey("forge"))
-            ret = ret.then(profile.getDependency().installLibraryAsync((RemoteVersion) settings.get("forge")));
+            ret = ret.thenCompose(profile.getDependency().installLibraryAsync((RemoteVersion) settings.get("forge")));
 
         if (settings.containsKey("liteloader"))
-            ret = ret.then(profile.getDependency().installLibraryAsync((RemoteVersion) settings.get("liteloader")));
+            ret = ret.thenCompose(profile.getDependency().installLibraryAsync((RemoteVersion) settings.get("liteloader")));
 
         if (settings.containsKey("optifine"))
-            ret = ret.then(profile.getDependency().installLibraryAsync((RemoteVersion) settings.get("optifine")));
+            ret = ret.thenCompose(profile.getDependency().installLibraryAsync((RemoteVersion) settings.get("optifine")));
 
         return ret.then(profile.getRepository().refreshVersionsAsync());
     }
@@ -114,4 +120,13 @@ public final class InstallerWizardProvider implements WizardProvider {
         return true;
     }
 
+    public static void alertFailureMessage(Exception exception, Runnable next) {
+        if (exception instanceof LibraryDownloadException) {
+            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 {
+            Controllers.dialog(StringUtils.getStackTrace(exception), i18n("install.failed"), MessageType.ERROR, next);
+        }
+    }
 }

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

@@ -24,14 +24,12 @@ import org.jackhuang.hmcl.mod.MismatchedModpackTypeException;
 import org.jackhuang.hmcl.mod.Modpack;
 import org.jackhuang.hmcl.mod.UnsupportedModpackException;
 import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.task.DownloadException;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.Controllers;
-import org.jackhuang.hmcl.ui.construct.MessageBox;
+import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardProvider;
-import org.jackhuang.hmcl.util.StringUtils;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -86,11 +84,11 @@ public class ModpackInstallWizardProvider implements WizardProvider {
             try {
                 return ModpackHelper.getUpdateTask(profile, selected, modpack.getEncoding(), name, ModpackHelper.readModpackConfiguration(profile.getRepository().getModpackConfiguration(name)));
             } catch (UnsupportedModpackException e) {
-                Controllers.dialog(i18n("modpack.unsupported"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
+                Controllers.dialog(i18n("modpack.unsupported"), i18n("message.error"), MessageType.ERROR);
             } catch (MismatchedModpackTypeException e) {
-                Controllers.dialog(i18n("modpack.mismatched_type"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
+                Controllers.dialog(i18n("modpack.mismatched_type"), i18n("message.error"), MessageType.ERROR);
             } catch (IOException e) {
-                Controllers.dialog(i18n("modpack.invalid"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
+                Controllers.dialog(i18n("modpack.invalid"), i18n("message.error"), MessageType.ERROR);
             }
             return null;
         } else {
@@ -107,14 +105,12 @@ public class ModpackInstallWizardProvider implements WizardProvider {
             public void onFail(Map<String, Object> settings, Exception exception, Runnable next) {
                 if (exception instanceof CurseCompletionException) {
                     if (exception.getCause() instanceof FileNotFoundException) {
-                        Controllers.dialog(i18n("modpack.type.curse.not_found"), i18n("install.failed"), MessageBox.ERROR_MESSAGE, next);
+                        Controllers.dialog(i18n("modpack.type.curse.not_found"), i18n("install.failed"), MessageType.ERROR, next);
                     } else {
-                        Controllers.dialog(i18n("modpack.type.curse.tolerable_error"), i18n("install.success"), MessageBox.INFORMATION_MESSAGE, next);
+                        Controllers.dialog(i18n("modpack.type.curse.tolerable_error"), i18n("install.success"), MessageType.INFORMATION, next);
                     }
-                } else if (exception instanceof DownloadException) {
-                    Controllers.dialog(StringUtils.getStackTrace(exception), i18n("install.failed.downloading"), MessageBox.ERROR_MESSAGE, next);
                 } else {
-                    Controllers.dialog(StringUtils.getStackTrace(exception), i18n("install.failed"), MessageBox.ERROR_MESSAGE, next);
+                    InstallerWizardProvider.alertFailureMessage(exception, next);
                 }
             }
         });

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

@@ -33,7 +33,7 @@ import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.WebStage;
-import org.jackhuang.hmcl.ui.construct.MessageBox;
+import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
 import org.jackhuang.hmcl.ui.construct.SpinnerPane;
 import org.jackhuang.hmcl.ui.construct.Validator;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
@@ -110,8 +110,8 @@ public final class ModpackPage extends StackPane implements WizardPage {
 
         spinnerPane.showSpinner();
         Task.ofResult(() -> CompressingUtils.findSuitableEncoding(selectedFile.toPath()))
-                .thenResult(encoding -> manifest = ModpackHelper.readModpackManifest(selectedFile.toPath(), encoding))
-                .finalizedResult(Schedulers.javafx(), manifest -> {
+                .thenApply(encoding -> manifest = ModpackHelper.readModpackManifest(selectedFile.toPath(), encoding))
+                .whenComplete(Schedulers.javafx(), manifest -> {
                     spinnerPane.hideSpinner();
                     controller.getSettings().put(MODPACK_MANIFEST, manifest);
                     lblName.setText(manifest.getName());
@@ -129,7 +129,7 @@ public final class ModpackPage extends StackPane implements WizardPage {
                         txtModpackName.textProperty().addListener(e -> btnInstall.setDisable(!txtModpackName.validate()));
                     }
                 }, e -> {
-                    Controllers.dialog(i18n("modpack.task.install.error"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
+                    Controllers.dialog(i18n("modpack.task.install.error"), i18n("message.error"), MessageType.ERROR);
                     Platform.runLater(controller::onEnd);
                 }).start();
     }

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

@@ -22,14 +22,10 @@ import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.download.GameBuilder;
 import org.jackhuang.hmcl.download.RemoteVersion;
 import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.task.DownloadException;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.ui.Controllers;
-import org.jackhuang.hmcl.ui.construct.MessageBox;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardProvider;
-import org.jackhuang.hmcl.util.StringUtils;
 
 import java.util.Map;
 
@@ -63,23 +59,14 @@ public final class VanillaInstallWizardProvider implements WizardProvider {
         if (settings.containsKey("optifine"))
             builder.version((RemoteVersion) settings.get("optifine"));
 
-        return builder.buildAsync().finalized((a, b) -> profile.getRepository().refreshVersions())
+        return builder.buildAsync().whenComplete((a, b) -> profile.getRepository().refreshVersions())
                 .then(Task.of(Schedulers.javafx(), () -> profile.setSelectedVersion(name)));
     }
 
     @Override
     public Object finish(Map<String, Object> settings) {
         settings.put("success_message", i18n("install.success"));
-        settings.put("failure_callback", new FailureCallback() {
-            @Override
-            public void onFail(Map<String, Object> settings, Exception exception, Runnable next) {
-                if (exception instanceof DownloadException) {
-                    Controllers.dialog(StringUtils.getStackTrace(exception), i18n("install.failed.downloading"), MessageBox.ERROR_MESSAGE, next);
-                } else {
-                    Controllers.dialog(StringUtils.getStackTrace(exception), i18n("install.failed"), MessageBox.ERROR_MESSAGE, next);
-                }
-            }
-        });
+        settings.put("failure_callback", (FailureCallback) (settings1, exception, next) -> InstallerWizardProvider.alertFailureMessage(exception, next));
 
         return finishVersionDownloadingAsync(settings);
     }

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

@@ -25,6 +25,7 @@ import com.jfoenix.controls.JFXSpinner;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.fxml.FXML;
+import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
@@ -43,7 +44,7 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
-public final class VersionsPage extends StackPane implements WizardPage, Refreshable {
+public final class VersionsPage extends BorderPane implements WizardPage, Refreshable {
     private final String gameVersion;
     private final DownloadProvider downloadProvider;
     private final String libraryId;
@@ -59,6 +60,8 @@ public final class VersionsPage extends StackPane implements WizardPage, Refresh
     @FXML
     private StackPane emptyPane;
     @FXML
+    private StackPane root;
+    @FXML
     private JFXCheckBox chkRelease;
     @FXML
     private JFXCheckBox chkSnapshot;
@@ -69,7 +72,7 @@ public final class VersionsPage extends StackPane implements WizardPage, Refresh
     @FXML
     private VBox centrePane;
 
-    private final TransitionHandler transitionHandler = new TransitionHandler(this);
+    private final TransitionHandler transitionHandler;
     private final VersionList<?> versionList;
     private TaskExecutor executor;
 
@@ -83,6 +86,8 @@ public final class VersionsPage extends StackPane implements WizardPage, Refresh
 
         FXUtils.loadFXML(this, "/assets/fxml/download/versions.fxml");
 
+        transitionHandler = new TransitionHandler(root);
+
         if (versionList.hasType()) {
             centrePane.getChildren().setAll(checkPane, list);
         } else
@@ -122,9 +127,9 @@ public final class VersionsPage extends StackPane implements WizardPage, Refresh
 
     @Override
     public void refresh() {
-        getChildren().setAll(spinner);
-        executor = versionList.refreshAsync(downloadProvider).finalized((variables, isDependentsSucceeded) -> {
-            if (isDependentsSucceeded) {
+        transitionHandler.setContent(spinner, ContainerAnimations.FADE.getAnimationProducer());
+        executor = versionList.refreshAsync(gameVersion, downloadProvider).whenComplete((isDependentSucceeded, exception) -> {
+            if (isDependentSucceeded) {
                 List<VersionsPageItem> items = loadVersions();
 
                 Platform.runLater(() -> {
@@ -142,7 +147,7 @@ public final class VersionsPage extends StackPane implements WizardPage, Refresh
                     }
                 });
             } else {
-                LOG.log(Level.WARNING, "Failed to fetch versions list", (Throwable) variables.get("lastException"));
+                LOG.log(Level.WARNING, "Failed to fetch versions list", exception);
                 Platform.runLater(() -> {
                     transitionHandler.setContent(failedPane, ContainerAnimations.FADE.getAnimationProducer());
                 });
@@ -169,4 +174,9 @@ public final class VersionsPage extends StackPane implements WizardPage, Refresh
 
     @FXML
     private void onBack() { controller.onPrev(true); }
+
+    @FXML
+    private void onSponsor() {
+        FXUtils.openLink("https://hmcl.huangyuhui.net/api/redirect/bmclapi_sponsor");
+    }
 }

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

@@ -72,7 +72,7 @@ public class ProfileListItemSkin extends SkinBase<ProfileListItem> {
         right.getChildren().add(btnRemove);
         root.setRight(right);
 
-        root.setStyle("-fx-background-color: white; -fx-padding: 8 8 8 0;");
+        root.setStyle("-fx-background-color: white; -fx-padding: 8 8 8 12;");
         JFXDepthManager.setDepth(root, 1);
         item.titleProperty().bind(skinnable.titleProperty());
         item.subtitleProperty().bind(skinnable.subtitleProperty());

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

@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hmcl.ui.versions;
 
+import javafx.application.Platform;
 import javafx.beans.property.*;
 import javafx.scene.control.Control;
 import javafx.scene.control.Skin;
@@ -25,11 +26,20 @@ import org.jackhuang.hmcl.download.LibraryAnalyzer;
 import org.jackhuang.hmcl.game.GameVersion;
 import org.jackhuang.hmcl.setting.Profile;
 
+import static org.jackhuang.hmcl.util.Lang.handleUncaught;
+import static org.jackhuang.hmcl.util.Lang.threadPool;
 import static org.jackhuang.hmcl.util.StringUtils.removePrefix;
 import static org.jackhuang.hmcl.util.StringUtils.removeSuffix;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
 public class GameItem extends Control {
+
+    private static final ThreadPoolExecutor POOL_VERSION_RESOLVE = threadPool("VersionResolve", true, 1, 1, TimeUnit.SECONDS);
+
     private final Profile profile;
     private final String version;
     private final StringProperty title = new SimpleStringProperty();
@@ -40,16 +50,19 @@ public class GameItem extends Control {
         this.profile = profile;
         this.version = id;
 
-        String game = GameVersion.minecraftVersion(profile.getRepository().getVersionJar(id)).orElse("Unknown");
-
-        StringBuilder libraries = new StringBuilder(game);
-        LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(profile.getRepository().getVersion(id));
-        analyzer.getForge().ifPresent(library -> libraries.append(", ").append(i18n("install.installer.forge")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)forge", ""))));
-        analyzer.getLiteLoader().ifPresent(library -> libraries.append(", ").append(i18n("install.installer.liteloader")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)liteloader", ""))));
-        analyzer.getOptiFine().ifPresent(library -> libraries.append(", ").append(i18n("install.installer.optifine")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)optifine", ""))));
+        // GameVersion.minecraftVersion() is a time-costing job (up to ~200 ms)
+        CompletableFuture.supplyAsync(() -> GameVersion.minecraftVersion(profile.getRepository().getVersionJar(id)).orElse("Unknown"), POOL_VERSION_RESOLVE)
+                .thenAcceptAsync(game -> {
+                    StringBuilder libraries = new StringBuilder(game);
+                    LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(profile.getRepository().getVersion(id));
+                    analyzer.getForge().ifPresent(library -> libraries.append(", ").append(i18n("install.installer.forge")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)forge", ""))));
+                    analyzer.getLiteLoader().ifPresent(library -> libraries.append(", ").append(i18n("install.installer.liteloader")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)liteloader", ""))));
+                    analyzer.getOptiFine().ifPresent(library -> libraries.append(", ").append(i18n("install.installer.optifine")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)optifine", ""))));
+                    subtitle.set(libraries.toString());
+                }, Platform::runLater)
+                .exceptionally(handleUncaught);
 
         title.set(id);
-        subtitle.set(libraries.toString());
         image.set(profile.getRepository().getVersionIconImage(version));
     }
 

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

@@ -17,7 +17,7 @@
  */
 package org.jackhuang.hmcl.ui.versions;
 
-import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.utils.JFXUtilities;
 import javafx.application.Platform;
 import javafx.beans.property.*;
 import javafx.collections.FXCollections;

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

@@ -17,7 +17,7 @@
  */
 package org.jackhuang.hmcl.ui.versions;
 
-import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.utils.JFXUtilities;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXPopup;
 import com.jfoenix.controls.JFXRadioButton;
@@ -87,7 +87,7 @@ public class GameListItemSkin extends SkinBase<GameListItem> {
         right.getChildren().add(btnManage);
         root.setRight(right);
 
-        root.setStyle("-fx-background-color: white; -fx-padding: 8 8 8 0;");
+        root.setStyle("-fx-background-color: white; -fx-padding: 8 8 8 12;");
         JFXDepthManager.setDepth(root, 1);
 
         getChildren().setAll(root);

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

@@ -19,7 +19,6 @@ package org.jackhuang.hmcl.ui.versions;
 
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXScrollPane;
-import com.jfoenix.controls.JFXSpinner;
 import com.jfoenix.effects.JFXDepthManager;
 import javafx.beans.binding.Bindings;
 import javafx.geometry.Insets;
@@ -31,8 +30,8 @@ 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.FXUtils;
 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> {
@@ -51,7 +50,7 @@ public class GameListSkin extends SkinBase<GameList> {
 
         {
             HBox toolbar = new HBox();
-            toolbar.getStyleClass().setAll("jfx-tool-bar-second");
+            toolbar.getStyleClass().add("jfx-tool-bar-second");
             JFXDepthManager.setDepth(toolbar, 1);
             toolbar.setPickOnBounds(false);
 
@@ -91,10 +90,9 @@ public class GameListSkin extends SkinBase<GameList> {
         }
 
         {
-            StackPane center = new StackPane();
-
-            JFXSpinner spinner = new JFXSpinner();
-            spinner.getStyleClass().setAll("first-spinner");
+            SpinnerPane center = new SpinnerPane();
+            center.loadingProperty().bind(skinnable.loadingProperty());
+            center.getStyleClass().add("large-spinner-pane");
 
             ScrollPane scrollPane = new ScrollPane();
             scrollPane.setFitToWidth(true);
@@ -109,9 +107,7 @@ public class GameListSkin extends SkinBase<GameList> {
             scrollPane.setContent(gameList);
             JFXScrollPane.smoothScrolling(scrollPane);
 
-            FXUtils.onChangeAndOperate(skinnable.loadingProperty(),
-                    loading -> center.getChildren().setAll(loading ? spinner : scrollPane));
-
+            center.setContent(scrollPane);
             root.setCenter(center);
         }
 

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

@@ -54,7 +54,7 @@ public class InstallerListPage extends ListPage<InstallerItem> {
             LinkedList<Library> newList = new LinkedList<>(version.getLibraries());
             newList.remove(library);
             new MaintainTask(version.setLibraries(newList))
-                    .then(variables -> new VersionJsonSaveTask(profile.getRepository(), variables.get(MaintainTask.ID)))
+                    .then(maintainedVersion -> new VersionJsonSaveTask(profile.getRepository(), maintainedVersion))
                     .with(profile.getRepository().refreshVersionsAsync())
                     .with(Task.of(Schedulers.javafx(), () -> loadVersion(this.profile, this.versionId)))
                     .start();

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

@@ -1,73 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> 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.concurrency.JFXUtilities;
-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.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.TwoLineListItem;
-import org.jackhuang.hmcl.util.StringUtils;
-
-import java.util.function.Consumer;
-
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
-public final class ModItem extends BorderPane {
-
-    public ModItem(ModInfo info, Consumer<ModItem> 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();
-        JFXUtilities.runInFX(() -> {
-            FXUtils.installFastTooltip(btnRemove, i18n("mods.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.getFileName());
-        StringBuilder message = new StringBuilder(info.getName());
-        if (StringUtils.isNotBlank(info.getVersion()))
-            message.append(", ").append(i18n("archive.version")).append(": ").append(info.getVersion());
-        if (StringUtils.isNotBlank(info.getGameVersion()))
-            message.append(", ").append(i18n("archive.game_version")).append(": ").append(info.getGameVersion());
-        if (StringUtils.isNotBlank(info.getAuthors()))
-            message.append(", ").append(i18n("archive.author")).append(": ").append(info.getAuthors());
-        modItem.setSubtitle(message.toString());
-        chkEnabled.setSelected(info.isActive());
-        chkEnabled.selectedProperty().addListener((a, b, newValue) ->
-                info.activeProperty().set(newValue));
-    }
-}

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

@@ -17,8 +17,17 @@
  */
 package org.jackhuang.hmcl.ui.versions;
 
-import com.jfoenix.concurrency.JFXUtilities;
+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.mod.ModInfo;
 import org.jackhuang.hmcl.mod.ModManager;
@@ -27,7 +36,6 @@ 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.util.Logging;
 import org.jackhuang.hmcl.util.io.FileUtils;
 
@@ -37,16 +45,18 @@ import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.logging.Level;
+import java.util.stream.Collectors;
 
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
-public final class ModListPage extends ListPage<ModItem> {
+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);
 
     private JFXTabPane parentTab;
     private ModManager modManager;
 
     public ModListPage() {
-        setRefreshable(true);
 
         FXUtils.applyDragListener(this, it -> Arrays.asList("jar", "zip", "litemod").contains(FileUtils.getExtension(it)), mods -> {
             mods.forEach(it -> {
@@ -61,6 +71,10 @@ public final class ModListPage extends ListPage<ModItem> {
     }
 
     @Override
+    protected Skin<?> createDefaultSkin() {
+        return new ModListPageSkin(this);
+    }
+
     public void refresh() {
         loadMods(modManager);
     }
@@ -71,50 +85,22 @@ public final class ModListPage extends ListPage<ModItem> {
 
     public void loadMods(ModManager modManager) {
         this.modManager = modManager;
-        Task.of(variables -> {
+        Task.ofResult(() -> {
             synchronized (ModListPage.this) {
                 JFXUtilities.runInFX(() -> loadingProperty().set(true));
-
                 modManager.refreshMods();
-
-                // Surprisingly, if there are a great number of mods, this processing will cause a long UI pause,
-                // constructing UI elements.
-                // We must do this asynchronously.
-                LinkedList<ModItem> list = new LinkedList<>();
-                for (ModInfo modInfo : modManager.getMods()) {
-                    ModItem item = new ModItem(modInfo, i -> {
-                        try {
-                            modManager.removeMods(modInfo);
-                        } catch (IOException ignore) {
-                            // Fail to remove mods if the game is running or the mod is absent.
-                        }
-                        loadMods(modManager);
-                    });
-                    modInfo.activeProperty().addListener((a, b, newValue) -> {
-                        if (newValue)
-                            item.getStyleClass().remove("disabled");
-                        else
-                            item.getStyleClass().add("disabled");
-                    });
-                    if (!modInfo.isActive())
-                        item.getStyleClass().add("disabled");
-
-                    list.add(item);
-                }
-
-                variables.set("list", list);
+                return new LinkedList<>(modManager.getMods());
             }
-        }).finalized(Schedulers.javafx(), (variables, isDependentsSucceeded) -> {
+        }).whenComplete(Schedulers.javafx(), (list, isDependentSucceeded, exception) -> {
             loadingProperty().set(false);
-            if (isDependentsSucceeded)
+            if (isDependentSucceeded)
                 FXUtils.onWeakChangeAndOperate(parentTab.getSelectionModel().selectedItemProperty(), newValue -> {
                     if (newValue != null && newValue.getUserData() == ModListPage.this)
-                        itemsProperty().setAll(variables.<List<ModItem>>get("list"));
+                        itemsProperty().setAll(list.stream().map(ModListPageSkin.ModInfoObject::new).collect(Collectors.toList()));
                 });
         }).start();
     }
 
-    @Override
     public void add() {
         FileChooser chooser = new FileChooser();
         chooser.setTitle(i18n("mods.choose_mod"));
@@ -125,7 +111,7 @@ public final class ModListPage extends ListPage<ModItem> {
         List<String> succeeded = new LinkedList<>();
         List<String> failed = new LinkedList<>();
         if (res == null) return;
-        Task.of(variables -> {
+        Task.of(() -> {
             for (File file : res) {
                 try {
                     modManager.addMod(file);
@@ -137,7 +123,7 @@ public final class ModListPage extends ListPage<ModItem> {
                     // Actually addMod will not throw exceptions because FileChooser has already filtered files.
                 }
             }
-        }).with(Task.of(Schedulers.javafx(), variables -> {
+        }).with(Task.of(Schedulers.javafx(), () -> {
             List<String> prompt = new LinkedList<>();
             if (!succeeded.isEmpty())
                 prompt.add(i18n("mods.add.success", String.join(", ", succeeded)));
@@ -151,4 +137,54 @@ public final class ModListPage extends ListPage<ModItem> {
     public void setParentTab(JFXTabPane parentTab) {
         this.parentTab = parentTab;
     }
+
+    public void removeSelectedMods(ObservableList<TreeItem<ModListPageSkin.ModInfoObject>> selectedItems) {
+        try {
+            modManager.removeMods(selectedItems.stream()
+                    .map(TreeItem::getValue)
+                    .map(ModListPageSkin.ModInfoObject::getModInfo)
+                    .toArray(ModInfo[]::new));
+            loadMods(modManager);
+        } catch (IOException ignore) {
+            // Fail to remove mods if the game is running or the mod is absent.
+        }
+    }
+
+    public void enableSelectedMods(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) {
+        selectedItems.stream()
+                .map(TreeItem::getValue)
+                .map(ModListPageSkin.ModInfoObject::getModInfo)
+                .forEach(info -> info.setActive(false));
+    }
+
+    public ObservableList<ModListPageSkin.ModInfoObject> getItems() {
+        return items.get();
+    }
+
+    public void setItems(ObservableList<ModListPageSkin.ModInfoObject> items) {
+        this.items.set(items);
+    }
+
+    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;
+    }
 }

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

@@ -0,0 +1,187 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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.*;
+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.geometry.Insets;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+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.SVG;
+import org.jackhuang.hmcl.ui.construct.JFXCheckBoxTreeTableCell;
+import org.jackhuang.hmcl.ui.construct.SpinnerPane;
+
+import java.util.function.Function;
+
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+public 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) {
+        super(skinnable);
+
+        BorderPane root = new BorderPane();
+        JFXTreeTableView<ModInfoObject> tableView = new JFXTreeTableView<>();
+
+        {
+            HBox toolbar = new HBox();
+            toolbar.getStyleClass().add("jfx-tool-bar-second");
+            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);
+
+            root.setTop(toolbar);
+        }
+
+        {
+            SpinnerPane center = new SpinnerPane();
+            center.getStyleClass().add("large-spinner-pane");
+            center.loadingProperty().bind(skinnable.loadingProperty());
+
+            tableView.setShowRoot(false);
+            tableView.setEditable(true);
+            tableView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
+            tableView.setRoot(new RecursiveTreeItem<>(skinnable.getItems(), RecursiveTreeObject::getChildren));
+
+            JFXTreeTableColumn<ModInfoObject, Boolean> activeColumn = new JFXTreeTableColumn<>();
+            setupCellValueFactory(activeColumn, ModInfoObject::activeProperty);
+            activeColumn.setCellFactory(c -> new JFXCheckBoxTreeTableCell<>());
+            activeColumn.setEditable(true);
+            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, 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.setColumnResizePolicy(JFXTreeTableView.CONSTRAINED_RESIZE_POLICY);
+            center.setContent(tableView);
+            root.setCenter(center);
+        }
+
+        getChildren().setAll(root);
+    }
+
+    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);
+            }
+        });
+    }
+
+    public static class ModInfoObject extends RecursiveTreeObject<ModInfoObject> {
+        private final BooleanProperty active;
+        private final StringProperty fileName;
+        private final StringProperty version;
+        private final ModInfo modInfo;
+
+        public ModInfoObject(ModInfo modInfo) {
+            this.modInfo = modInfo;
+            this.active = modInfo.activeProperty();
+            this.fileName = new SimpleStringProperty(modInfo.getFileName());
+            this.version = new SimpleStringProperty(modInfo.getVersion());
+        }
+
+        public BooleanProperty activeProperty() {
+            return active;
+        }
+
+        public StringProperty fileNameProperty() {
+            return fileName;
+        }
+
+        public StringProperty versionProperty() {
+            return version;
+        }
+
+        public ModInfo getModInfo() {
+            return modInfo;
+        }
+    }
+}

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

@@ -57,7 +57,7 @@ import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
-import java.util.List;
+import java.util.Optional;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
@@ -71,7 +71,6 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
     private Profile profile;
     private String versionId;
     private boolean javaItemsLoaded;
-    private InvalidationListener specificSettingsListener;
 
     @FXML private VBox rootPane;
     @FXML private ScrollPane scroll;
@@ -100,6 +99,12 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
     @FXML private JFXCheckBox chkEnableSpecificSettings;
     @FXML private BorderPane settingsTypePane;
 
+    private InvalidationListener specificSettingsListener = any -> {
+        chkEnableSpecificSettings.setSelected(!lastVersionSetting.isUsesGlobal());
+    };
+
+    private InvalidationListener javaListener = any -> initJavaSubtitle();
+
     public VersionSettingsPage() {
         FXUtils.loadFXML(this, "/assets/fxml/version/version-settings.fxml");
 
@@ -113,15 +118,14 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
 
         FXUtils.smoothScrolling(scroll);
 
-        Task.of(variables -> variables.set("list", JavaVersion.getJavas()))
-                .subscribe(Schedulers.javafx(), variables -> {
-                    javaItem.loadChildren(
-                            (variables.<List<JavaVersion>>get("list")).stream()
-                                    .map(javaVersion -> javaItem.createChildren(javaVersion.getVersion() + i18n("settings.game.java_directory.bit", javaVersion.getPlatform().getBit()), javaVersion.getBinary().toString(), javaVersion))
-                                    .collect(Collectors.toList()));
-                    javaItemsLoaded = true;
-                    initializeSelectedJava();
-                });
+        Task.ofResult(JavaVersion::getJavas).thenAccept(Schedulers.javafx(), list -> {
+            javaItem.loadChildren(list.stream()
+                    .map(javaVersion -> javaItem.createChildren(javaVersion.getVersion() + i18n("settings.game.java_directory.bit",
+                            javaVersion.getPlatform().getBit()), javaVersion.getBinary().toString(), javaVersion))
+                    .collect(Collectors.toList()));
+            javaItemsLoaded = true;
+            initializeSelectedJava();
+        }).start();
 
         javaItem.setSelectedData(null);
         javaItem.setFallbackData(JavaVersion.fromCurrentEnvironment());
@@ -148,10 +152,6 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
             Platform.runLater(() -> loadVersion(profile, versionId));
         });
 
-        specificSettingsListener = o -> {
-            chkEnableSpecificSettings.setSelected(!lastVersionSetting.isUsesGlobal());
-        };
-
         componentList.disableProperty().bind(chkEnableSpecificSettings.selectedProperty().not());
         advancedSettingsPane.disableProperty().bind(chkEnableSpecificSettings.selectedProperty().not());
     }
@@ -193,6 +193,8 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
             FXUtils.unbindEnum(cboLauncherVisibility);
 
             lastVersionSetting.usesGlobalProperty().removeListener(specificSettingsListener);
+            lastVersionSetting.javaDirProperty().removeListener(javaListener);
+            lastVersionSetting.javaProperty().removeListener(javaListener);
 
             gameDirItem.selectedDataProperty().unbindBidirectional(lastVersionSetting.gameDirTypeProperty());
             gameDirItem.subtitleProperty().unbind();
@@ -232,9 +234,8 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
             }
         });
 
-        versionSetting.javaDirProperty().setChangedListener(it -> initJavaSubtitle(versionSetting));
-        versionSetting.javaProperty().setChangedListener(it -> initJavaSubtitle(versionSetting));
-        initJavaSubtitle(versionSetting);
+        versionSetting.javaDirProperty().addListener(javaListener);
+        versionSetting.javaProperty().addListener(javaListener);
 
         gameDirItem.selectedDataProperty().bindBidirectional(versionSetting.gameDirTypeProperty());
         gameDirItem.subtitleProperty().bind(Bindings.createStringBinding(() -> Paths.get(profile.getRepository().getRunDirectory(versionId).getAbsolutePath()).normalize().toString(),
@@ -243,6 +244,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
         lastVersionSetting = versionSetting;
 
         initializeSelectedJava();
+        initJavaSubtitle();
 
         loadIcon();
     }
@@ -267,11 +269,14 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
         }
     }
 
-    private void initJavaSubtitle(VersionSetting versionSetting) {
-        Task.of(variables -> variables.set("java", versionSetting.getJavaVersion()))
-                .subscribe(Task.of(Schedulers.javafx(),
-                        variables -> javaItem.setSubtitle(variables.<JavaVersion>getOptional("java")
-                                .map(JavaVersion::getBinary).map(Path::toString).orElse("Invalid Java Directory"))));
+    private void initJavaSubtitle() {
+        VersionSetting versionSetting = lastVersionSetting;
+        if (versionSetting == null)
+            return;
+        Task.ofResult(versionSetting::getJavaVersion)
+                .thenAccept(Schedulers.javafx(), javaVersion -> javaItem.setSubtitle(Optional.ofNullable(javaVersion)
+                        .map(JavaVersion::getBinary).map(Path::toString).orElse("Invalid Java Path")))
+                .start();
     }
 
     @FXML

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

@@ -81,8 +81,7 @@ public class Versions {
 
     public static void updateGameAssets(Profile profile, String version) {
         Version resolvedVersion = profile.getRepository().getResolvedVersion(version);
-        TaskExecutor executor = new GameAssetIndexDownloadTask(profile.getDependency(), resolvedVersion)
-                .then(new GameAssetDownloadTask(profile.getDependency(), resolvedVersion))
+        TaskExecutor executor = new GameAssetDownloadTask(profile.getDependency(), resolvedVersion, GameAssetDownloadTask.DOWNLOAD_INDEX_FORCIBLY)
                 .executor();
         Controllers.taskDialog(executor, i18n("version.manage.redownload_assets_index"));
         executor.start();

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

@@ -29,7 +29,6 @@ import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.io.FileUtils;
 
 import java.io.File;
-import java.io.IOException;
 import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.Path;
 import java.util.List;
@@ -52,9 +51,9 @@ public class WorldListPage extends ListPage<WorldListItem> {
 
         setLoading(true);
         Task.ofResult(() -> World.getWorlds(savesDir).parallel().collect(Collectors.toList()))
-                .finalizedResult(Schedulers.javafx(), (result, isDependentsSucceeded) -> {
+                .whenComplete(Schedulers.javafx(), (result, isDependentSucceeded, exception) -> {
                     setLoading(false);
-                    if (isDependentsSucceeded)
+                    if (isDependentSucceeded)
                         itemsProperty().setAll(result.stream().map(WorldListItem::new).collect(Collectors.toList()));
                 }).start();
     }
@@ -74,10 +73,10 @@ public class WorldListPage extends ListPage<WorldListItem> {
         // Only accept one world file because user is required to confirm the new world name
         // Or too many input dialogs are popped.
         Task.ofResult(() -> new World(zipFile.toPath()))
-                .finalizedResult(Schedulers.javafx(), world -> {
+                .whenComplete(Schedulers.javafx(), world -> {
                     Controllers.inputDialog(i18n("world.name.enter"), (name, resolve, reject) -> {
                         Task.of(() -> world.install(savesDir, name))
-                                .finalized(Schedulers.javafx(), var -> {
+                                .whenComplete(Schedulers.javafx(), () -> {
                                     itemsProperty().add(new WorldListItem(new World(savesDir.resolve(name))));
                                     resolve.run();
                                 }, e -> {

HMCL/src/main/java/org/jackhuang/hmcl/ui/wizard/TaskExecutorDialogWizardDisplayer.java

@@ -17,14 +17,14 @@
  */
 package org.jackhuang.hmcl.ui.wizard;
 
-import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.utils.JFXUtilities;
 import javafx.beans.property.StringProperty;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.task.TaskListener;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
-import org.jackhuang.hmcl.ui.construct.MessageBox;
+import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
 import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane;
 import org.jackhuang.hmcl.util.StringUtils;
 
@@ -67,9 +67,9 @@ public interface TaskExecutorDialogWizardDisplayer extends AbstractWizardDisplay
                         pane.fireEvent(new DialogCloseEvent());
                         if (success) {
                             if (settings.containsKey("success_message") && settings.get("success_message") instanceof String)
-                                Controllers.dialog((String) settings.get("success_message"), null, MessageBox.FINE_MESSAGE, () -> onEnd());
+                                Controllers.dialog((String) settings.get("success_message"), null, MessageType.FINE, () -> onEnd());
                             else if (!settings.containsKey("forbid_success_message"))
-                                Controllers.dialog(i18n("message.success"), null, MessageBox.FINE_MESSAGE, () -> onEnd());
+                                Controllers.dialog(i18n("message.success"), null, MessageType.FINE, () -> onEnd());
                         } else {
                             if (executor.getLastException() == null)
                                 return;
@@ -77,9 +77,9 @@ public interface TaskExecutorDialogWizardDisplayer extends AbstractWizardDisplay
                             if (settings.get("failure_callback") instanceof WizardProvider.FailureCallback)
                                 ((WizardProvider.FailureCallback)settings.get("failure_callback")).onFail(settings, executor.getLastException(), () -> onEnd());
                             else if (settings.get("failure_message") instanceof String)
-                                Controllers.dialog(appendix, (String) settings.get("failure_message"), MessageBox.ERROR_MESSAGE, () -> onEnd());
+                                Controllers.dialog(appendix, (String) settings.get("failure_message"), MessageType.ERROR, () -> onEnd());
                             else if (!settings.containsKey("forbid_failure_message"))
-                                Controllers.dialog(appendix, i18n("wizard.failed"), MessageBox.ERROR_MESSAGE, () -> onEnd());
+                                Controllers.dialog(appendix, i18n("wizard.failed"), MessageType.ERROR, () -> onEnd());
                         }
 
                     });

HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateHandler.java

@@ -26,7 +26,7 @@ import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.ui.Controllers;
-import org.jackhuang.hmcl.ui.construct.MessageBox;
+import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.io.JarUtils;
@@ -102,7 +102,7 @@ public final class UpdateHandler {
         Task task = new HMCLDownloadTask(version, downloaded);
 
         TaskExecutor executor = task.executor();
-        Region dialog = Controllers.taskDialog(executor, i18n("message.downloading"));
+        Controllers.taskDialog(executor, i18n("message.downloading"));
         thread(() -> {
             boolean success = executor.test();
 
@@ -116,14 +116,14 @@ public final class UpdateHandler {
                     System.exit(0);
                 } catch (IOException e) {
                     LOG.log(Level.WARNING, "Failed to update to " + version, e);
-                    Platform.runLater(() -> Controllers.dialog(StringUtils.getStackTrace(e), i18n("update.failed"), MessageBox.ERROR_MESSAGE));
+                    Platform.runLater(() -> Controllers.dialog(StringUtils.getStackTrace(e), i18n("update.failed"), MessageType.ERROR));
                     return;
                 }
 
             } else {
-                Throwable e = task.getLastException();
+                Throwable e = executor.getLastException();
                 LOG.log(Level.WARNING, "Failed to update to " + version, e);
-                Platform.runLater(() -> Controllers.dialog(e.toString(), i18n("update.failed"), MessageBox.ERROR_MESSAGE));
+                Platform.runLater(() -> Controllers.dialog(e.toString(), i18n("update.failed"), MessageType.ERROR));
             }
         });
     }

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

@@ -18,9 +18,11 @@
 package org.jackhuang.hmcl.util;
 
 import javafx.application.Platform;
+import javafx.scene.control.Alert;
+import javafx.scene.control.Alert.AlertType;
+
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.ui.CrashWindow;
-import org.jackhuang.hmcl.ui.construct.MessageBox;
 import org.jackhuang.hmcl.upgrade.IntegrityChecker;
 import org.jackhuang.hmcl.upgrade.UpdateChecker;
 import org.jackhuang.hmcl.util.io.NetworkUtils;
@@ -69,7 +71,10 @@ public class CrashReporter implements Thread.UncaughtExceptionHandler {
                     String info = entry.getValue();
                     LOG.severe(info);
                     try {
-                        MessageBox.show(info);
+                        Alert alert = new Alert(AlertType.INFORMATION, info);
+                        alert.setTitle(i18n("message.info"));
+                        alert.setHeaderText(i18n("message.info"));
+                        alert.showAndWait();
                     } catch (Throwable t) {
                         LOG.log(Level.SEVERE, "Unable to show message", t);
                     }
@@ -103,7 +108,10 @@ public class CrashReporter implements Thread.UncaughtExceptionHandler {
                     "-- System Details --\n" +
                     "  Operating System: " + System.getProperty("os.name") + ' ' + OperatingSystem.SYSTEM_VERSION + "\n" +
                     "  Java Version: " + System.getProperty("java.version") + ", " + System.getProperty("java.vendor") + "\n" +
-                    "  Java VM Version: " + System.getProperty("java.vm.name") + " (" + System.getProperty("java.vm.info") + "), " + System.getProperty("java.vm.vendor") + "\n";
+                    "  Java VM Version: " + System.getProperty("java.vm.name") + " (" + System.getProperty("java.vm.info") + "), " + System.getProperty("java.vm.vendor") + "\n" +
+                    "  JVM Max Memory: " + Runtime.getRuntime().maxMemory() + "\n" +
+                    "  JVM Total Memory: " + Runtime.getRuntime().totalMemory() + "\n" +
+                    "  JVM Free Memory: " + Runtime.getRuntime().freeMemory() + "\n";
 
             LOG.log(Level.SEVERE, text);
 

HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/Locales.java

@@ -58,10 +58,6 @@ public final class Locales {
 
     public static final List<SupportedLocale> LOCALES = Lang.immutableListOf(DEFAULT, EN, ZH_CN, ZH);
 
-    public static SupportedLocale getLocale(int index) {
-        return Lang.get(LOCALES, index).orElse(DEFAULT);
-    }
-
     public static SupportedLocale getLocaleByName(String name) {
         if (name == null) return DEFAULT;
         switch (name.toLowerCase()) {

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

@@ -132,6 +132,16 @@
     -fx-fill: -fx-base-darker-color;
 }
 
+.sponsor-pane {
+    -fx-padding: 16;
+    -fx-background-color: white;
+    -fx-cursor: hand;
+}
+
+.sponsor-pane .label {
+    -fx-wrap-text: true;
+}
+
 /*******************************************************************************
  *                                                                             *
  * JFX Tab Pane                                                                *
@@ -342,12 +352,11 @@
 
 .jfx-tool-bar HBox {
     -fx-alignment: center;
-/*    -fx-spacing: 25.0;*/
     -fx-padding: 0.0 5.0;
 }
 
 .jfx-tool-bar .jfx-decorator-button {
-    -fx-cursor: head;
+    -fx-cursor: hand;
 }
 
 .jfx-tool-bar Label {
@@ -447,33 +456,6 @@
     -fx-fill: -fx-base-check-color;
 }
 
-.custom-jfx-radio-button {
-    -fx-font-size: 16.0px;
-}
-
-.custom-jfx-radio-button .radio {
-    -fx-stroke-width: 2.0px;
-    -fx-fill: transparent;
-}
-
-.custom-jfx-radio-button-blue {
-    -fx-text-fill: -fx-base-color;
-    -jfx-selected-color: -fx-base-color;
-    -jfx-unselected-color: #212121;
-}
-
-.custom-jfx-radio-button-red {
-    -fx-text-fill: #f44336;
-    -jfx-selected-color: #f44336;
-    -jfx-unselected-color: #b71c1c;
-}
-
-.custom-jfx-radio-button-green {
-    -fx-text-fill: #4caf50;
-    -jfx-selected-color: #4caf50;
-    -jfx-unselected-color: #1b5e20;
-}
-
 /*******************************************************************************
  *                                                                             *
  * JFX Slider                                                                  *
@@ -514,18 +496,12 @@
     -fx-font-size: 10.0;
 }
 
-/******************************************************/
-
 /*******************************************************************************
 *                                                                              *
 * JFX Rippler                                                                  *
 *                                                                              *
 *******************************************************************************/
 
-/*.jfx-rippler {
-	-fx-rippler-fill: -fx-base-color;
-	-fx-mask-type: RECT;
-}*/
 .jfx-rippler:hover {
     -fx-cursor: hand;
 }
@@ -536,62 +512,29 @@
 *                                                                              *
 *******************************************************************************/
 
-.custom-jfx-button-raised .jfx-rippler {
-    -jfx-rippler-fill: YELLOW;
-}
-
-.custom-jfx-button-raised {
-    -fx-padding: 0.7em 0.57em;
-    -fx-font-size: 14.0px;
-    -jfx-button-type: RAISED;
-    -fx-background-color: rgb(102.0, 153.0, 102.0);
-    -fx-pref-width: 200.0;
-    -fx-text-fill: WHITE;
-}
-
-.circle-jfx-button-raised .jfx-rippler {
-    -jfx-rippler-fill: YELLOW;
-}
-
-.circle-jfx-button-raised {
-    -fx-padding: 0.7em 0.57em;
-    -fx-font-size: 14.0px;
-    -jfx-button-type: RAISED;
-    -fx-background-color: rgb(102.0, 153.0, 102.0);
-    -fx-pref-width: 200.0;
-    -fx-text-fill: WHITE;
-    -jfx-mask-type: CIRCLE;
+.jfx-button {
+    -jfx-disable-visual-focus: true;
+    -fx-cursor: hand;
 }
 
 .jfx-button-raised {
-    -fx-text-fill: white;
     -fx-background-color: -fx-base-color;
-    -fx-font-size: 14px;
 }
 
-.jfx-button-raised .jfx-rippler {
-    -jfx-rippler-fill: white;
-}
-
-.jfx-button-raised .label {
-    -fx-text-fill: white;
+.jfx-button-raised, .jfx-button-raised * {
+    -fx-text-fill: -fx-base-text-fill;
     -fx-font-size: 14px;
 }
 
 .jfx-button-border {
-    -fx-text-fill: -fx-base-color;
     -fx-border-color: gray;
     -fx-border-radius: 5px;
     -fx-border-width: 0.2px;
     -fx-padding: 8px;
 }
 
-.jfx-button-border .jfx-rippler {
-    -jfx-rippler-fill: -fx-base-check-color;
-}
-
-.jfx-button-border .label {
-    -fx-text-fill: -fx-base-color;
+.jfx-button-border, .jfx-button-border * {
+    -fx-text-fill: -fx-base-darker-color;
 }
 
 .jfx-button-raised-round {
@@ -610,20 +553,6 @@
     -jfx-checked-color: -fx-base-check-color;
 }
 
-.custom-jfx-check-box {
-    -jfx-checked-color: RED;
-}
-
-.custom-jfx-check-box-all-colored {
-    -jfx-checked-color: -fx-base-color;
-    -jfx-unchecked-color: -fx-base-color;
-    -fx-text-fill: -fx-base-color;
-}
-
-.custom-jfx-check-box-text-colored {
-    -fx-text-fill: rgb(153.0, 0.0, 0.0);
-}
-
 /*******************************************************************************
 *                                                                              *
 * JFX Progress Bar                                                             *
@@ -647,15 +576,6 @@
     -fx-background-color: -fx-base-check-color;
 }
 
-.custom-jfx-progress-bar > .bar {
-    -fx-background-color: rgb(255.0, 128.0, 0.0);
-}
-
-.custom-jfx-progress-bar-stroke > .bar {
-    -fx-background-color: -fx-base-color;
-    -fx-padding: 6;
-}
-
 /*******************************************************************************
 *                                                                              *
 * JFX Textfield                                                                *
@@ -708,47 +628,6 @@
     -jfx-expanded: false;
 }
 
-.custom-jfx-list-view .jfx-list-cell:odd:selected > .jfx-rippler > StackPane,
-.custom-jfx-list-view .jfx-list-cell:even:selected > .jfx-rippler > StackPane {
-    -fx-background-color: rgba(255, 0, 0, 0.2);
-}
-
-.custom-jfx-list-view {
-    -fx-background-insets: 0.0;
-    -jfx-cell-horizontal-margin: 0.0;
-    -jfx-cell-vertical-margin: 5.0;
-    -jfx-expanded: false;
-    -fx-max-width: 200.0px;
-    /* important to hide the list change of height */
-    -fx-background-color: TRANSPARENT;
-}
-
-.custom-jfx-list-view .jfx-rippler {
-    -jfx-rippler-fill: RED;
-}
-
-.custom-jfx-list-view1 {
-    -jfx-vertical-gap: 10.0;
-    -fx-pref-width: 150px;
-    -fx-background-color: transparent;
-}
-
-.custom-jfx-list-view-icon,
-.jfx-list-cell:selected .label .custom-jfx-list-view-icon {
-    -fx-fill: -fx-base-color;
-    -fx-padding: 0.0 10.0 0.0 5.0;
-    -fx-cursor: hand;
-}
-
-.custom-jfx-list-view-icon-container {
-    -fx-pref-width: 40px;
-}
-
-.custom-jfx-list-view .sublist-item {
-    -fx-border-color: #e0e0e0;
-    -fx-border-width: 1 0 1 0;
-}
-
 .options-list {
     -fx-background-color: transparent;
     -fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.26), 5, 0.06, -0.5, 1);
@@ -798,20 +677,6 @@
     -jfx-mask-type: CIRCLE;
 }
 
-.custom-jfx-list-view .jfx-list-cell .sublist-header > .drop-icon {
-    -fx-background-color: GRAY;
-}
-
-.custom-jfx-list-view .jfx-list-cell:filled:hover .sublist-header > .drop-icon {
-    -fx-background-color: BLACK;
-}
-
-/*******************************************************************************/
-/*******************************************************************************/
-/*******************************************************************************/
-/*******************************************************************************/
-/*******************************************************************************/
-/*******************************************************************************/
 /*******************************************************************************
 *                                                                              *
 * JFX SUBLIST IMPORTANT                                                        *
@@ -851,10 +716,6 @@
     -fx-padding: 0 0 0 12;
 }
 
-/*.custom-jfx-list-view .sublist-container {
-	-fx-padding : 0 0 5 0;
-}*/
-
 /*******************************************************************************
 *                                                                              *
 * JFX Toggle Button                                                            *
@@ -865,14 +726,6 @@
     -jfx-toggle-color: -fx-base-check-color;
 }
 
-.custom-jfx-toggle-button {
-    -jfx-toggle-color: #4285F4;
-}
-
-.custom-jfx-toggle-button-red {
-    -jfx-toggle-color: red;
-}
-
 .toggle-label {
     -fx-font-size: 14.0px;
 }
@@ -1038,6 +891,14 @@
     -fx-stroke-width: 3.0;
 }
 
+.large-spinner-pane .jfx-spinner {
+    -jfx-radius: 20;
+}
+
+.large-spinner-pane .jfx-spinner {
+    -fx-stroke-width: 5.0;
+}
+
 .second-spinner {
     -jfx-radius: 30;
 }
@@ -1190,7 +1051,7 @@
 
 .tree-table-view .column-header .label {
     -fx-text-fill: #949494;
-    -fx-padding: 16 0 16 0;
+    -fx-padding: 8 0 8 0;
 }
 
 .tree-table-view .column-header .arrow, .tree-table-view .column-header .sort-order-dot {
@@ -1208,8 +1069,8 @@
 
 .tree-table-view .tree-table-cell {
     -fx-border-width: 0 0 0 0;
-    -fx-padding: 16 0 16 0;
-    -fx-alignment: top-center;
+    -fx-padding: 8 0 8 0;
+    /*-fx-alignment: top-center;*/
 }
 
 .tree-table-view .column-overlay {
@@ -1362,12 +1223,3 @@
 .fit-width {
     -fx-pref-width: 100%;
 }
-/*
-.jfx-scroll-pane .main-header {
-    -fx-background-image: url("../bg1.jpg");
-}
-
-.jfx-scroll-pane .condensed-header {
-    -fx-background-image: url("../bg4.jpg");
-}
-*/

HMCL/src/main/resources/assets/fxml/download/modpack.fxml

@@ -14,7 +14,7 @@
     <fx:define>
         <Insets fx:id="insets" bottom="12" />
     </fx:define>
-    <SpinnerPane fx:id="spinnerPane">
+    <SpinnerPane fx:id="spinnerPane" styleClass="large-spinner-pane">
         <VBox fx:id="borderPane" alignment="CENTER" FXUtils.limitWidth="500">
             <HBox style="-fx-padding: 0 0 16 5;"><Label text="%modpack.task.install" /></HBox>
             <ComponentList>

HMCL/src/main/resources/assets/fxml/download/versions.fxml

@@ -5,22 +5,31 @@
 <?import javafx.scene.layout.*?>
 <fx:root xmlns="http://javafx.com/javafx"
          xmlns:fx="http://javafx.com/fxml"
-         type="StackPane"
+         type="BorderPane"
          prefHeight="400.0" prefWidth="600.0">
-    <JFXSpinner fx:id="spinner" styleClass="first-spinner" />
-    <VBox fx:id="centrePane">
-        <HBox fx:id="checkPane" spacing="10" style="-fx-padding: 10;">
-            <JFXCheckBox fx:id="chkRelease" text="%version.game.release" selected="true" />
-            <JFXCheckBox fx:id="chkSnapshot" text="%version.game.snapshot" />
-            <JFXCheckBox fx:id="chkOld" text="%version.game.old" />
-        </HBox>
-        <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>
-    <StackPane fx:id="emptyPane">
-        <Label onMouseClicked="#onBack" style="-fx-text-fill: #0079FF; -fx-font-size: 20;" text="%download.failed.empty" />
-    </StackPane>
+    <top>
+        <StackPane styleClass="sponsor-pane" onMouseClicked="#onSponsor">
+            <Label text="%sponsor.bmclapi" />
+        </StackPane>
+    </top>
+    <center>
+        <StackPane fx:id="root">
+            <JFXSpinner fx:id="spinner" styleClass="first-spinner" />
+            <VBox fx:id="centrePane">
+                <HBox fx:id="checkPane" spacing="10" style="-fx-padding: 10;">
+                    <JFXCheckBox fx:id="chkRelease" text="%version.game.release" selected="true" />
+                    <JFXCheckBox fx:id="chkSnapshot" text="%version.game.snapshot" />
+                    <JFXCheckBox fx:id="chkOld" text="%version.game.old" />
+                </HBox>
+                <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>
+            <StackPane fx:id="emptyPane">
+                <Label onMouseClicked="#onBack" style="-fx-text-fill: #0079FF; -fx-font-size: 20;" text="%download.failed.empty" />
+            </StackPane>
+        </StackPane>
+    </center>
 </fx:root>

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

@@ -18,7 +18,7 @@
 
 # Contributors: dxNeil
 about.copyright=Copyright
-about.copyright.statement=Copyright (c) 2018 huangyuhui.
+about.copyright.statement=Copyright (c) 2019 huangyuhui.
 about.author=Author
 about.author.statement=huanghongxun ([email protected])
 about.thanks_to=Thanks to
@@ -66,6 +66,7 @@ account.username=Name
 
 archive.author=Authors
 archive.game_version=Game
+archive.name=Name
 archive.version=Version
 
 assets.download=Download assets
@@ -94,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
@@ -125,6 +126,7 @@ input.url=Must be a valid URL.
 install=Install New Game
 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.installer.choose=Choose a %s version
 install.installer.forge=Forge
 install.installer.game=Game
@@ -252,6 +254,9 @@ mods.add=Add mods
 mods.add.failed=Failed to add mods %s.
 mods.add.success=Successfully added mods %s.
 mods.choose_mod=Choose your mods
+mods.enable=Enable
+mods.disable=Disable
+mods.name=Name
 mods.remove=Remove
 
 datapack=Data packs
@@ -364,6 +369,9 @@ settings.type.global.manage=Global Game Settings
 settings.type.global.edit=Configure global game settings
 settings.type.special.enable=Enable specialized settings for this game
 
+sponsor.bmclapi=To obtain a stable download service, please consider support BMCLAPI. Click here for more information
+sponsor.hmcl=HMCL is a free, open source Minecraft launcher the enables users to easily manage multiple, separate installations of Minecraft. We're using Afdian so that we can continue to pay for our hosting and project development. Click here for more information.
+
 update=Update
 update.channel.dev=Update to development version
 update.channel.stable=Update to stable version

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

@@ -17,7 +17,7 @@
 #
 
 about.copyright=版權
-about.copyright.statement=Copyright (c) 2018 huangyuhui.
+about.copyright.statement=Copyright (c) 2019 huangyuhui.
 about.author=作者
 about.author.statement=huanghongxun ([email protected])
 about.thanks_to=鳴謝
@@ -65,6 +65,7 @@ account.username=使用者名稱
 
 archive.author=作者
 archive.game_version=遊戲版本
+archive.name=名稱
 archive.version=版本
 
 assets.download=下載資源
@@ -93,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=模組檔案
@@ -124,6 +125,7 @@ input.url=必須為有效連結
 install=新增遊戲
 install.failed=安裝失敗
 install.failed.downloading=安裝失敗，部分文件未能完成下載
+install.failed.downloading.detail=未能下載檔案：%s
 install.installer.choose=選擇 %s 版本
 install.installer.forge=Forge
 install.installer.game=遊戲
@@ -251,6 +253,8 @@ mods.add=新增模組
 mods.add.failed=新增模組 %s 失敗。
 mods.add.success=成功新增模組 %s。
 mods.choose_mod=選擇模組
+mods.enable=啟用
+mods.disable=禁用
 mods.remove=刪除
 
 datapack=資料包
@@ -363,6 +367,9 @@ settings.type.global.manage=全域遊戲設定
 settings.type.global.edit=編輯全域遊戲設定
 settings.type.special.enable=啟用遊戲特別設定（不影響其他遊戲版本）
 
+sponsor.bmclapi=請贊助 BMCLAPI 從而獲得穩定高速的下載服務，點擊此處查閱詳細訊息。
+sponsor.hmcl=HMCL 是一個免費、開源的 Minecraft 啟動器，允許玩家方便快捷地安裝、管理、運行遊戲。您的贊助將幫助 HMCL 獲得更好的發展、支持穩定高速的遊戲安裝與文件下載服務。點擊此處查閱更多詳細訊息。
+
 update=啟動器更新
 update.channel.dev=更新到開發版
 update.channel.stable=更新到推薦版本

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

@@ -17,7 +17,7 @@
 #
 
 about.copyright=版权
-about.copyright.statement=Copyright (c) 2018 huangyuhui.
+about.copyright.statement=Copyright (c) 2019 huangyuhui.
 about.author=作者
 about.author.statement=huanghongxun ([email protected])
 about.thanks_to=鸣谢
@@ -65,6 +65,7 @@ account.username=用户名
 
 archive.author=作者
 archive.game_version=游戏版本
+archive.name=名称
 archive.version=版本
 
 assets.download=下载资源
@@ -93,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=模组文件
@@ -124,6 +125,7 @@ input.url=必须是合法的链接
 install=添加游戏
 install.failed=安装失败
 install.failed.downloading=安装失败，部分文件未能完成下载
+install.failed.downloading.detail=未能下载文件：%s
 install.installer.choose=选择 %s 版本
 install.installer.forge=Forge
 install.installer.game=游戏
@@ -251,6 +253,8 @@ mods.add=添加模组
 mods.add.failed=添加模组 %s 失败。
 mods.add.success=成功添加模组 %s。
 mods.choose_mod=选择模组
+mods.enable=启用
+mods.disable=禁用
 mods.remove=删除
 
 datapack=数据包
@@ -363,6 +367,9 @@ settings.type.global.manage=全局游戏设置
 settings.type.global.edit=编辑全局版本设置
 settings.type.special.enable=启用游戏特定设置（不影响其他游戏版本）
 
+sponsor.bmclapi=请赞助 BMCLAPI 从而获得稳定高速的下载服务，点击此处查阅详细信息。
+sponsor.hmcl=HMCL 是一个免费、开源的 Minecraft 启动器，允许玩家方便快捷地安装、管理、运行游戏。您的赞助将帮助 HMCL 获得更好的发展、支持稳定高速的游戏安装与文件下载服务。点击此处查阅更多详细信息。
+
 update=启动器更新
 update.channel.dev=更新到开发版
 update.channel.stable=更新到推荐版本

HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorAccount.java

@@ -115,7 +115,7 @@ public class AuthlibInjectorAccount extends YggdrasilAccount {
         return new Arguments().addJVMArguments(
                 "-javaagent:" + artifact.getLocation().toString() + "=" + server.getUrl(),
                 "-Dauthlibinjector.side=client",
-                "-Dorg.to2mbn.authlibinjector.config.prefetched=" + Base64.getEncoder().encodeToString(prefetchedMeta.getBytes(UTF_8)));
+                "-Dauthlibinjector.yggdrasil.prefetched=" + Base64.getEncoder().encodeToString(prefetchedMeta.getBytes(UTF_8)));
     }
 
     @Override

HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorDownloader.java

@@ -127,7 +127,7 @@ public class AuthlibInjectorDownloader implements AuthlibInjectorArtifactProvide
         }
     }
 
-    private class AuthlibInjectorVersionInfo {
+    private static class AuthlibInjectorVersionInfo {
         @SerializedName("build_number")
         public int buildNumber;
 

HMCLCore/src/main/java/org/jackhuang/hmcl/auth/yggdrasil/Texture.java

@@ -18,6 +18,7 @@
 package org.jackhuang.hmcl.auth.yggdrasil;
 
 import org.jackhuang.hmcl.util.Immutable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Map;
 
@@ -36,10 +37,12 @@ public final class Texture {
         this.metadata = metadata;
     }
 
+    @Nullable
     public String getUrl() {
         return url;
     }
 
+    @Nullable
     public Map<String, String> getMetadata() {
         return metadata;
     }

HMCLCore/src/main/java/org/jackhuang/hmcl/auth/yggdrasil/User.java

@@ -21,6 +21,7 @@ import com.google.gson.JsonParseException;
 
 import java.util.Map;
 
+import com.google.gson.annotations.JsonAdapter;
 import org.jackhuang.hmcl.util.Immutable;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.gson.Validation;
@@ -36,13 +37,14 @@ public final class User implements Validation {
     private final String id;
 
     @Nullable
+    @JsonAdapter(PropertyMapSerializer.class)
     private final Map<String, String> properties;
 
     public User(String id) {
         this(id, null);
     }
 
-    public User(String id, Map<String, String> properties) {
+    public User(String id, @Nullable Map<String, String> properties) {
         this.id = id;
         this.properties = properties;
     }
@@ -51,6 +53,7 @@ public final class User implements Validation {
         return id;
     }
 
+    @Nullable
     public Map<String, String> getProperties() {
         return properties;
     }

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

@@ -17,7 +17,7 @@
  */
 package org.jackhuang.hmcl.download;
 
-import org.jackhuang.hmcl.download.forge.ForgeVersionList;
+import org.jackhuang.hmcl.download.forge.ForgeBMCLVersionList;
 import org.jackhuang.hmcl.download.game.GameVersionList;
 import org.jackhuang.hmcl.download.liteloader.LiteLoaderBMCLVersionList;
 import org.jackhuang.hmcl.download.optifine.OptiFineBMCLVersionList;
@@ -44,7 +44,7 @@ public class BMCLAPIDownloadProvider implements DownloadProvider {
             case "game":
                 return GameVersionList.INSTANCE;
             case "forge":
-                return ForgeVersionList.INSTANCE;
+                return ForgeBMCLVersionList.INSTANCE;
             case "liteloader":
                 return LiteLoaderBMCLVersionList.INSTANCE;
             case "optifine":
@@ -59,8 +59,8 @@ public class BMCLAPIDownloadProvider implements DownloadProvider {
         return baseURL
                 .replace("https://launchermeta.mojang.com", "https://bmclapi2.bangbang93.com")
                 .replace("https://launcher.mojang.com", "https://bmclapi2.bangbang93.com")
-                .replace("https://libraries.minecraft.net", "http://bmclapi2.bangbang93.com/libraries")
-                .replaceFirst("https?://files\\.minecraftforge\\.net/maven", "http://bmclapi2.bangbang93.com/maven")
+                .replace("https://libraries.minecraft.net", "https://bmclapi2.bangbang93.com/libraries")
+                .replaceFirst("https?://files\\.minecraftforge\\.net/maven", "https://bmclapi2.bangbang93.com/maven")
                 .replace("http://dl.liteloader.com/versions/versions.json", "https://bmclapi2.bangbang93.com/maven/com/mumfrey/liteloader/versions.json")
                 .replace("http://dl.liteloader.com/versions", "https://bmclapi2.bangbang93.com/maven")
                 .replace("https://authlib-injector.yushi.moe", "https://bmclapi2.bangbang93.com/mirrors/authlib-injector");

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

@@ -19,10 +19,7 @@ package org.jackhuang.hmcl.download;
 
 import org.jackhuang.hmcl.download.forge.ForgeInstallTask;
 import org.jackhuang.hmcl.download.forge.ForgeRemoteVersion;
-import org.jackhuang.hmcl.download.game.GameAssetDownloadTask;
-import org.jackhuang.hmcl.download.game.GameLibrariesTask;
-import org.jackhuang.hmcl.download.game.LibrariesUniqueTask;
-import org.jackhuang.hmcl.download.game.VersionJsonSaveTask;
+import org.jackhuang.hmcl.download.game.*;
 import org.jackhuang.hmcl.download.liteloader.LiteLoaderInstallTask;
 import org.jackhuang.hmcl.download.liteloader.LiteLoaderRemoteVersion;
 import org.jackhuang.hmcl.download.optifine.OptiFineInstallTask;
@@ -31,7 +28,7 @@ import org.jackhuang.hmcl.game.DefaultGameRepository;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.task.ParallelTask;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.util.AutoTypingMap;
+import org.jackhuang.hmcl.task.TaskResult;
 import org.jackhuang.hmcl.util.function.ExceptionalFunction;
 
 /**
@@ -74,7 +71,13 @@ public class DefaultDependencyManager extends AbstractDependencyManager {
     @Override
     public Task checkGameCompletionAsync(Version version) {
         return new ParallelTask(
-                new GameAssetDownloadTask(this, version),
+                Task.ofThen(() -> {
+                    if (!repository.getVersionJar(version).exists())
+                        return new GameDownloadTask(this, null, version);
+                    else
+                        return null;
+                }),
+                new GameAssetDownloadTask(this, version, GameAssetDownloadTask.DOWNLOAD_INDEX_IF_NECESSARY),
                 new GameLibrariesTask(this, version)
         );
     }
@@ -85,36 +88,32 @@ public class DefaultDependencyManager extends AbstractDependencyManager {
     }
 
     @Override
-    public Task installLibraryAsync(String gameVersion, Version version, String libraryId, String libraryVersion) {
+    public TaskResult<Version> installLibraryAsync(String gameVersion, Version version, String libraryId, String libraryVersion) {
         VersionList<?> versionList = getVersionList(libraryId);
-        return versionList.loadAsync(getDownloadProvider())
-                .then(variables -> installLibraryAsync(version, versionList.getVersion(gameVersion, libraryVersion)
+        return versionList.loadAsync(gameVersion, getDownloadProvider())
+                .thenCompose(() -> installLibraryAsync(version, versionList.getVersion(gameVersion, libraryVersion)
                         .orElseThrow(() -> new IllegalStateException("Remote library " + libraryId + " has no version " + libraryVersion))));
     }
 
     @Override
-    public Task installLibraryAsync(Version version, RemoteVersion libraryVersion) {
+    public TaskResult<Version> installLibraryAsync(Version oldVersion, RemoteVersion libraryVersion) {
+        TaskResult<Version> task;
         if (libraryVersion instanceof ForgeRemoteVersion)
-            return new ForgeInstallTask(this, version, (ForgeRemoteVersion) libraryVersion)
-                    .then(variables -> new LibrariesUniqueTask(variables.get("version")))
-                    .then(variables -> new MaintainTask(variables.get("version")))
-                    .then(variables -> new VersionJsonSaveTask(repository, variables.get("version")));
+            task = new ForgeInstallTask(this, oldVersion, (ForgeRemoteVersion) libraryVersion);
         else if (libraryVersion instanceof LiteLoaderRemoteVersion)
-            return new LiteLoaderInstallTask(this, version, (LiteLoaderRemoteVersion) libraryVersion)
-                    .then(variables -> new LibrariesUniqueTask(variables.get("version")))
-                    .then(variables -> new MaintainTask(variables.get("version")))
-                    .then(variables -> new VersionJsonSaveTask(repository, variables.get("version")));
+            task = new LiteLoaderInstallTask(this, oldVersion, (LiteLoaderRemoteVersion) libraryVersion);
         else if (libraryVersion instanceof OptiFineRemoteVersion)
-            return new OptiFineInstallTask(this, version, (OptiFineRemoteVersion) libraryVersion)
-                    .then(variables -> new LibrariesUniqueTask(variables.get("version")))
-                    .then(variables -> new MaintainTask(variables.get("version")))
-                    .then(variables -> new VersionJsonSaveTask(repository, variables.get("version")));
+            task = new OptiFineInstallTask(this, oldVersion, (OptiFineRemoteVersion) libraryVersion);
         else
             throw new IllegalArgumentException("Remote library " + libraryVersion + " is unrecognized.");
+        return task
+                .thenCompose(LibrariesUniqueTask::new)
+                .thenCompose(MaintainTask::new)
+                .thenCompose(newVersion -> new VersionJsonSaveTask(repository, newVersion));
     }
 
 
-    public ExceptionalFunction<AutoTypingMap<String>, Task, ?> installLibraryAsync(RemoteVersion libraryVersion) {
-        return var -> installLibraryAsync(var.get("version"), libraryVersion);
+    public ExceptionalFunction<Version, TaskResult<Version>, ?> installLibraryAsync(RemoteVersion libraryVersion) {
+        return version -> installLibraryAsync(version, libraryVersion);
     }
 }

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

@@ -21,7 +21,7 @@ import org.jackhuang.hmcl.download.game.*;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.task.ParallelTask;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.util.AutoTypingMap;
+import org.jackhuang.hmcl.task.TaskResult;
 import org.jackhuang.hmcl.util.function.ExceptionalFunction;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 
@@ -49,34 +49,35 @@ public class DefaultGameBuilder extends GameBuilder {
 
     @Override
     public Task buildAsync() {
-        return new VersionJsonDownloadTask(gameVersion, dependencyManager).then(variables -> {
-            Version version = JsonUtils.GSON.fromJson(variables.<String>get(VersionJsonDownloadTask.ID), Version.class);
-            version = version.setId(name).setJar(null);
-            variables.set("version", version);
-            Task result = downloadGameAsync(gameVersion, version).then(new ParallelTask(
-                    new GameAssetDownloadTask(dependencyManager, version),
+        return new VersionJsonDownloadTask(gameVersion, dependencyManager).thenCompose(rawJson -> {
+            Version original = JsonUtils.GSON.fromJson(rawJson, Version.class);
+            Version version = original.setId(name).setJar(null);
+            Task vanillaTask = downloadGameAsync(gameVersion, version).then(new ParallelTask(
+                    new GameAssetDownloadTask(dependencyManager, version, GameAssetDownloadTask.DOWNLOAD_INDEX_FORCIBLY),
                     new GameLibrariesTask(dependencyManager, version) // Game libraries will be downloaded for multiple times partly, this time is for vanilla libraries.
             ).with(new VersionJsonSaveTask(dependencyManager.getGameRepository(), version))); // using [with] because download failure here are tolerant.
 
+            TaskResult<Version> libraryTask = vanillaTask.thenSupply(() -> version);
+
             if (toolVersions.containsKey("forge"))
-                result = result.then(libraryTaskHelper(gameVersion, "forge"));
+                libraryTask = libraryTask.thenCompose(libraryTaskHelper(gameVersion, "forge"));
             if (toolVersions.containsKey("liteloader"))
-                result = result.then(libraryTaskHelper(gameVersion, "liteloader"));
+                libraryTask = libraryTask.thenCompose(libraryTaskHelper(gameVersion, "liteloader"));
             if (toolVersions.containsKey("optifine"))
-                result = result.then(libraryTaskHelper(gameVersion, "optifine"));
+                libraryTask = libraryTask.thenCompose(libraryTaskHelper(gameVersion, "optifine"));
 
             for (RemoteVersion remoteVersion : remoteVersions)
-                result = result.then(dependencyManager.installLibraryAsync(remoteVersion));
+                libraryTask = libraryTask.thenCompose(dependencyManager.installLibraryAsync(remoteVersion));
 
-            return result;
-        }).finalized((variables, isDependentsSucceeded) -> {
-            if (!isDependentsSucceeded)
+            return libraryTask;
+        }).whenComplete((isDependentSucceeded, exception) -> {
+            if (!isDependentSucceeded)
                 dependencyManager.getGameRepository().getVersionRoot(name).delete();
         });
     }
 
-    private ExceptionalFunction<AutoTypingMap<String>, Task, ?> libraryTaskHelper(String gameVersion, String libraryId) {
-        return variables -> dependencyManager.installLibraryAsync(gameVersion, variables.get("version"), libraryId, toolVersions.get(libraryId));
+    private ExceptionalFunction<Version, TaskResult<Version>, ?> libraryTaskHelper(String gameVersion, String libraryId) {
+        return version -> dependencyManager.installLibraryAsync(gameVersion, version, libraryId, toolVersions.get(libraryId));
     }
 
     protected Task downloadGameAsync(String gameVersion, Version version) {

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

@@ -23,15 +23,9 @@ import org.jackhuang.hmcl.task.TaskResult;
 public class MaintainTask extends TaskResult<Version> {
 
     private final Version version;
-    private final String id;
 
     public MaintainTask(Version version) {
-        this(version, ID);
-    }
-
-    public MaintainTask(Version version, String id) {
         this.version = version;
-        this.id = id;
     }
 
     @Override
@@ -40,6 +34,16 @@ public class MaintainTask extends TaskResult<Version> {
     }
 
     public static Version maintain(Version version) {
+        if (version.getMainClass().contains("launchwrapper")) {
+            return maintainGameWithLaunchWrapper(version);
+        } else {
+            // Vanilla Minecraft does not need maintain
+            // Forge 1.13 support not implemented, not compatible with OptiFine currently.
+            return version;
+        }
+    }
+
+    private static Version maintainGameWithLaunchWrapper(Version version) {
         LibraryAnalyzer libraryAnalyzer = LibraryAnalyzer.analyze(version);
         VersionLibraryBuilder builder = new VersionLibraryBuilder(version);
 
@@ -66,11 +70,4 @@ public class MaintainTask extends TaskResult<Version> {
 
         return builder.build();
     }
-
-    @Override
-    public String getId() {
-        return id;
-    }
-
-    public static final String ID = "version";
 }

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

@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hmcl.download;
 
+import org.jackhuang.hmcl.download.forge.ForgeBMCLVersionList;
 import org.jackhuang.hmcl.download.forge.ForgeVersionList;
 import org.jackhuang.hmcl.download.game.GameVersionList;
 import org.jackhuang.hmcl.download.liteloader.LiteLoaderVersionList;
@@ -44,7 +45,7 @@ public class MojangDownloadProvider implements DownloadProvider {
             case "game":
                 return GameVersionList.INSTANCE;
             case "forge":
-                return ForgeVersionList.INSTANCE;
+                return ForgeBMCLVersionList.INSTANCE;
             case "liteloader":
                 return LiteLoaderVersionList.INSTANCE;
             case "optifine":
@@ -56,6 +57,7 @@ public class MojangDownloadProvider implements DownloadProvider {
 
     @Override
     public String injectURL(String baseURL) {
-        return baseURL;
+        return baseURL
+                .replaceFirst("https?://files\\.minecraftforge\\.net/maven", "https://bmclapi2.bangbang93.com/maven");
     }
 }

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

@@ -46,6 +46,14 @@ public abstract class VersionList<T extends RemoteVersion> {
         return !versions.isEmpty();
     }
 
+    /**
+     * True if the version list that contains the remote versions which depends on the specific game version has been loaded.
+     * @param gameVersion the remote version depends on
+     */
+    public boolean isLoaded(String gameVersion) {
+        return !versions.get(gameVersion).isEmpty();
+    }
+
     public abstract boolean hasType();
 
     protected final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
@@ -56,8 +64,17 @@ public abstract class VersionList<T extends RemoteVersion> {
      */
     public abstract Task refreshAsync(DownloadProvider downloadProvider);
 
+    /**
+     * @param gameVersion the remote version depends on
+     * @param downloadProvider DownloadProvider
+     * @return the task to reload the remote version list.
+     */
+    public Task refreshAsync(String gameVersion, DownloadProvider downloadProvider) {
+        return refreshAsync(downloadProvider);
+    }
+
     public Task loadAsync(DownloadProvider downloadProvider) {
-        return Task.ofThen(variables -> {
+        return Task.ofThen(() -> {
             lock.readLock().lock();
             boolean loaded;
 
@@ -70,6 +87,20 @@ public abstract class VersionList<T extends RemoteVersion> {
         });
     }
 
+    public Task loadAsync(String gameVersion, DownloadProvider downloadProvider) {
+        return Task.ofThen(() -> {
+            lock.readLock().lock();
+            boolean loaded;
+
+            try {
+                loaded = isLoaded(gameVersion);
+            } finally {
+                lock.readLock().unlock();
+            }
+            return loaded ? null : refreshAsync(gameVersion, downloadProvider);
+        });
+    }
+
     protected Collection<T> getVersionsImpl(String gameVersion) {
         lock.readLock().lock();
         try {

HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeBMCLVersionList.java

@@ -0,0 +1,179 @@
+/*
+ * 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.download.forge;
+
+import com.google.gson.JsonParseException;
+import com.google.gson.reflect.TypeToken;
+import org.jackhuang.hmcl.download.DownloadProvider;
+import org.jackhuang.hmcl.download.VersionList;
+import org.jackhuang.hmcl.task.GetTask;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.util.Immutable;
+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.NetworkUtils;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+public final class ForgeBMCLVersionList extends VersionList<ForgeRemoteVersion> {
+
+    public static final ForgeBMCLVersionList INSTANCE = new ForgeBMCLVersionList();
+
+    private ForgeBMCLVersionList() {
+    }
+
+    @Override
+    public boolean hasType() {
+        return false;
+    }
+
+    @Override
+    public Task loadAsync(DownloadProvider downloadProvider) {
+        throw new UnsupportedOperationException("ForgeBMCLVersionList does not support loading the entire Forge remote version list.");
+    }
+
+    @Override
+    public Task refreshAsync(DownloadProvider downloadProvider) {
+        throw new UnsupportedOperationException("ForgeBMCLVersionList does not support loading the entire Forge remote version list.");
+    }
+
+    @Override
+    public Task refreshAsync(String gameVersion, DownloadProvider downloadProvider) {
+        final GetTask task = new GetTask(NetworkUtils.toURL("https://bmclapi2.bangbang93.com/forge/minecraft/" + gameVersion));
+        return new Task() {
+            @Override
+            public Collection<Task> getDependents() {
+                return Collections.singleton(task);
+            }
+
+            @Override
+            public void execute() {
+                lock.writeLock().lock();
+
+                try {
+                    List<ForgeVersion> forgeVersions = JsonUtils.GSON.fromJson(task.getResult(), new TypeToken<List<ForgeVersion>>() {
+                    }.getType());
+                    versions.clear(gameVersion);
+                    if (forgeVersions == null) return;
+                    for (ForgeVersion version : forgeVersions) {
+                        if (version == null)
+                            continue;
+                        String jar = null;
+                        for (ForgeVersion.File file : version.getFiles())
+                            if ("installer".equals(file.getCategory())) {
+                                String classifier = gameVersion + "-" + version.getVersion()
+                                        + (StringUtils.isNotBlank(version.getBranch()) ? "-" + version.getBranch() : "");
+                                String fileName = "forge-" + classifier + "-" + file.getCategory() + "." + file.getFormat();
+                                jar = "https://bmclapi2.bangbang93.com/maven/net/minecraftforge/forge/" + classifier + "/" + fileName;
+                            }
+
+                        if (jar == null)
+                            continue;
+                        versions.put(gameVersion, new ForgeRemoteVersion(
+                                version.getGameVersion(), version.getVersion(), jar
+                        ));
+                    }
+                } finally {
+                    lock.writeLock().unlock();
+                }
+            }
+        };
+    }
+
+    @Immutable
+    public static final class ForgeVersion implements Validation {
+
+        private final String branch;
+        private final String mcversion;
+        private final String version;
+        private final List<File> files;
+
+        /**
+         * No-arg constructor for Gson.
+         */
+        @SuppressWarnings("unused")
+        public ForgeVersion() {
+            this(null, null, null, null);
+        }
+
+        public ForgeVersion(String branch, String mcversion, String version, List<File> files) {
+            this.branch = branch;
+            this.mcversion = mcversion;
+            this.version = version;
+            this.files = files;
+        }
+
+        public String getBranch() {
+            return branch;
+        }
+
+        public String getGameVersion() {
+            return mcversion;
+        }
+
+        public String getVersion() {
+            return version;
+        }
+
+        public List<File> getFiles() {
+            return files;
+        }
+
+        @Override
+        public void validate() throws JsonParseException {
+            if (files == null)
+                throw new JsonParseException("ForgeVersion files cannot be null");
+            if (version == null)
+                throw new JsonParseException("ForgeVersion version cannot be null");
+            if (mcversion == null)
+                throw new JsonParseException("ForgeVersion mcversion cannot be null");
+        }
+
+        @Immutable
+        public static final class File {
+            private final String format;
+            private final String category;
+            private final String hash;
+
+            public File() {
+                this("", "", "");
+            }
+
+            public File(String format, String category, String hash) {
+                this.format = format;
+                this.category = category;
+                this.hash = hash;
+            }
+
+            public String getFormat() {
+                return format;
+            }
+
+            public String getCategory() {
+                return category;
+            }
+
+            public String getHash() {
+                return hash;
+            }
+        }
+    }
+}

HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeInstallTask.java

@@ -18,24 +18,17 @@
 package org.jackhuang.hmcl.download.forge;
 
 import org.jackhuang.hmcl.download.DefaultDependencyManager;
-import org.jackhuang.hmcl.game.Library;
-import org.jackhuang.hmcl.game.SimpleVersionProvider;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.task.FileDownloadTask;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskResult;
-import org.jackhuang.hmcl.util.gson.JsonUtils;
-import org.jackhuang.hmcl.util.io.FileUtils;
-import org.jackhuang.hmcl.util.io.IOUtils;
 import org.jackhuang.hmcl.util.io.NetworkUtils;
+import org.jackhuang.hmcl.util.versioning.VersionNumber;
 
-import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
 
 /**
  *
@@ -45,36 +38,49 @@ public final class ForgeInstallTask extends TaskResult<Version> {
 
     private final DefaultDependencyManager dependencyManager;
     private final Version version;
-    private final File installer = new File("forge-installer.jar").getAbsoluteFile();
+    private Path installer;
     private final ForgeRemoteVersion remote;
-    private final List<Task> dependents = new LinkedList<>();
-    private final List<Task> dependencies = new LinkedList<>();
-
-    private Task downloadFileTask() {
-        return new FileDownloadTask(NetworkUtils.toURL(remote.getUrl()), installer);
-    }
+    private Task dependent;
+    private TaskResult<Version> dependency;
 
     public ForgeInstallTask(DefaultDependencyManager dependencyManager, Version version, ForgeRemoteVersion remoteVersion) {
         this.dependencyManager = dependencyManager;
         this.version = version;
         this.remote = remoteVersion;
+    }
 
-        dependents.add(downloadFileTask());
+    @Override
+    public boolean doPreExecute() {
+        return true;
+    }
+
+    @Override
+    public void preExecute() throws Exception {
+        installer = Files.createTempFile("forge-installer", ".jar");
+
+        dependent = new FileDownloadTask(NetworkUtils.toURL(remote.getUrl()), installer.toFile())
+                .setCaching(true);
+    }
+
+    @Override
+    public boolean doPostExecute() {
+        return true;
+    }
+
+    @Override
+    public void postExecute() throws Exception {
+        Files.deleteIfExists(installer);
+        setResult(dependency.getResult());
     }
 
     @Override
     public Collection<Task> getDependents() {
-        return dependents;
+        return Collections.singleton(dependent);
     }
 
     @Override
-    public List<Task> getDependencies() {
-        return dependencies;
-    }
-
-    @Override
-    public String getId() {
-        return "version";
+    public Collection<Task> getDependencies() {
+        return Collections.singleton(dependency);
     }
 
     @Override
@@ -83,38 +89,10 @@ public final class ForgeInstallTask extends TaskResult<Version> {
     }
 
     @Override
-    public void execute() throws Exception {
-        try (ZipFile zipFile = new ZipFile(installer)) {
-            InputStream stream = zipFile.getInputStream(zipFile.getEntry("install_profile.json"));
-            if (stream == null)
-                throw new IOException("Malformed forge installer file, install_profile.json does not exist.");
-            String json = IOUtils.readFullyAsString(stream);
-            ForgeInstallProfile installProfile = JsonUtils.fromNonNullJson(json, ForgeInstallProfile.class);
-            
-            // unpack the universal jar in the installer file.
-            Library forgeLibrary = Library.fromName(installProfile.getInstall().getPath());
-            File forgeFile = dependencyManager.getGameRepository().getLibraryFile(version, forgeLibrary);
-            if (!FileUtils.makeFile(forgeFile))
-                throw new IOException("Cannot make directory " + forgeFile.getParent());
-            
-            ZipEntry forgeEntry = zipFile.getEntry(installProfile.getInstall().getFilePath());
-            try (InputStream is = zipFile.getInputStream(forgeEntry); OutputStream os = new FileOutputStream(forgeFile)) {
-                IOUtils.copyTo(is, os);
-            }
-            
-            // resolve the version
-            SimpleVersionProvider provider = new SimpleVersionProvider();
-            provider.addVersion(version);
-            
-            setResult(installProfile.getVersionInfo()
-                    .setInheritsFrom(version.getId())
-                    .resolve(provider).setJar(null)
-                    .setId(version.getId()).setLogging(Collections.emptyMap()));
-            
-            dependencies.add(dependencyManager.checkLibraryCompletionAsync(installProfile.getVersionInfo()));
-        }
-        
-        if (!installer.delete())
-            throw new IOException("Unable to delete installer file" + installer);
+    public void execute() {
+        if (VersionNumber.VERSION_COMPARATOR.compare("1.13", remote.getGameVersion()) <= 0)
+            dependency = new ForgeNewInstallTask(dependencyManager, version, installer);
+        else
+            dependency = new ForgeOldInstallTask(dependencyManager, version, installer);
     }
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeNewInstallProfile.java

@@ -0,0 +1,193 @@
+/*
+ * 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.download.forge;
+
+import org.jackhuang.hmcl.game.Artifact;
+import org.jackhuang.hmcl.game.Library;
+import org.jackhuang.hmcl.util.Immutable;
+import org.jackhuang.hmcl.util.function.ExceptionalFunction;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Immutable
+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, 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;
+    }
+
+    /**
+     * Specification for install_profile.json.
+     */
+    public int getSpec() {
+        return spec;
+    }
+
+    /**
+     * Vanilla game version that this installer supports.
+     */
+    public String getMinecraft() {
+        return minecraft;
+    }
+
+    /**
+     * Version json to be installed.
+     * @return path of the version json relative to the installer JAR file.
+     */
+    public String getJson() {
+        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.
+     */
+    public List<Library> getLibraries() {
+        return libraries == null ? Collections.emptyList() : libraries;
+    }
+
+    /**
+     * Tasks to be executed to setup modded environment.
+     */
+    public List<Processor> getProcessors() {
+        if (processors == null) return Collections.emptyList();
+        return processors.stream().filter(p -> p.isSide("client")).collect(Collectors.toList());
+    }
+
+    /**
+     * Data for processors.
+     */
+    public Map<String, String> getData() {
+        if (data == null)
+            return new HashMap<>();
+
+        return data.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().getClient()));
+    }
+
+    public static class Processor {
+        private final List<String> sides;
+        private final Artifact jar;
+        private final List<Artifact> classpath;
+        private final List<String> args;
+        private final Map<String, String> outputs;
+
+        public Processor(List<String> sides, Artifact jar, List<Artifact> classpath, List<String> args, Map<String, String> outputs) {
+            this.sides = sides;
+            this.jar = jar;
+            this.classpath = classpath;
+            this.args = args;
+            this.outputs = outputs;
+        }
+
+        /**
+         * Check which side this processor should be run on. We only support client install currently.
+         * @param side can be one of "client", "server", "extract".
+         * @return true if the processor can run on the side.
+         */
+        public boolean isSide(String side) {
+            return sides == null || sides.contains(side);
+        }
+
+        /**
+         * The executable jar of this processor task. Will be executed in installation process.
+         * @return the artifact path of executable jar.
+         */
+        public Artifact getJar() {
+            return jar;
+        }
+
+        /**
+         * The dependencies of this processor task.
+         * @return the artifact path of dependencies.
+         */
+        public List<Artifact> getClasspath() {
+            return classpath == null ? Collections.emptyList() : classpath;
+        }
+
+        /**
+         * Arguments to pass to the processor jar.
+         * Each item can be in one of the following formats:
+         * [artifact]: An artifact path, used for locating files.
+         * {entry}: Get corresponding value of the entry in {@link ForgeNewInstallProfile#getData()}
+         * {MINECRAFT_JAR}: path of the Minecraft jar.
+         * {SIDE}: values other than "client" will be ignored.
+         * @return arguments to pass to the processor jar.
+         * @see ForgeNewInstallTask#parseLiteral(String, Map, ExceptionalFunction)
+         */
+        public List<String> getArgs() {
+            return args == null ? Collections.emptyList() : args;
+        }
+
+        /**
+         * File-checksum pairs, used for verifying the output file is correct.
+         * Arguments to pass to the processor jar.
+         * Keys can be in one of [artifact] or {entry}. Should be file path.
+         * Values can be in one of {entry} or 'literal'. Should be SHA-1 checksum.
+         * @return files output from this processor.
+         * @see ForgeNewInstallTask#parseLiteral(String, Map, ExceptionalFunction)
+         */
+        public Map<String, String> getOutputs() {
+            return outputs == null ? Collections.emptyMap() : outputs;
+        }
+    }
+
+    public static class Datum {
+        private final String client;
+
+        public Datum(String client) {
+            this.client = client;
+        }
+
+        /**
+         * Can be in the following formats:
+         * [value]: An artifact path.
+         * 'value': A string literal.
+         * value: A file in the installer package, to be extracted to a temp folder, and then have the absolute path in replacements.
+         * @return Value to use for the client install
+         */
+        public String getClient() {
+            return client;
+        }
+    }
+}

HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeNewInstallTask.java

@@ -0,0 +1,269 @@
+/*
+ * 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.download.forge;
+
+import org.jackhuang.hmcl.download.DefaultDependencyManager;
+import org.jackhuang.hmcl.download.game.GameLibrariesTask;
+import org.jackhuang.hmcl.game.*;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.task.TaskResult;
+import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.function.ExceptionalFunction;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
+import org.jackhuang.hmcl.util.io.ChecksumMismatchException;
+import org.jackhuang.hmcl.util.io.CompressingUtils;
+import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.platform.CommandBuilder;
+import org.jackhuang.hmcl.util.platform.JavaVersion;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;
+
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.file.FileSystem;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.*;
+import java.util.jar.Attributes;
+import java.util.jar.JarFile;
+import java.util.stream.Collectors;
+
+import static org.jackhuang.hmcl.util.DigestUtils.digest;
+import static org.jackhuang.hmcl.util.Hex.encodeHex;
+import static org.jackhuang.hmcl.util.Logging.LOG;
+
+public class ForgeNewInstallTask extends TaskResult<Version> {
+
+    private final DefaultDependencyManager dependencyManager;
+    private final DefaultGameRepository gameRepository;
+    private final Version version;
+    private final Path installer;
+    private final List<Task> dependents = new LinkedList<>();
+    private final List<Task> dependencies = new LinkedList<>();
+
+    private ForgeNewInstallProfile profile;
+    private Version forgeVersion;
+
+    public ForgeNewInstallTask(DefaultDependencyManager dependencyManager, Version version, Path installer) {
+        this.dependencyManager = dependencyManager;
+        this.gameRepository = dependencyManager.getGameRepository();
+        this.version = version;
+        this.installer = installer;
+    }
+
+    private <E extends Exception> String parseLiteral(String literal, Map<String, String> var, ExceptionalFunction<String, String, E> plainConverter) throws E {
+        if (StringUtils.isSurrounded(literal, "{", "}"))
+            return var.get(StringUtils.removeSurrounding(literal, "{", "}"));
+        else if (StringUtils.isSurrounded(literal, "'", "'"))
+            return StringUtils.removeSurrounding(literal, "'");
+        else if (StringUtils.isSurrounded(literal, "[", "]"))
+            return gameRepository.getArtifactFile(version, new Artifact(StringUtils.removeSurrounding(literal, "[", "]"))).toString();
+        else
+            return plainConverter.apply(literal);
+    }
+
+    @Override
+    public Collection<Task> getDependents() {
+        return dependents;
+    }
+
+    @Override
+    public List<Task> getDependencies() {
+        return dependencies;
+    }
+
+    @Override
+    public boolean doPreExecute() {
+        return true;
+    }
+
+    @Override
+    public void preExecute() throws Exception {
+        try (FileSystem fs = CompressingUtils.createReadOnlyZipFileSystem(installer)) {
+            profile = JsonUtils.fromNonNullJson(FileUtils.readText(fs.getPath("install_profile.json")), ForgeNewInstallProfile.class);
+            forgeVersion = JsonUtils.fromNonNullJson(FileUtils.readText(fs.getPath(profile.getJson())), Version.class);
+
+            for (Library library : profile.getLibraries()) {
+                Path file = fs.getPath("maven").resolve(library.getPath());
+                if (Files.exists(file)) {
+                    Path dest = gameRepository.getLibraryFile(version, library).toPath();
+                    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()));
+    }
+
+    @Override
+    public void execute() throws Exception {
+        Path temp  = Files.createTempDirectory("forge_installer");
+        int finished = 0;
+        try (FileSystem fs = CompressingUtils.createReadOnlyZipFileSystem(installer)) {
+            List<ForgeNewInstallProfile.Processor> processors = profile.getProcessors();
+            Map<String, String> data = profile.getData();
+
+            updateProgress(0, processors.size());
+
+            for (Map.Entry<String, String> entry : data.entrySet()) {
+                String key = entry.getKey();
+                String value = entry.getValue();
+
+                data.put(key, parseLiteral(value,
+                        Collections.emptyMap(),
+                        str -> {
+                            Path dest = temp.resolve(str);
+                            FileUtils.copyFile(fs.getPath(str), dest);
+                            return dest.toString();
+                        }));
+            }
+
+            data.put("SIDE", "client");
+            data.put("MINECRAFT_JAR", gameRepository.getVersionJar(version).getAbsolutePath());
+
+            for (ForgeNewInstallProfile.Processor processor : processors) {
+                Map<String, String> outputs = new HashMap<>();
+                boolean miss = false;
+
+                for (Map.Entry<String, String> entry : processor.getOutputs().entrySet()) {
+                    String key = entry.getKey();
+                    String value = entry.getValue();
+
+                    key = parseLiteral(key, data, ExceptionalFunction.identity());
+                    value = parseLiteral(value, data, ExceptionalFunction.identity());
+
+                    if (key == null || value == null) {
+                        throw new Exception("Invalid forge installation configuration");
+                    }
+
+                    outputs.put(key, value);
+
+                    Path artifact = Paths.get(key);
+                    if (Files.exists(artifact)) {
+                        String code;
+                        try (InputStream stream = Files.newInputStream(artifact)) {
+                            code = encodeHex(digest("SHA-1", stream));
+                        }
+
+                        if (!Objects.equals(code, value)) {
+                            Files.delete(artifact);
+                            LOG.info("Found existing file is not valid: " + artifact);
+
+                            miss = true;
+                        }
+                    } else {
+                        miss = true;
+                    }
+                }
+
+                if (!processor.getOutputs().isEmpty() && !miss) {
+                    continue;
+                }
+
+                Path jar = gameRepository.getArtifactFile(version, processor.getJar());
+                if (!Files.isRegularFile(jar))
+                    throw new FileNotFoundException("Game processor file not found, should be downloaded in preprocess");
+
+                String mainClass;
+                try (JarFile jarFile = new JarFile(jar.toFile())) {
+                    mainClass = jarFile.getManifest().getMainAttributes().getValue(Attributes.Name.MAIN_CLASS);
+                }
+
+                if (StringUtils.isBlank(mainClass))
+                    throw new Exception("Game processor jar does not have main class " + jar);
+
+                List<String> command = new ArrayList<>();
+                command.add(JavaVersion.fromCurrentEnvironment().getBinary().toString());
+                command.add("-cp");
+
+                List<String> classpath = new ArrayList<>(processor.getClasspath().size() + 1);
+                for (Artifact artifact : processor.getClasspath()) {
+                    Path file = gameRepository.getArtifactFile(version, artifact);
+                    if (!Files.isRegularFile(file))
+                        throw new Exception("Game processor dependency missing");
+                    classpath.add(file.toString());
+                }
+                classpath.add(jar.toString());
+                command.add(String.join(OperatingSystem.PATH_SEPARATOR, classpath));
+
+                command.add(mainClass);
+
+                List<String> args = processor.getArgs().stream().map(arg -> {
+                    String parsed = parseLiteral(arg, data, ExceptionalFunction.identity());
+                    if (parsed == null)
+                        throw new IllegalStateException("Invalid forge installation configuration");
+                    return parsed;
+                }).collect(Collectors.toList());
+
+                command.addAll(args);
+
+                LOG.info("Executing external processor " + processor.getJar().toString() + ", command line: " + new CommandBuilder().addAll(command).toString());
+                Process process = new ProcessBuilder(command).start();
+                try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
+                    for (String line; (line = reader.readLine()) != null;) {
+                        System.out.println(line);
+                    }
+                }
+                int exitCode = process.waitFor();
+                if (exitCode != 0)
+                    throw new IllegalStateException("Game processor exited abnormally");
+
+                for (Map.Entry<String, String> entry : outputs.entrySet()) {
+                    Path artifact = Paths.get(entry.getKey());
+                    if (!Files.isRegularFile(artifact))
+                        throw new FileNotFoundException("File missing: " + artifact);
+
+                    String code;
+                    try (InputStream stream = Files.newInputStream(artifact)) {
+                        code = encodeHex(digest("SHA-1", stream));
+                    }
+
+                    if (!Objects.equals(code, entry.getValue())) {
+                        Files.delete(artifact);
+                        throw new ChecksumMismatchException("SHA-1", entry.getValue(), code);
+                    }
+                }
+
+                updateProgress(++finished, processors.size());
+            }
+        }
+
+        // resolve the version
+        SimpleVersionProvider provider = new SimpleVersionProvider();
+        provider.addVersion(version);
+
+        setResult(forgeVersion
+                .setInheritsFrom(version.getId())
+                .resolve(provider).setJar(null)
+                .setId(version.getId()).setLogging(Collections.emptyMap()));
+
+        dependencies.add(dependencyManager.checkLibraryCompletionAsync(forgeVersion));
+
+        FileUtils.deleteDirectory(temp.toFile());
+    }
+}

HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeOldInstallTask.java

@@ -0,0 +1,89 @@
+/*
+ * 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.download.forge;
+
+import org.jackhuang.hmcl.download.DefaultDependencyManager;
+import org.jackhuang.hmcl.game.*;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.task.TaskResult;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
+import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.io.IOUtils;
+
+import java.io.*;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+public class ForgeOldInstallTask extends TaskResult<Version> {
+
+    private final DefaultDependencyManager dependencyManager;
+    private final Version version;
+    private final Path installer;
+    private final List<Task> dependencies = new LinkedList<>();
+
+    public ForgeOldInstallTask(DefaultDependencyManager dependencyManager, Version version, Path installer) {
+        this.dependencyManager = dependencyManager;
+        this.version = version;
+        this.installer = installer;
+    }
+
+    @Override
+    public List<Task> getDependencies() {
+        return dependencies;
+    }
+
+    @Override
+    public boolean doPreExecute() {
+        return true;
+    }
+
+    @Override
+    public void execute() throws Exception {
+        try (ZipFile zipFile = new ZipFile(installer.toFile())) {
+            InputStream stream = zipFile.getInputStream(zipFile.getEntry("install_profile.json"));
+            if (stream == null)
+                throw new IOException("Malformed forge installer file, install_profile.json does not exist.");
+            String json = IOUtils.readFullyAsString(stream);
+            ForgeInstallProfile installProfile = JsonUtils.fromNonNullJson(json, ForgeInstallProfile.class);
+
+            // unpack the universal jar in the installer file.
+            Library forgeLibrary = Library.fromName(installProfile.getInstall().getPath());
+            File forgeFile = dependencyManager.getGameRepository().getLibraryFile(version, forgeLibrary);
+            if (!FileUtils.makeFile(forgeFile))
+                throw new IOException("Cannot make directory " + forgeFile.getParent());
+
+            ZipEntry forgeEntry = zipFile.getEntry(installProfile.getInstall().getFilePath());
+            try (InputStream is = zipFile.getInputStream(forgeEntry); OutputStream os = new FileOutputStream(forgeFile)) {
+                IOUtils.copyTo(is, os);
+            }
+
+            // resolve the version
+            SimpleVersionProvider provider = new SimpleVersionProvider();
+            provider.addVersion(version);
+
+            setResult(installProfile.getVersionInfo()
+                    .setInheritsFrom(version.getId())
+                    .resolve(provider).setJar(null)
+                    .setId(version.getId()).setLogging(Collections.emptyMap()));
+
+            dependencies.add(dependencyManager.checkLibraryCompletionAsync(installProfile.getVersionInfo()));
+        }
+    }
+}

HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeVersionList.java

@@ -47,12 +47,11 @@ public final class ForgeVersionList extends VersionList<ForgeRemoteVersion> {
     @Override
     public Task refreshAsync(DownloadProvider downloadProvider) {
         final GetTask task = new GetTask(NetworkUtils.toURL(downloadProvider.injectURL(FORGE_LIST)));
-        final List<Task> dependents = Collections.singletonList(task);
         return new Task() {
 
             @Override
             public Collection<Task> getDependents() {
-                return dependents;
+                return Collections.singleton(task);
             }
 
             @Override

HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameAssetDownloadTask.java

@@ -53,13 +53,13 @@ public final class GameAssetDownloadTask extends Task {
      * @param dependencyManager the dependency manager that can provides {@link org.jackhuang.hmcl.game.GameRepository}
      * @param version the <b>resolved</b> version
      */
-    public GameAssetDownloadTask(AbstractDependencyManager dependencyManager, Version version) {
+    public GameAssetDownloadTask(AbstractDependencyManager dependencyManager, Version version, boolean forceDownloadingIndex) {
         this.dependencyManager = dependencyManager;
         this.version = version;
         this.assetIndexInfo = version.getAssetIndex();
         this.assetIndexFile = dependencyManager.getGameRepository().getIndexFile(version.getId(), assetIndexInfo.getId());
 
-        if (!assetIndexFile.exists())
+        if (!assetIndexFile.exists() || forceDownloadingIndex)
             dependents.add(new GameAssetIndexDownloadTask(dependencyManager, version));
     }
 
@@ -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)
@@ -99,5 +100,7 @@ public final class GameAssetDownloadTask extends Task {
                 updateProgress(++progress, index.getObjects().size());
             }
     }
-    
+
+    public static final boolean DOWNLOAD_INDEX_FORCIBLY = true;
+    public static final boolean DOWNLOAD_INDEX_IF_NECESSARY = false;
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameDownloadTask.java

@@ -55,14 +55,18 @@ public final class GameDownloadTask extends Task {
     @Override
     public void execute() {
         File jar = dependencyManager.getGameRepository().getVersionJar(version);
-        
-        dependencies.add(new FileDownloadTask(
+
+        FileDownloadTask task = new FileDownloadTask(
                 NetworkUtils.toURL(dependencyManager.getDownloadProvider().injectURL(version.getDownloadInfo().getUrl())),
                 jar,
                 IntegrityCheck.of(CacheRepository.SHA1, version.getDownloadInfo().getSha1()))
                 .setCaching(true)
-                .setCacheRepository(dependencyManager.getCacheRepository())
-                .setCandidate(dependencyManager.getCacheRepository().getCommonDirectory().resolve("jars").resolve(gameVersion + ".jar")));
+                .setCacheRepository(dependencyManager.getCacheRepository());
+
+        if (gameVersion != null)
+            task.setCandidate(dependencyManager.getCacheRepository().getCommonDirectory().resolve("jars").resolve(gameVersion + ".jar"));
+
+        dependencies.add(task);
     }
     
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameLibrariesTask.java

@@ -36,6 +36,7 @@ public final class GameLibrariesTask extends Task {
 
     private final AbstractDependencyManager dependencyManager;
     private final Version version;
+    private final List<Library> libraries;
     private final List<Task> dependencies = new LinkedList<>();
 
     /**
@@ -45,8 +46,20 @@ public final class GameLibrariesTask extends Task {
      * @param version the <b>resolved</b> version
      */
     public GameLibrariesTask(AbstractDependencyManager dependencyManager, Version version) {
+        this(dependencyManager, version, version.getLibraries());
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param dependencyManager the dependency manager that can provides {@link org.jackhuang.hmcl.game.GameRepository}
+     * @param version the <b>resolved</b> version
+     */
+    public GameLibrariesTask(AbstractDependencyManager dependencyManager, Version version, List<Library> libraries) {
         this.dependencyManager = dependencyManager;
         this.version = version;
+        this.libraries = libraries;
+
         setSignificance(TaskSignificance.MODERATE);
     }
 
@@ -57,7 +70,7 @@ public final class GameLibrariesTask extends Task {
 
     @Override
     public void execute() {
-        version.getLibraries().stream().filter(Library::appliesToCurrentEnvironment).forEach(library -> {
+        libraries.stream().filter(Library::appliesToCurrentEnvironment).forEach(library -> {
             File file = dependencyManager.getGameRepository().getLibraryFile(version, library);
             if (!file.exists())
                 dependencies.add(new LibraryDownloadTask(dependencyManager, file, library));

HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/LibrariesUniqueTask.java

@@ -33,15 +33,9 @@ import java.util.stream.Collectors;
 
 public class LibrariesUniqueTask extends TaskResult<Version> {
     private final Version version;
-    private final String id;
 
     public LibrariesUniqueTask(Version version) {
-        this(version, "version");
-    }
-
-    public LibrariesUniqueTask(Version version, String id) {
         this.version = version;
-        this.id = id;
     }
 
     @Override
@@ -99,9 +93,4 @@ public class LibrariesUniqueTask extends TaskResult<Version> {
 
         setResult(version.setLibraries(multimap.values().stream().sorted().collect(Collectors.toList())));
     }
-
-    @Override
-    public String getId() {
-        return id;
-    }
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/LibraryDownloadTask.java

@@ -20,6 +20,7 @@ package org.jackhuang.hmcl.download.game;
 import org.jackhuang.hmcl.download.AbstractDependencyManager;
 import org.jackhuang.hmcl.download.DefaultCacheRepository;
 import org.jackhuang.hmcl.game.Library;
+import org.jackhuang.hmcl.task.DownloadException;
 import org.jackhuang.hmcl.task.FileDownloadTask;
 import org.jackhuang.hmcl.task.FileDownloadTask.IntegrityCheck;
 import org.jackhuang.hmcl.task.Task;
@@ -88,10 +89,10 @@ public class LibraryDownloadTask extends Task {
         if (cached) return;
 
         if (!isDependentsSucceeded()) {
-            // Since FileDownloadTask wraps the actual exception with another IOException.
+            // Since FileDownloadTask wraps the actual exception with DownloadException.
             // We should extract it letting the error message clearer.
             Throwable t = task.getLastException();
-            if (t.getCause() != null)
+            if (t instanceof DownloadException)
                 throw new LibraryDownloadException(library, t.getCause());
             else
                 throw new LibraryDownloadException(library, t);
@@ -127,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) {
@@ -224,16 +225,16 @@ public class LibraryDownloadTask extends Task {
         int x = decompressed.length;
         int len = decompressed[(x - 8)] & 0xFF | (decompressed[(x - 7)] & 0xFF) << 8 | (decompressed[(x - 6)] & 0xFF) << 16 | (decompressed[(x - 5)] & 0xFF) << 24;
 
-        File temp = FileUtils.createTempFile("minecraft", ".pack");
+        Path temp = Files.createTempFile("minecraft", ".pack");
 
         byte[] checksums = Arrays.copyOfRange(decompressed, decompressed.length - len - 8, decompressed.length - 8);
 
-        OutputStream out = new FileOutputStream(temp);
-        out.write(decompressed, 0, decompressed.length - len - 8);
-        out.close();
+        try (OutputStream out = Files.newOutputStream(temp)) {
+            out.write(decompressed, 0, decompressed.length - len - 8);
+        }
 
         try (FileOutputStream jarBytes = new FileOutputStream(dest); JarOutputStream jos = new JarOutputStream(jarBytes)) {
-            Pack200.newUnpacker().unpack(temp, jos);
+            Pack200.newUnpacker().unpack(temp.toFile(), jos);
 
             JarEntry checksumsFile = new JarEntry("checksums.sha1");
             checksumsFile.setTime(0L);
@@ -242,6 +243,6 @@ public class LibraryDownloadTask extends Task {
             jos.closeEntry();
         }
 
-        temp.delete();
+        Files.delete(temp);
     }
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/VersionJsonDownloadTask.java

@@ -22,6 +22,7 @@ import org.jackhuang.hmcl.download.RemoteVersion;
 import org.jackhuang.hmcl.download.VersionList;
 import org.jackhuang.hmcl.task.GetTask;
 import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.task.TaskResult;
 import org.jackhuang.hmcl.util.io.NetworkUtils;
 
 import java.util.Collection;
@@ -32,7 +33,7 @@ import java.util.List;
  *
  * @author huangyuhui
  */
-public final class VersionJsonDownloadTask extends Task {
+public final class VersionJsonDownloadTask extends TaskResult<String> {
     private final String gameVersion;
     private final DefaultDependencyManager dependencyManager;
     private final List<Task> dependents = new LinkedList<>();
@@ -65,8 +66,6 @@ public final class VersionJsonDownloadTask extends Task {
         RemoteVersion remoteVersion = gameVersionList.getVersions(gameVersion).stream().findFirst()
                 .orElseThrow(() -> new IllegalStateException("Cannot find specific version " + gameVersion + " in remote repository"));
         String jsonURL = dependencyManager.getDownloadProvider().injectURL(remoteVersion.getUrl());
-        dependencies.add(new GetTask(NetworkUtils.toURL(jsonURL), ID));
+        dependencies.add(new GetTask(NetworkUtils.toURL(jsonURL)).storeTo(this::setResult));
     }
-    
-    public static final String ID = "raw_version_json";
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/VersionJsonSaveTask.java

@@ -19,19 +19,18 @@ package org.jackhuang.hmcl.download.game;
 
 import org.jackhuang.hmcl.game.DefaultGameRepository;
 import org.jackhuang.hmcl.game.Version;
-import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.task.TaskResult;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
 
 import java.io.File;
-import java.io.IOException;
 
 /**
  * This task is to save the version json.
  *
  * @author huangyuhui
  */
-public final class VersionJsonSaveTask extends Task {
+public final class VersionJsonSaveTask extends TaskResult<Version> {
 
     private final DefaultGameRepository repository;
     private final Version version;
@@ -47,13 +46,12 @@ public final class VersionJsonSaveTask extends Task {
         this.version = version;
 
         setSignificance(TaskSignificance.MODERATE);
+        setResult(version);
     }
 
     @Override
     public void execute() throws Exception {
         File json = repository.getVersionJson(version.getId()).getAbsoluteFile();
-        if (!FileUtils.makeFile(json))
-            throw new IOException("Cannot create file " + json);
         FileUtils.writeText(json, JsonUtils.GSON.toJson(version));
     }
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/download/liteloader/LiteLoaderInstallTask.java

@@ -18,7 +18,6 @@
 package org.jackhuang.hmcl.download.liteloader;
 
 import org.jackhuang.hmcl.download.DefaultDependencyManager;
-import org.jackhuang.hmcl.download.game.GameLibrariesTask;
 import org.jackhuang.hmcl.game.LibrariesDownloadInfo;
 import org.jackhuang.hmcl.game.Library;
 import org.jackhuang.hmcl.game.LibraryDownloadInfo;
@@ -61,11 +60,6 @@ public final class LiteLoaderInstallTask extends TaskResult<Version> {
         return dependencies;
     }
 
-    @Override
-    public String getId() {
-        return "version";
-    }
-
     @Override
     public void execute() {
         Library library = new Library(

HMCLCore/src/main/java/org/jackhuang/hmcl/download/optifine/OptiFineInstallTask.java

@@ -59,11 +59,6 @@ public final class OptiFineInstallTask extends TaskResult<Version> {
         return dependencies;
     }
 
-    @Override
-    public String getId() {
-        return "version";
-    }
-
     @Override
     public boolean isRelyingOnDependencies() {
         return false;

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

@@ -0,0 +1,114 @@
+/*
+ * 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.game;
+
+import com.google.gson.*;
+import com.google.gson.annotations.JsonAdapter;
+import org.jackhuang.hmcl.util.Immutable;
+
+import java.lang.reflect.Type;
+import java.nio.file.Path;
+
+@Immutable
+@JsonAdapter(Artifact.Serializer.class)
+public final class Artifact {
+
+    private final String group;
+    private final String name;
+    private final String version;
+    private final String classifier;
+    private final String extension;
+
+    private final String descriptor;
+    private final String fileName;
+    private final String path;
+
+    public Artifact(String descriptor) {
+        this.descriptor = descriptor;
+
+        String[] arr = descriptor.split(":", 4);
+        if (arr.length != 3 && arr.length != 4)
+            throw new IllegalArgumentException("Artifact name is malformed");
+
+        String ext = null;
+        int last = arr.length - 1;
+        String[] splitted = arr[last].split("@");
+        if (splitted.length == 2) {
+            arr[last] = splitted[0];
+            ext = splitted[1];
+        } else if (splitted.length > 2) {
+            throw new IllegalArgumentException("Artifact name is malformed");
+        }
+
+        this.group = arr[0].replace("\\", "/");
+        this.name = arr[1];
+        this.version = arr[2];
+        this.classifier = arr.length >= 4 ? arr[3] : null;
+        this.extension = ext == null ? "jar" : ext;
+
+        String fileName = this.name + "-" + this.version;
+        if (classifier != null) fileName += "-" + this.classifier;
+        this.fileName = fileName + "." + this.extension;
+        this.path = String.format("%s/%s/%s/%s", this.group.replace(".", "/"), this.name, this.version, this.fileName);
+    }
+
+    public String getGroup() {
+        return group;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public String getClassifier() {
+        return classifier;
+    }
+
+    public String getExtension() {
+        return extension;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public Path getPath(Path root) {
+        return root.resolve(path);
+    }
+
+    @Override
+    public String toString() {
+        return descriptor;
+    }
+
+    public static class Serializer implements JsonDeserializer<Artifact>, JsonSerializer<Artifact> {
+        @Override
+        public JsonElement serialize(Artifact src, Type typeOfSrc, JsonSerializationContext context) {
+            return src == null ? JsonNull.INSTANCE : new JsonPrimitive(src.toString());
+        }
+
+        @Override
+        public Artifact deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+            return json.isJsonPrimitive() ? new Artifact(json.getAsJsonPrimitive().getAsString()) : null;
+        }
+    }
+}

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

@@ -1,38 +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.game;
-
-/**
- * What's circle dependency?
- * When C inherits from B, and B inherits from something else, and finally inherits from C again.
- *
- * @author huangyuhui
- */
-public final class CircleDependencyException extends GameException {
-
-    public CircleDependencyException() {
-    }
-
-    public CircleDependencyException(String message) {
-        super(message);
-    }
-
-    public CircleDependencyException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}

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

@@ -20,18 +20,19 @@ package org.jackhuang.hmcl.game;
 import com.google.gson.JsonParseException;
 import org.jackhuang.hmcl.event.*;
 import org.jackhuang.hmcl.mod.ModManager;
-import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.ToStringBuilder;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Path;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.stream.Stream;
 
+import static org.jackhuang.hmcl.util.Logging.LOG;
+
 /**
  * An implementation of classic Minecraft game repository.
  *
@@ -81,6 +82,10 @@ public class DefaultGameRepository implements GameRepository {
         return new File(getBaseDirectory(), "libraries/" + lib.getPath());
     }
 
+    public Path getArtifactFile(Version version, Artifact artifact) {
+        return artifact.getPath(getBaseDirectory().toPath().resolve("libraries"));
+    }
+
     @Override
     public File getRunDirectory(String id) {
         return getBaseDirectory();
@@ -112,7 +117,7 @@ public class DefaultGameRepository implements GameRepository {
     }
 
     public Version readVersionJson(File file) throws IOException, JsonParseException {
-        return JsonUtils.GSON.fromJson(FileUtils.readText(file), Version.class);
+        return JsonUtils.fromNonNullJson(FileUtils.readText(file), Version.class);
     }
 
     @Override
@@ -163,21 +168,21 @@ public class DefaultGameRepository implements GameRepository {
 
         versions.remove(id);
 
-        if (FileUtils.isMovingToTrashSupported()) {
-            return FileUtils.moveToTrash(removedFile);
+        if (FileUtils.isMovingToTrashSupported() && FileUtils.moveToTrash(removedFile)) {
+            return true;
         }
 
         // remove json files first to ensure HMCL will not recognize this folder as a valid version.
         List<File> jsons = FileUtils.listFilesByExtension(removedFile, "json");
         jsons.forEach(f -> {
             if (!f.delete())
-                Logging.LOG.warning("Unable to delete file " + f);
+                LOG.warning("Unable to delete file " + f);
         });
         // remove the version from version list regardless of whether the directory was removed successfully or not.
         try {
             FileUtils.deleteDirectory(removedFile);
         } catch (IOException e) {
-            Logging.LOG.log(Level.WARNING, "Unable to remove version folder: " + file, e);
+            LOG.log(Level.WARNING, "Unable to remove version folder: " + file, e);
         }
         return true;
     }
@@ -202,25 +207,31 @@ public class DefaultGameRepository implements GameRepository {
                 // we will find the only json and rename it to correct name.
                 if (!json.exists()) {
                     List<File> jsons = FileUtils.listFilesByExtension(dir, "json");
-                    if (jsons.size() == 1)
+                    if (jsons.size() == 1) {
+                        LOG.info("Renaming json file " + jsons.get(0) + " to " + json);
                         if (!jsons.get(0).renameTo(json)) {
-                            Logging.LOG.warning("Cannot rename json file " + jsons.get(0) + " to " + json + ", ignoring version " + id);
+                            LOG.warning("Cannot rename json file, ignoring version " + id);
                             return Stream.empty();
                         }
+                    } else {
+                        LOG.info("No available json file found, ignoring version " + id);
+                        return Stream.empty();
+                    }
                 }
 
                 Version version;
                 try {
-                    version = Objects.requireNonNull(readVersionJson(json));
+                    version = readVersionJson(json);
                 } catch (Exception e) {
+                    LOG.log(Level.WARNING, "Malformed version json " + id, e);
                     // JsonSyntaxException or IOException or NullPointerException(!!)
                     if (EventBus.EVENT_BUS.fireEvent(new GameJsonParseFailedEvent(this, json, id)) != Event.Result.ALLOW)
                         return Stream.empty();
 
                     try {
-                        version = Objects.requireNonNull(readVersionJson(json));
+                        version = readVersionJson(json);
                     } catch (Exception e2) {
-                        Logging.LOG.log(Level.SEVERE, "User corrected version json is still malformed");
+                        LOG.log(Level.SEVERE, "User corrected version json is still malformed", e2);
                         return Stream.empty();
                     }
                 }
@@ -230,7 +241,7 @@ public class DefaultGameRepository implements GameRepository {
                     try {
                         FileUtils.writeText(json, JsonUtils.GSON.toJson(version));
                     } catch (Exception e) {
-                        Logging.LOG.log(Level.WARNING, "Ignoring version " + id + " because wrong id " + version.getId() + " is set and cannot correct it.");
+                        LOG.log(Level.WARNING, "Ignoring version " + id + " because wrong id " + version.getId() + " is set and cannot correct it.", e);
                         return Stream.empty();
                     }
                 }
@@ -246,7 +257,7 @@ public class DefaultGameRepository implements GameRepository {
                         EventBus.EVENT_BUS.fireEvent(new LoadedOneVersionEvent(this, resolved)) != Event.Result.DENY)
                     versions.put(version.getId(), version);
             } catch (VersionNotFoundException e) {
-                Logging.LOG.log(Level.WARNING, "Ignoring version " + version.getId() + " because it inherits from a nonexistent version.");
+                LOG.log(Level.WARNING, "Ignoring version " + version.getId() + " because it inherits from a nonexistent version.");
             }
         }
 
@@ -258,10 +269,8 @@ public class DefaultGameRepository implements GameRepository {
         if (EventBus.EVENT_BUS.fireEvent(new RefreshingVersionsEvent(this)) == Event.Result.DENY)
             return;
 
-        Schedulers.newThread().schedule(() -> {
-            refreshVersionsImpl();
-            EventBus.EVENT_BUS.fireEvent(new RefreshedVersionsEvent(this));
-        });
+        refreshVersionsImpl();
+        EventBus.EVENT_BUS.fireEvent(new RefreshedVersionsEvent(this));
     }
 
     @Override
@@ -278,7 +287,7 @@ public class DefaultGameRepository implements GameRepository {
         try {
             return reconstructAssets(version, assetId);
         } catch (IOException | JsonParseException e) {
-            Logging.LOG.log(Level.SEVERE, "Unable to reconstruct asset directory", e);
+            LOG.log(Level.SEVERE, "Unable to reconstruct asset directory", e);
             return getAssetDirectory(version, assetId);
         }
     }

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

@@ -22,6 +22,7 @@ import com.google.gson.annotations.SerializedName;
 import org.jackhuang.hmcl.util.Immutable;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.ToStringBuilder;
+import org.jackhuang.hmcl.util.gson.TolerableValidationException;
 import org.jackhuang.hmcl.util.gson.Validation;
 
 /**
@@ -74,8 +75,8 @@ public class DownloadInfo implements Validation {
     }
 
     @Override
-    public void validate() throws JsonParseException {
+    public void validate() throws JsonParseException, TolerableValidationException {
         if (StringUtils.isBlank(url))
-            throw new JsonParseException("DownloadInfo url can not be null");
+            throw new TolerableValidationException();
     }
 }

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

@@ -17,7 +17,13 @@
  */
 package org.jackhuang.hmcl.game;
 
+import static org.jackhuang.hmcl.util.Logging.LOG;
+
+import com.google.gson.JsonParseException;
+import com.google.gson.annotations.SerializedName;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.CompressingUtils;
+import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jenkinsci.constant_pool_scanner.ConstantPool;
 import org.jenkinsci.constant_pool_scanner.ConstantPoolScanner;
 import org.jenkinsci.constant_pool_scanner.ConstantType;
@@ -30,6 +36,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Optional;
+import java.util.logging.Level;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
@@ -37,6 +44,16 @@ import java.util.stream.StreamSupport;
  * @author huangyuhui
  */
 public final class GameVersion {
+    private static Optional<String> getVersionFromJson(Path versionJson) {
+        try {
+            MinecraftVersion version = JsonUtils.fromNonNullJson(FileUtils.readText(versionJson), MinecraftVersion.class);
+            return Optional.ofNullable(version.name);
+        } catch (IOException | JsonParseException e) {
+            LOG.log(Level.WARNING, "Failed to parse version.json", e);
+            return Optional.empty();
+        }
+    }
+
     private static Optional<String> getVersionOfClassMinecraft(byte[] bytecode) throws IOException {
         ConstantPool pool = ConstantPoolScanner.parse(bytecode, ConstantType.STRING);
 
@@ -74,6 +91,13 @@ public final class GameVersion {
             return Optional.empty();
 
         try (FileSystem gameJar = CompressingUtils.createReadOnlyZipFileSystem(file.toPath())) {
+            Path versionJson = gameJar.getPath("version.json");
+            if (Files.exists(versionJson)) {
+                Optional<String> result = getVersionFromJson(versionJson);
+                if (result.isPresent())
+                    return result;
+            }
+
             Path minecraft = gameJar.getPath("net/minecraft/client/Minecraft.class");
             if (Files.exists(minecraft)) {
                 Optional<String> result = getVersionOfClassMinecraft(Files.readAllBytes(minecraft));
@@ -88,4 +112,24 @@ public final class GameVersion {
             return Optional.empty();
         }
     }
+
+    private static final class MinecraftVersion {
+        public String name;
+
+        @SerializedName("release_target")
+        public String releaseTarget;
+
+        public String id;
+
+        public boolean stable;
+
+        @SerializedName("world_version")
+        public int worldVersion;
+
+        @SerializedName("protocol_version")
+        public int protocolVersion;
+
+        @SerializedName("pack_version")
+        public int packVersion;
+    }
 }

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

@@ -21,6 +21,7 @@ import com.google.gson.JsonParseException;
 import com.google.gson.annotations.SerializedName;
 import org.jackhuang.hmcl.util.Immutable;
 import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.gson.TolerableValidationException;
 
 /**
  *
@@ -54,7 +55,7 @@ public class IdDownloadInfo extends DownloadInfo {
     }
 
     @Override
-    public void validate() throws JsonParseException {
+    public void validate() throws JsonParseException, TolerableValidationException {
         super.validate();
 
         if (StringUtils.isBlank(id))

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

@@ -45,13 +45,13 @@ public class Library implements Comparable<Library> {
     private final String classifier;
     private final String url;
     private final LibrariesDownloadInfo downloads;
-    private final LibraryDownloadInfo download;
+    private transient final LibraryDownloadInfo download;
     private final ExtractRules extract;
     private final Map<OperatingSystem, String> natives;
     private final List<CompatibilityRule> rules;
     private final List<String> checksums;
 
-    private final String path;
+    private transient final String path;
 
     public Library(String groupId, String artifactId, String version) {
         this(groupId, artifactId, version, null, null, null);

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

@@ -20,6 +20,7 @@ package org.jackhuang.hmcl.game;
 import com.google.gson.JsonParseException;
 import com.google.gson.annotations.SerializedName;
 import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.gson.TolerableValidationException;
 import org.jackhuang.hmcl.util.gson.Validation;
 
 /**
@@ -66,7 +67,7 @@ public final class LoggingInfo implements Validation {
     }
 
     @Override
-    public void validate() throws JsonParseException {
+    public void validate() throws JsonParseException, TolerableValidationException {
         file.validate();
         if (StringUtils.isBlank(argument))
             throw new JsonParseException("LoggingInfo.argument is empty.");

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/CurseCompletionTask.java

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