Add some task test

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）：
 * 游戏崩溃报告（如果有）：
 * 启动器崩溃报告（如果有）：
-* 启动器日志文件（在启动器设置中打开日志文件夹并将文件夹内所有文件打包发在这里）：
-* 问题描述（如何触发问题）：
+* 启动器日志文件（出现问题后点击启动器设置中的【导出启动器日志】按钮）：
+* 问题描述（如何触发问题）：

.gitignore

@@ -33,4 +33,4 @@ NVIDIA
 .settings
 
 # netbeans
-.nb-gradle
+.nb-gradle

HMCL/build.gradle

@@ -110,6 +110,24 @@ def createExecutable(String suffix, String header) {
     createChecksum(output)
 }
 
+processResources {
+    ext.convertToBSS = { String 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")
+            bssFile.parentFile.mkdirs()
+            exec {
+                commandLine 'javapackager', '-createbss', '-outdir', bssFile.parent, '-srcfiles', cssFile.path
+            }
+        }
+    }
+    from "build/compiled-resources"
+
+    convertToBSS "assets/css/root.css"
+    convertToBSS "assets/css/blue.css"
+}
+
 task makePack(dependsOn: jar) {
     ext.outputPath = new File(jar.archivePath.parentFile, jar.archivePath.name[0..-4] + "pack")
     doLast {

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,11 +13,11 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 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;
@@ -49,25 +49,28 @@ public final class Launcher extends Application {
         Thread.currentThread().setUncaughtExceptionHandler(CRASH_REPORTER);
 
         try {
-            ConfigHolder.init();
-        } catch (IOException e) {
-            Main.showErrorAndExit(i18n("fatal.config_loading_failure", Paths.get("").toAbsolutePath().normalize()));
+            try {
+                ConfigHolder.init();
+            } catch (IOException e) {
+                Main.showErrorAndExit(i18n("fatal.config_loading_failure", Paths.get("").toAbsolutePath().normalize()));
+            }
+
+            // runLater to ensure ConfigHolder.init() finished initialization
+            Platform.runLater(() -> {
+                // When launcher visibility is set to "hide and reopen" without Platform.implicitExit = false,
+                // Stage.show() cannot work again because JavaFX Toolkit have already shut down.
+                Platform.setImplicitExit(false);
+                Controllers.initialize(primaryStage);
+                primaryStage.setResizable(false);
+                primaryStage.setScene(Controllers.getScene());
+
+                UpdateChecker.init();
+
+                primaryStage.show();
+            });
+        } catch (Throwable e) {
+            CRASH_REPORTER.uncaughtException(Thread.currentThread(), e);
         }
-
-        // runLater to ensure ConfigHolder.init() finished initialization
-        Platform.runLater(() -> {
-            // When launcher visibility is set to "hide and reopen" without Platform.implicitExit = false,
-            // Stage.show() cannot work again because JavaFX Toolkit have already shut down.
-            Platform.setImplicitExit(false);
-            Controllers.initialize(primaryStage);
-            primaryStage.setResizable(false);
-            primaryStage.setScene(Controllers.getScene());
-
-            UpdateChecker.init();
-
-            primaryStage.show();
-        });
-
     }
 
     public static void main(String[] args) {

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl;
 
@@ -31,6 +31,7 @@ import java.security.NoSuchAlgorithmException;
 import java.security.cert.X509Certificate;
 import java.util.logging.Level;
 
+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;
 
@@ -39,10 +40,13 @@ public final class Main {
     public static void main(String[] args) {
         System.setProperty("java.net.useSystemProxies", "true");
         System.setProperty("http.agent", "HMCL/" + Metadata.VERSION);
+        System.setProperty("javafx.autoproxy.disable", "true");
 
         checkJavaFX();
         checkDirectoryPath();
-        checkDSTRootCAX3();
+
+        // This environment check will take ~300ms
+        thread(() -> checkDSTRootCAX3(), "CA Certificate Check", true);
 
         Logging.start(Metadata.HMCL_DIRECTORY.resolve("logs"));
 

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl;
 

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

@@ -1,188 +0,0 @@
-/*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
- * 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 {http://www.gnu.org/licenses/}.
- */
-package org.jackhuang.hmcl.game;
-
-import javafx.embed.swing.SwingFXUtils;
-import javafx.scene.image.Image;
-import org.jackhuang.hmcl.Metadata;
-import org.jackhuang.hmcl.auth.Account;
-import org.jackhuang.hmcl.auth.yggdrasil.GameProfile;
-import org.jackhuang.hmcl.auth.yggdrasil.Texture;
-import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
-import org.jackhuang.hmcl.setting.Accounts;
-import org.jackhuang.hmcl.task.FileDownloadTask;
-import org.jackhuang.hmcl.task.Scheduler;
-import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.ui.DialogController;
-import org.jackhuang.hmcl.util.io.NetworkUtils;
-
-import java.awt.Graphics2D;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.util.*;
-
-public final class AccountHelper {
-
-    private AccountHelper() {}
-
-    public static final File SKIN_DIR = Metadata.HMCL_DIRECTORY.resolve("skins").toFile();
-
-    public static void loadSkins() {
-        for (Account account : Accounts.getAccounts()) {
-            if (account instanceof YggdrasilAccount) {
-                new SkinLoadTask((YggdrasilAccount) account, false).start();
-            }
-        }
-    }
-
-    public static Task loadSkinAsync(YggdrasilAccount account) {
-        return new SkinLoadTask(account, false);
-    }
-
-    public static Task refreshSkinAsync(YggdrasilAccount account) {
-        return new SkinLoadTask(account, true);
-    }
-
-    private static File getSkinFile(UUID uuid) {
-        return new File(SKIN_DIR, uuid + ".png");
-    }
-
-    public static Image getSkin(YggdrasilAccount account) {
-        return getSkin(account, 1);
-    }
-
-    public static Image getSkin(YggdrasilAccount account, double scaleRatio) {
-        UUID uuid = account.getUUID();
-        if (uuid == null)
-            return getSteveSkin(scaleRatio);
-
-        File file = getSkinFile(uuid);
-        if (file.exists()) {
-            Image original = new Image("file:" + file.getAbsolutePath());
-            return new Image("file:" + file.getAbsolutePath(),
-                    original.getWidth() * scaleRatio,
-                    original.getHeight() * scaleRatio,
-                    false, false);
-        }
-        return getDefaultSkin(uuid, scaleRatio);
-    }
-
-    public static Image getSkinImmediately(YggdrasilAccount account, GameProfile profile, double scaleRatio) throws Exception {
-        File file = getSkinFile(profile.getId());
-        downloadSkin(account, profile, true);
-        if (!file.exists())
-            return getDefaultSkin(profile.getId(), scaleRatio);
-
-        String url = "file:" + file.getAbsolutePath();
-        return scale(url, scaleRatio);
-    }
-
-    public static Image getHead(Image skin, int scaleRatio) {
-        final int size = 8 * scaleRatio;
-        final int faceOffset = (int) Math.round(scaleRatio * 4d / 9d);
-        BufferedImage image = SwingFXUtils.fromFXImage(skin, null);
-        BufferedImage head = new BufferedImage(size, size, BufferedImage.TYPE_INT_ARGB);
-        Graphics2D g2d = head.createGraphics();
-        g2d.drawImage(image, faceOffset, faceOffset, size - faceOffset, size - faceOffset,
-                size, size, size + size, size + size, null);
-        if (image.getHeight() > 32) {
-            g2d.drawImage(image, 0, 0, size, size,
-                    40 * scaleRatio, 8 * scaleRatio, 48 * scaleRatio, 16 * scaleRatio, null);
-        }
-        return SwingFXUtils.toFXImage(head, null);
-    }
-
-    private static class SkinLoadTask extends Task {
-        private final YggdrasilAccount account;
-        private final boolean refresh;
-        private final List<Task> dependencies = new LinkedList<>();
-
-        public SkinLoadTask(YggdrasilAccount account, boolean refresh) {
-            this.account = account;
-            this.refresh = refresh;
-        }
-
-        @Override
-        public Scheduler getScheduler() {
-            return Schedulers.io();
-        }
-
-        @Override
-        public Collection<Task> getDependencies() {
-            return dependencies;
-        }
-
-        @Override
-        public void execute() throws Exception {
-            if (!account.isLoggedIn() && (account.getCharacter() == null || refresh))
-                DialogController.logIn(account);
-
-            downloadSkin(account, refresh);
-        }
-    }
-
-    private static void downloadSkin(YggdrasilAccount account, GameProfile profile, boolean refresh) throws Exception {
-        account.clearCache();
-
-        File file = getSkinFile(profile.getId());
-        if (!refresh && file.exists())
-            return;
-        Optional<Texture> texture = account.getSkin(profile);
-        if (!texture.isPresent()) return;
-        String url = texture.get().getUrl();
-        new FileDownloadTask(NetworkUtils.toURL(url), file).run();
-    }
-
-    private static void downloadSkin(YggdrasilAccount account, boolean refresh) throws Exception {
-        account.clearCache();
-
-        if (account.getCharacter() == null) return;
-        File file = getSkinFile(account.getUUID());
-        if (!refresh && file.exists())
-            return;
-        Optional<Texture> texture = account.getSkin();
-        if (!texture.isPresent()) return;
-        String url = texture.get().getUrl();
-        new FileDownloadTask(NetworkUtils.toURL(url), file).run();
-    }
-
-    public static Image scale(String url, double scaleRatio) {
-        Image origin = new Image(url);
-        return new Image(url,
-                origin.getWidth() * scaleRatio,
-                origin.getHeight() * scaleRatio,
-                false, false);
-    }
-
-    public static Image getSteveSkin(double scaleRatio) {
-        return scale("/assets/img/steve.png", scaleRatio);
-    }
-
-    public static Image getAlexSkin(double scaleRatio) {
-        return scale("/assets/img/alex.png", scaleRatio);
-    }
-
-    public static Image getDefaultSkin(UUID uuid, double scaleRatio) {
-        int type = uuid.hashCode() & 1;
-        if (type == 1)
-            return getAlexSkin(scaleRatio);
-        else
-            return getSteveSkin(scaleRatio);
-    }
-}

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

@@ -1,3 +1,20 @@
+/*
+ * 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 javafx.beans.property.SimpleStringProperty;

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.game;
 

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,19 +13,15 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 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.Settings;
 import org.jackhuang.hmcl.setting.VersionSetting;
 import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.io.FileUtils;
@@ -81,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();
@@ -169,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");
     }
@@ -227,8 +218,8 @@ public class HMCLGameRepository extends DefaultGameRepository {
         beingModpackVersions.remove(id);
     }
 
-    private static final Gson GSON = new GsonBuilder().setPrettyPrinting()
-            .registerTypeAdapter(VersionSetting.class, VersionSetting.Serializer.INSTANCE)
+    private static final Gson GSON = new GsonBuilder()
+            .setPrettyPrinting()
             .create();
 
     private static final HashSet<String> FORBIDDEN = new HashSet<>(Arrays.asList("modpack", "minecraftinstance", "manifest"));

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.game;
 
@@ -30,7 +30,7 @@ import java.util.List;
 /**
  * Export the game to a mod pack file.
  */
-public class HMCLModpackExportTask extends Task {
+public class HMCLModpackExportTask extends Task<Void> {
     private final DefaultGameRepository repository;
     private final String version;
     private final List<String> whitelist;

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.game;
 
@@ -36,13 +36,13 @@ import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
 
-public final class HMCLModpackInstallTask extends Task {
+public final class HMCLModpackInstallTask extends Task<Void> {
     private final File zipFile;
     private final String name;
     private final HMCLGameRepository repository;
     private final Modpack modpack;
-    private final List<Task> dependencies = new LinkedList<>();
-    private final List<Task> dependents = new LinkedList<>();
+    private final List<Task<?>> dependencies = new LinkedList<>();
+    private final List<Task<?>> dependents = new LinkedList<>();
 
     public HMCLModpackInstallTask(Profile profile, File zipFile, Modpack modpack, String name) {
         DependencyManager dependency = profile.getDependency();
@@ -73,16 +73,16 @@ public final class HMCLModpackInstallTask extends Task {
             }
         } catch (JsonParseException | IOException ignore) {
         }
-        dependents.add(new ModpackInstallTask<>(zipFile, run, "/minecraft", it -> !"pack.json".equals(it), config));
+        dependents.add(new ModpackInstallTask<>(zipFile, run, modpack.getEncoding(), "/minecraft", it -> !"pack.json".equals(it), config));
     }
 
     @Override
-    public List<Task> getDependencies() {
+    public List<Task<?>> getDependencies() {
         return dependencies;
     }
 
     @Override
-    public List<Task> getDependents() {
+    public List<Task<?>> getDependents() {
         return dependents;
     }
 
@@ -91,7 +91,7 @@ public final class HMCLModpackInstallTask extends Task {
         String json = CompressingUtils.readTextZipEntry(zipFile, "minecraft/pack.json");
         Version version = JsonUtils.GSON.fromJson(json, Version.class).setId(name).setJar(null);
         dependencies.add(new VersionJsonSaveTask(repository, version));
-        dependencies.add(new MinecraftInstanceTask<>(zipFile, "/minecraft", modpack, MODPACK_TYPE, repository.getModpackConfiguration(name)));
+        dependencies.add(new MinecraftInstanceTask<>(zipFile, modpack.getEncoding(), "/minecraft", modpack, MODPACK_TYPE, repository.getModpackConfiguration(name)));
     }
 
     public static final String MODPACK_TYPE = "HMCL";

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.game;
 
@@ -24,8 +24,9 @@ import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.CompressingUtils;
 
-import java.io.File;
 import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.file.Path;
 import java.util.List;
 
 /**
@@ -75,14 +76,15 @@ public final class HMCLModpackManager {
      * Read the manifest in a HMCL modpack.
      *
      * @param file a HMCL modpack file.
+     * @param encoding encoding of modpack zip file.
      * @throws IOException if the file is not a valid zip file.
      * @throws JsonParseException if the manifest.json is missing or malformed.
      * @return the manifest of HMCL modpack.
      */
-    public static Modpack readHMCLModpackManifest(File file) throws IOException, JsonParseException {
-        String manifestJson = CompressingUtils.readTextZipEntry(file, "modpack.json");
-        Modpack manifest = JsonUtils.fromNonNullJson(manifestJson, Modpack.class);
-        String gameJson = CompressingUtils.readTextZipEntry(file, "minecraft/pack.json");
+    public static Modpack readHMCLModpackManifest(Path file, Charset encoding) throws IOException, JsonParseException {
+        String manifestJson = CompressingUtils.readTextZipEntry(file, "modpack.json", encoding);
+        Modpack manifest = JsonUtils.fromNonNullJson(manifestJson, Modpack.class).setEncoding(encoding);
+        String gameJson = CompressingUtils.readTextZipEntry(file, "minecraft/pack.json", encoding);
         Version game = JsonUtils.fromNonNullJson(gameJson, Version.class);
         if (game.getJar() == null)
             if (StringUtils.isBlank(manifest.getVersion()))

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.game;
 

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.game;
 
@@ -30,7 +30,6 @@ import org.jackhuang.hmcl.launch.*;
 import org.jackhuang.hmcl.mod.CurseCompletionException;
 import org.jackhuang.hmcl.mod.CurseCompletionTask;
 import org.jackhuang.hmcl.mod.ModpackConfiguration;
-import org.jackhuang.hmcl.setting.Accounts;
 import org.jackhuang.hmcl.setting.LauncherVisibility;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.VersionSetting;
@@ -39,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;
@@ -63,6 +62,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.util.Lang.mapOf;
+import static org.jackhuang.hmcl.util.Logging.LOG;
 import static org.jackhuang.hmcl.util.Pair.pair;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
@@ -102,7 +102,7 @@ public final class LauncherHelper {
             try {
                 checkGameState(profile, setting, version, () -> {
                     Controllers.dialog(launchingStepsPane);
-                    Schedulers.newThread().schedule(this::launch0);
+                    Schedulers.newThread().execute(this::launch0);
                 });
             } catch (InterruptedException ignore) {
             }
@@ -121,15 +121,15 @@ public final class LauncherHelper {
         Version version = MaintainTask.maintain(repository.getResolvedVersion(selectedVersion));
         Optional<String> gameVersion = GameVersion.minecraftVersion(repository.getVersionJar(version));
 
-        TaskExecutor executor = Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.DEPENDENCIES))
-                .then(variables -> {
+        TaskExecutor executor = Task.runAsync(Schedulers.javafx(), () -> emitStatus(LoadingState.DEPENDENCIES))
+                .thenCompose(() -> {
                     if (setting.isNotCheckGame())
                         return null;
                     else
                         return dependencyManager.checkGameCompletionAsync(version);
                 })
-                .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.MODS)))
-                .then(var -> {
+                .thenRun(Schedulers.javafx(), () -> emitStatus(LoadingState.MODS))
+                .thenCompose(() -> {
                     try {
                         ModpackConfiguration<?> configuration = ModpackHelper.readModpackConfiguration(repository.getModpackConfiguration(selectedVersion));
                         if ("Curse".equals(configuration.getType()))
@@ -140,43 +140,43 @@ public final class LauncherHelper {
                         return null;
                     }
                 })
-                .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.LOGGING_IN)))
-                .then(Task.of(i18n("account.methods"), variables -> {
+                .thenRun(Schedulers.javafx(), () -> emitStatus(LoadingState.LOGGING_IN))
+                .thenSupply(i18n("account.methods"), () -> {
                     try {
-                        variables.set("account", account.logIn());
+                        return account.logIn();
                     } catch (CredentialExpiredException e) {
-                        variables.set("account", DialogController.logIn(account));
+                        LOG.info("Credential has expired: " + e);
+                        return DialogController.logIn(account);
                     } catch (AuthenticationException e) {
-                        variables.set("account",
-                                account.playOffline().orElseThrow(() -> e));
+                        LOG.warning("Authentication failed, try playing offline: " + 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, 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();
@@ -185,21 +185,21 @@ 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);
+        launchingStepsPane.setExecutor(executor, false);
         executor.addTaskListener(new TaskListener() {
             final AtomicInteger finished = new AtomicInteger(0);
 
             @Override
-            public void onFinished(Task task) {
+            public void onFinished(Task<?> task) {
                 finished.incrementAndGet();
                 int runningTasks = executor.getRunningTasks();
                 Platform.runLater(() -> launchingStepsPane.setProgress(1.0 * finished.get() / runningTasks));
@@ -213,7 +213,7 @@ public final class LauncherHelper {
                         // because onStop will be invoked if tasks fail when the executor service shut down.
                         if (!Controllers.isStopped()) {
                             launchingStepsPane.fireEvent(new DialogCloseEvent());
-                            Exception ex = executor.getLastException();
+                            Exception ex = executor.getException();
                             if (ex != null) {
                                 String message;
                                 if (ex instanceof CurseCompletionException) {
@@ -234,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);
                             }
                         }
                     });
@@ -247,6 +247,11 @@ public final class LauncherHelper {
     }
 
     private static void checkGameState(Profile profile, VersionSetting setting, Version version, Runnable onAccept) throws InterruptedException {
+        if (setting.isNotCheckJVM()) {
+            onAccept.run();
+            return;
+        }
+
         boolean flag = false;
         boolean java8required = false;
         boolean newJavaRequired = false;
@@ -256,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();
@@ -275,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;
             }
@@ -294,8 +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"), MessageType.INFORMATION, onAccept);
+                flag = true;
             } else {
-                Controllers.dialog(i18n("launch.advice.java9"), 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;
             }
         }
@@ -310,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;
             }
         }
@@ -342,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;
             }
         }
@@ -352,23 +359,25 @@ 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;
         }
 
-        // Forge 2760 and above will crash game with LiteLoader.
+        // Forge 2760~2773 will crash game with LiteLoader.
         if (!flag) {
             boolean hasForge2760 = version.getLibraries().stream().filter(it -> it.is("net.minecraftforge", "forge"))
-                    .anyMatch(it -> VersionNumber.VERSION_COMPARATOR.compare(it.getVersion(), "1.12.2-14.23.5.2760") >= 0);
+                    .anyMatch(it ->
+                            VersionNumber.VERSION_COMPARATOR.compare("1.12.2-14.23.5.2760", it.getVersion()) <= 0 &&
+                                    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;
             }
         }
@@ -407,7 +416,7 @@ public final class LauncherHelper {
         }
     }
 
-    private static class LaunchTask<T> extends TaskResult<T> {
+    private static class LaunchTask<T> extends Task<T> {
         private final ExceptionalSupplier<T, Exception> supplier;
 
         public LaunchTask(ExceptionalSupplier<T, Exception> supplier) {
@@ -418,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";
     }
 
     /**
@@ -434,7 +436,6 @@ public final class LauncherHelper {
      */
     class HMCLProcessListener implements ProcessListener {
 
-        private final VersionSetting setting;
         private final Map<String, String> forbiddenTokens;
         private ManagedProcess process;
         private boolean lwjgl;
@@ -443,8 +444,7 @@ public final class LauncherHelper {
         private final LinkedList<Pair<String, Log4jLevel>> logs;
         private final CountDownLatch latch = new CountDownLatch(1);
 
-        public HMCLProcessListener(AuthInfo authInfo, VersionSetting setting, boolean detectWindow) {
-            this.setting = setting;
+        public HMCLProcessListener(AuthInfo authInfo, boolean detectWindow) {
             this.detectWindow = detectWindow;
 
             if (authInfo == null)

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.game;
 

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.game;
 

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.game;
 
@@ -23,35 +23,39 @@ import org.jackhuang.hmcl.mod.*;
 import org.jackhuang.hmcl.setting.EnumGameDirectory;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.VersionSetting;
-import org.jackhuang.hmcl.task.FinalizedCallback;
+import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.function.ExceptionalConsumer;
+import org.jackhuang.hmcl.util.function.ExceptionalRunnable;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.file.Path;
 import java.util.Optional;
 
 public final class ModpackHelper {
     private ModpackHelper() {}
 
-    public static Modpack readModpackManifest(File file) throws UnsupportedModpackException {
+    public static Modpack readModpackManifest(Path file, Charset charset) throws UnsupportedModpackException {
         try {
-            return CurseManifest.readCurseForgeModpackManifest(file);
+            return CurseManifest.readCurseForgeModpackManifest(file, charset);
         } catch (Exception e) {
             // ignore it, not a valid CurseForge modpack.
         }
 
         try {
-            return HMCLModpackManager.readHMCLModpackManifest(file);
+            return HMCLModpackManager.readHMCLModpackManifest(file, charset);
         } catch (Exception e) {
             // ignore it, not a valid HMCL modpack.
         }
 
         try {
-            return MultiMCInstanceConfiguration.readMultiMCModpackManifest(file);
+            return MultiMCInstanceConfiguration.readMultiMCModpackManifest(file, charset);
         } catch (Exception e) {
             // ignore it, not a valid MultiMC modpack.
         }
@@ -82,52 +86,60 @@ public final class ModpackHelper {
             throw new UnsupportedModpackException();
     }
 
-    public static Task getInstallTask(Profile profile, File zipFile, String name, Modpack modpack) {
+    public static Task<Void> getInstallTask(Profile profile, File zipFile, String name, Modpack modpack) {
         profile.getRepository().markVersionAsModpack(name);
 
-        FinalizedCallback finalizeTask = (variables, isDependentsSucceeded) -> {
-            if (isDependentsSucceeded) {
+        ExceptionalRunnable<?> success = () -> {
+            HMCLGameRepository repository = profile.getRepository();
+            repository.refreshVersions();
+            VersionSetting vs = repository.specializeVersionSetting(name);
+            repository.undoMark(name);
+            if (vs != null)
+                vs.setGameDirType(EnumGameDirectory.VERSION_FOLDER);
+        };
+
+        ExceptionalConsumer<Exception, ?> failure = ex -> {
+            if (ex instanceof CurseCompletionException && !(ex.getCause() instanceof FileNotFoundException)) {
+                success.run();
+                // This is tolerable and we will not delete the game
+            } else {
                 HMCLGameRepository repository = profile.getRepository();
-                repository.refreshVersions();
-                VersionSetting vs = repository.specializeVersionSetting(name);
-                repository.undoMark(name);
-                if (vs != null)
-                    vs.setGameDirType(EnumGameDirectory.VERSION_FOLDER);
+                repository.removeVersionFromDisk(name);
             }
         };
 
         if (modpack.getManifest() instanceof CurseManifest)
-            return new CurseInstallTask(profile.getDependency(), zipFile, ((CurseManifest) modpack.getManifest()), name)
-                    .finalized(finalizeTask);
+            return new CurseInstallTask(profile.getDependency(), zipFile, modpack, ((CurseManifest) modpack.getManifest()), name)
+                    .whenComplete(Schedulers.defaultScheduler(), success, failure);
         else if (modpack.getManifest() instanceof HMCLModpackManifest)
             return new HMCLModpackInstallTask(profile, zipFile, modpack, name)
-                    .finalized(finalizeTask);
+                    .whenComplete(Schedulers.defaultScheduler(), success, failure);
         else if (modpack.getManifest() instanceof MultiMCInstanceConfiguration)
-            return new MultiMCModpackInstallTask(profile.getDependency(), zipFile, ((MultiMCInstanceConfiguration) modpack.getManifest()), name)
-                    .finalized(finalizeTask)
-                    .then(new MultiMCInstallVersionSettingTask(profile, ((MultiMCInstanceConfiguration) modpack.getManifest()), name));
+            return new MultiMCModpackInstallTask(profile.getDependency(), zipFile, modpack, ((MultiMCInstanceConfiguration) modpack.getManifest()), name)
+                    .whenComplete(Schedulers.defaultScheduler(), success, failure)
+                    .thenCompose(new MultiMCInstallVersionSettingTask(profile, ((MultiMCInstanceConfiguration) modpack.getManifest()), name));
         else throw new IllegalStateException("Unrecognized modpack: " + modpack);
     }
 
-    public static Task getUpdateTask(Profile profile, File zipFile, String name, ModpackConfiguration<?> configuration) throws UnsupportedModpackException, MismatchedModpackTypeException {
-        Modpack modpack = ModpackHelper.readModpackManifest(zipFile);
+    public static Task<Void> getUpdateTask(Profile profile, File zipFile, Charset charset, String name, ModpackConfiguration<?> configuration) throws UnsupportedModpackException, MismatchedModpackTypeException {
+        Modpack modpack = ModpackHelper.readModpackManifest(zipFile.toPath(), charset);
 
         switch (configuration.getType()) {
             case CurseInstallTask.MODPACK_TYPE:
                 if (!(modpack.getManifest() instanceof CurseManifest))
                     throw new MismatchedModpackTypeException(CurseInstallTask.MODPACK_TYPE, getManifestType(modpack.getManifest()));
 
-                return new CurseInstallTask(profile.getDependency(), zipFile, (CurseManifest) modpack.getManifest(), name);
+                return new ModpackUpdateTask(profile.getRepository(), name, new CurseInstallTask(profile.getDependency(), zipFile, modpack, (CurseManifest) modpack.getManifest(), name));
             case MultiMCModpackInstallTask.MODPACK_TYPE:
                 if (!(modpack.getManifest() instanceof MultiMCInstanceConfiguration))
                     throw new MismatchedModpackTypeException(MultiMCModpackInstallTask.MODPACK_TYPE, getManifestType(modpack.getManifest()));
 
-                return new MultiMCModpackInstallTask(profile.getDependency(), zipFile, (MultiMCInstanceConfiguration) modpack.getManifest(), name);
+                return new ModpackUpdateTask(profile.getRepository(), name, new MultiMCModpackInstallTask(profile.getDependency(), zipFile, modpack, (MultiMCInstanceConfiguration) modpack.getManifest(), name));
             case HMCLModpackInstallTask.MODPACK_TYPE:
                 if (!(modpack.getManifest() instanceof HMCLModpackManifest))
                     throw new MismatchedModpackTypeException(HMCLModpackInstallTask.MODPACK_TYPE, getManifestType(modpack.getManifest()));
 
-                return new HMCLModpackInstallTask(profile, zipFile, modpack, name);
+                return new ModpackUpdateTask(profile.getRepository(), name, new HMCLModpackInstallTask(profile, zipFile, modpack, name));
             default:
                 throw new UnsupportedModpackException();
         }

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,20 +13,19 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.game;
 
 import org.jackhuang.hmcl.mod.MultiMCInstanceConfiguration;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.VersionSetting;
-import org.jackhuang.hmcl.task.Scheduler;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 
 import java.util.Objects;
 
-public final class MultiMCInstallVersionSettingTask extends Task {
+public final class MultiMCInstallVersionSettingTask extends Task<Void> {
     private final Profile profile;
     private final MultiMCInstanceConfiguration manifest;
     private final String version;
@@ -35,11 +34,8 @@ public final class MultiMCInstallVersionSettingTask extends Task {
         this.profile = profile;
         this.manifest = manifest;
         this.version = version;
-    }
 
-    @Override
-    public Scheduler getScheduler() {
-        return Schedulers.javafx();
+        setExecutor(Schedulers.javafx());
     }
 
     @Override

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

@@ -0,0 +1,221 @@
+/*
+ * 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 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;
+
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UncheckedIOException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+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;
+
+import javax.imageio.ImageIO;
+
+import org.jackhuang.hmcl.Metadata;
+import org.jackhuang.hmcl.auth.Account;
+import org.jackhuang.hmcl.auth.ServerResponseMalformedException;
+import org.jackhuang.hmcl.auth.yggdrasil.Texture;
+import org.jackhuang.hmcl.auth.yggdrasil.TextureModel;
+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.StringUtils;
+import org.jackhuang.hmcl.util.javafx.BindingMapping;
+
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.ObjectBinding;
+import javafx.embed.swing.SwingFXUtils;
+import javafx.scene.image.Image;
+
+/**
+ * @author yushijinhun
+ */
+public final class TexturesLoader {
+
+    private TexturesLoader() {
+    }
+
+    // ==== Texture Loading ====
+    public static class LoadedTexture {
+        private final BufferedImage image;
+        private final Map<String, String> metadata;
+
+        public LoadedTexture(BufferedImage image, Map<String, String> metadata) {
+            this.image = requireNonNull(image);
+            this.metadata = requireNonNull(metadata);
+        }
+
+        public BufferedImage getImage() {
+            return image;
+        }
+
+        public Map<String, String> getMetadata() {
+            return metadata;
+        }
+    }
+
+    private static final ThreadPoolExecutor POOL = threadPool("TexturesDownload", true, 2, 10, TimeUnit.SECONDS);
+    private static final Path TEXTURES_DIR = Metadata.MINECRAFT_DIRECTORY.resolve("assets").resolve("skins");
+
+    private static Path getTexturePath(Texture texture) {
+        String url = texture.getUrl();
+        int slash = url.lastIndexOf('/');
+        int dot = url.lastIndexOf('.');
+        if (dot < slash) {
+            dot = url.length();
+        }
+        String hash = url.substring(slash + 1, dot);
+        String prefix = hash.length() > 2 ? hash.substring(0, 2) : "xx";
+        return TEXTURES_DIR.resolve(prefix).resolve(hash);
+    }
+
+    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
+            try {
+                new FileDownloadTask(new URL(texture.getUrl()), file.toFile()).run();
+                LOG.info("Texture downloaded: " + texture.getUrl());
+            } catch (Exception e) {
+                if (Files.isRegularFile(file)) {
+                    // concurrency conflict?
+                    LOG.log(Level.WARNING, "Failed to download texture " + texture.getUrl() + ", but the file is available", e);
+                } else {
+                    throw new IOException("Failed to download texture " + texture.getUrl());
+                }
+            }
+        }
+
+        BufferedImage img;
+        try (InputStream in = Files.newInputStream(file)) {
+            img = ImageIO.read(in);
+        }
+        Map<String, String> metadata = texture.getMetadata();
+        if (metadata == null) {
+            metadata = emptyMap();
+        }
+        return new LoadedTexture(img, metadata);
+    }
+    // ====
+
+    // ==== Skins ====
+    private final static Map<TextureModel, LoadedTexture> DEFAULT_SKINS = new EnumMap<>(TextureModel.class);
+    static {
+        loadDefaultSkin("/assets/img/steve.png", TextureModel.STEVE);
+        loadDefaultSkin("/assets/img/alex.png", TextureModel.ALEX);
+    }
+    private static void loadDefaultSkin(String path, TextureModel model) {
+        try (InputStream in = TexturesLoader.class.getResourceAsStream(path)) {
+            DEFAULT_SKINS.put(model, new LoadedTexture(ImageIO.read(in), singletonMap("model", model.modelName)));
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    public static LoadedTexture getDefaultSkin(TextureModel model) {
+        return DEFAULT_SKINS.get(model);
+    }
+
+    public static ObjectBinding<LoadedTexture> skinBinding(YggdrasilService service, UUID uuid) {
+        LoadedTexture uuidFallback = getDefaultSkin(TextureModel.detectUUID(uuid));
+        return BindingMapping.of(service.getProfileRepository().binding(uuid))
+                .map(profile -> profile
+                        .flatMap(it -> {
+                            try {
+                                return YggdrasilService.getTextures(it);
+                            } catch (ServerResponseMalformedException e) {
+                                LOG.log(Level.WARNING, "Failed to parse texture payload", e);
+                                return Optional.empty();
+                            }
+                        })
+                        .flatMap(it -> Optional.ofNullable(it.get(TextureType.SKIN)))
+                        .filter(it -> StringUtils.isNotBlank(it.getUrl())))
+                .asyncMap(it -> {
+                    if (it.isPresent()) {
+                        Texture texture = it.get();
+                        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 CompletableFuture.completedFuture(uuidFallback);
+                    }
+                }, uuidFallback);
+    }
+    // ====
+
+    // ==== Avatar ====
+    public static BufferedImage toAvatar(BufferedImage skin, int size) {
+        BufferedImage avatar = new BufferedImage(size, size, BufferedImage.TYPE_INT_ARGB);
+        Graphics2D g = avatar.createGraphics();
+
+        int scale = skin.getWidth() / 64;
+        int faceOffset = (int) Math.round(size / 18.0);
+        g.drawImage(skin,
+                faceOffset, faceOffset, size - faceOffset, size - faceOffset,
+                8 * scale, 8 * scale, 16 * 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 BindingMapping.of(skinBinding(service, uuid))
+                .map(it -> toAvatar(it.image, size))
+                .map(img -> SwingFXUtils.toFXImage(img, null));
+    }
+
+    public static ObjectBinding<Image> fxAvatarBinding(Account account, int size) {
+        if (account instanceof YggdrasilAccount) {
+            return fxAvatarBinding(((YggdrasilAccount) account).getYggdrasilService(), account.getUUID(), size);
+        } else {
+            return Bindings.createObjectBinding(
+                    () -> SwingFXUtils.toFXImage(toAvatar(getDefaultSkin(TextureModel.detectUUID(account.getUUID())).image, size), null));
+        }
+    }
+    // ====
+}

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.setting;
 
@@ -29,16 +29,19 @@ import org.jackhuang.hmcl.auth.AccountFactory;
 import org.jackhuang.hmcl.auth.AuthenticationException;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccountFactory;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorArtifactProvider;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDownloader;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
+import org.jackhuang.hmcl.auth.authlibinjector.SimpleAuthlibInjectorArtifactProvider;
 import org.jackhuang.hmcl.auth.offline.OfflineAccount;
 import org.jackhuang.hmcl.auth.offline.OfflineAccountFactory;
-import org.jackhuang.hmcl.auth.yggdrasil.MojangYggdrasilProvider;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccountFactory;
 import org.jackhuang.hmcl.task.Schedulers;
 
 import java.io.IOException;
+import java.nio.file.Paths;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.logging.Level;
@@ -59,37 +62,40 @@ public final class Accounts {
     private Accounts() {}
 
     public static final OfflineAccountFactory FACTORY_OFFLINE = OfflineAccountFactory.INSTANCE;
-    public static final YggdrasilAccountFactory FACTORY_YGGDRASIL = new YggdrasilAccountFactory(MojangYggdrasilProvider.INSTANCE);
-    public static final AuthlibInjectorAccountFactory FACTORY_AUTHLIB_INJECTOR = new AuthlibInjectorAccountFactory(
-            new AuthlibInjectorDownloader(Metadata.HMCL_DIRECTORY, DownloadProviders::getDownloadProvider)::getArtifactInfo,
-            Accounts::getOrCreateAuthlibInjectorServer);
+    public static final YggdrasilAccountFactory FACTORY_MOJANG = YggdrasilAccountFactory.MOJANG;
+    public static final AuthlibInjectorAccountFactory FACTORY_AUTHLIB_INJECTOR = new AuthlibInjectorAccountFactory(createAuthlibInjectorArtifactProvider(), Accounts::getOrCreateAuthlibInjectorServer);
 
-    private static final String TYPE_OFFLINE = "offline";
-    private static final String TYPE_YGGDRASIL_ACCOUNT = "yggdrasil";
-    private static final String TYPE_AUTHLIB_INJECTOR = "authlibInjector";
+    // ==== login type / account factory mapping ====
+    private static final Map<String, AccountFactory<?>> type2factory = new HashMap<>();
+    private static final Map<AccountFactory<?>, String> factory2type = new HashMap<>();
+    static {
+        type2factory.put("offline", FACTORY_OFFLINE);
+        type2factory.put("yggdrasil", FACTORY_MOJANG);
+        type2factory.put("authlibInjector", FACTORY_AUTHLIB_INJECTOR);
 
-    private static Map<String, AccountFactory<?>> type2factory = mapOf(
-            pair(TYPE_OFFLINE, FACTORY_OFFLINE),
-            pair(TYPE_YGGDRASIL_ACCOUNT, FACTORY_YGGDRASIL),
-            pair(TYPE_AUTHLIB_INJECTOR, FACTORY_AUTHLIB_INJECTOR));
-
-    private static String accountType(Account account) {
-        if (account instanceof OfflineAccount)
-            return TYPE_OFFLINE;
-        else if (account instanceof AuthlibInjectorAccount)
-            return TYPE_AUTHLIB_INJECTOR;
-        else if (account instanceof YggdrasilAccount)
-            return TYPE_YGGDRASIL_ACCOUNT;
-        else
-            throw new IllegalArgumentException("Failed to determine account type: " + account);
+        type2factory.forEach((type, factory) -> factory2type.put(factory, type));
     }
 
+    public static String getLoginType(AccountFactory<?> factory) {
+        return Optional.ofNullable(factory2type.get(factory))
+                .orElseThrow(() -> new IllegalArgumentException("Unrecognized account factory"));
+    }
+
+    public static AccountFactory<?> getAccountFactory(String loginType) {
+        return Optional.ofNullable(type2factory.get(loginType))
+                .orElseThrow(() -> new IllegalArgumentException("Unrecognized login type"));
+    }
+    // ====
+
     public static AccountFactory<?> getAccountFactory(Account account) {
-        return type2factory.get(accountType(account));
-    }
-
-    static String accountId(Account account) {
-        return account.getUsername() + ":" + account.getCharacter();
+        if (account instanceof OfflineAccount)
+            return FACTORY_OFFLINE;
+        else if (account instanceof AuthlibInjectorAccount)
+            return FACTORY_AUTHLIB_INJECTOR;
+        else if (account instanceof YggdrasilAccount)
+            return FACTORY_MOJANG;
+        else
+            throw new IllegalArgumentException("Failed to determine account type: " + account);
     }
 
     private static ObservableList<Account> accounts = observableArrayList(account -> new Observable[] { account });
@@ -126,7 +132,7 @@ public final class Accounts {
             // selection is valid, store it
             if (!initialized)
                 return;
-            config().setSelectedAccount(selected == null ? "" : accountId(selected));
+            updateAccountStorages();
         }
     };
 
@@ -139,9 +145,12 @@ public final class Accounts {
         accounts.addListener(onInvalidating(Accounts::updateAccountStorages));
     }
 
-    static Map<Object, Object> getAccountStorage(Account account) {
+    private static Map<Object, Object> getAccountStorage(Account account) {
         Map<Object, Object> storage = account.toStorage();
-        storage.put("type", accountType(account));
+        storage.put("type", getLoginType(getAccountFactory(account)));
+        if (account == selectedAccount.get()) {
+            storage.put("selected", true);
+        }
         return storage;
     }
 
@@ -176,27 +185,38 @@ public final class Accounts {
                 return;
             }
             accounts.add(account);
+
+            if (Boolean.TRUE.equals(storage.get("selected"))) {
+                selectedAccount.set(account);
+            }
         });
 
         initialized = true;
 
         config().getAuthlibInjectorServers().addListener(onInvalidating(Accounts::removeDanglingAuthlibInjectorAccounts));
 
-        // load selected account
-        Account selected = accounts.stream()
-                .filter(it -> accountId(it).equals(config().getSelectedAccount()))
-                .findFirst()
-                .orElse(null);
-        selectedAccount.set(selected);
-
-        Schedulers.io().schedule(() -> {
-            if (selected != null)
+        Account selected = selectedAccount.get();
+        if (selected != null) {
+            Schedulers.io().execute(() -> {
                 try {
                     selected.logIn();
                 } catch (AuthenticationException e) {
                     LOG.log(Level.WARNING, "Failed to log " + selected + " in", e);
                 }
-        });
+            });
+        }
+
+        for (AuthlibInjectorServer server : config().getAuthlibInjectorServers()) {
+            if (selected instanceof AuthlibInjectorAccount && ((AuthlibInjectorAccount) selected).getServer() == server)
+                continue;
+            Schedulers.io().execute(() -> {
+                try {
+                    server.fetchMetadataResponse();
+                } catch (IOException e) {
+                    LOG.log(Level.WARNING, "Failed to fetch authlib-injector server metdata: " + server, e);
+                }
+            });
+        }
     }
 
     public static ObservableList<Account> getAccounts() {
@@ -220,21 +240,22 @@ public final class Accounts {
     }
 
     // ==== authlib-injector ====
+    private static AuthlibInjectorArtifactProvider createAuthlibInjectorArtifactProvider() {
+        String authlibinjectorLocation = System.getProperty("hmcl.authlibinjector.location");
+        if (authlibinjectorLocation == null) {
+            return new AuthlibInjectorDownloader(Metadata.HMCL_DIRECTORY, DownloadProviders::getDownloadProvider);
+        } else {
+            LOG.info("Using specified authlib-injector: " + authlibinjectorLocation);
+            return new SimpleAuthlibInjectorArtifactProvider(Paths.get(authlibinjectorLocation));
+        }
+    }
+
     private static AuthlibInjectorServer getOrCreateAuthlibInjectorServer(String url) {
         return config().getAuthlibInjectorServers().stream()
                 .filter(server -> url.equals(server.getUrl()))
                 .findFirst()
                 .orElseGet(() -> {
-                    // this usually happens when migrating data from an older version
-                    AuthlibInjectorServer server;
-                    try {
-                        server = AuthlibInjectorServer.fetchServerInfo(url);
-                        LOG.info("Migrated authlib injector server " + server);
-                    } catch (IOException e) {
-                        server = new AuthlibInjectorServer(url, url);
-                        LOG.log(Level.WARNING, "Failed to migrate authlib injector server " + url, e);
-                    }
-
+                    AuthlibInjectorServer server = new AuthlibInjectorServer(url);
                     config().getAuthlibInjectorServers().add(server);
                     return server;
                 });
@@ -255,18 +276,14 @@ public final class Accounts {
     // ====
 
     // ==== Login type name i18n ===
-    private static Map<AccountFactory<?>, String> loginType2name = mapOf(
-            pair(Accounts.FACTORY_OFFLINE, i18n("account.methods.offline")),
-            pair(Accounts.FACTORY_YGGDRASIL, i18n("account.methods.yggdrasil")),
-            pair(Accounts.FACTORY_AUTHLIB_INJECTOR, i18n("account.methods.authlib_injector")));
+    private static Map<AccountFactory<?>, String> unlocalizedLoginTypeNames = mapOf(
+            pair(Accounts.FACTORY_OFFLINE, "account.methods.offline"),
+            pair(Accounts.FACTORY_MOJANG, "account.methods.yggdrasil"),
+            pair(Accounts.FACTORY_AUTHLIB_INJECTOR, "account.methods.authlib_injector"));
 
-    public static String getAccountTypeName(AccountFactory<?> factory) {
-        return Optional.ofNullable(loginType2name.get(factory))
-                .orElseThrow(() -> new IllegalArgumentException("No corresponding login type name"));
-    }
-
-    public static String getAccountTypeName(Account account) {
-        return getAccountTypeName(getAccountFactory(account));
+    public static String getLocalizedLoginTypeName(AccountFactory<?> factory) {
+        return i18n(Optional.ofNullable(unlocalizedLoginTypeNames.get(factory))
+                .orElseThrow(() -> new IllegalArgumentException("Unrecognized account factory")));
     }
     // ====
 }

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.setting;
 
@@ -40,36 +40,37 @@ import org.jackhuang.hmcl.util.gson.FileTypeAdapter;
 import org.jackhuang.hmcl.util.i18n.Locales;
 import org.jackhuang.hmcl.util.i18n.Locales.SupportedLocale;
 import org.jackhuang.hmcl.util.javafx.ObservableHelper;
+import org.jackhuang.hmcl.util.javafx.PropertyUtils;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
-import java.lang.reflect.Modifier;
 import java.net.Proxy;
 import java.util.Map;
 import java.util.TreeMap;
-import java.util.stream.Stream;
 
 public final class Config implements Cloneable, Observable {
 
+    public static final int CURRENT_UI_VERSION = 0;
+
     private static final Gson CONFIG_GSON = new GsonBuilder()
-            .registerTypeAdapter(VersionSetting.class, VersionSetting.Serializer.INSTANCE)
-            .registerTypeAdapter(Profile.class, Profile.Serializer.INSTANCE)
             .registerTypeAdapter(File.class, FileTypeAdapter.INSTANCE)
             .registerTypeAdapter(ObservableList.class, new ObservableListCreator())
             .registerTypeAdapter(ObservableSet.class, new ObservableSetCreator())
             .registerTypeAdapter(ObservableMap.class, new ObservableMapCreator())
             .registerTypeAdapterFactory(new JavaFxPropertyTypeAdapterFactory(true, true))
-            .registerTypeAdapter(Theme.class, new Theme.TypeAdapter())
-            .registerTypeAdapter(SupportedLocale.class, new SupportedLocale.TypeAdapter())
             .registerTypeAdapter(EnumBackgroundImage.class, new EnumOrdinalDeserializer<>(EnumBackgroundImage.class)) // backward compatibility for backgroundType
             .registerTypeAdapter(Proxy.Type.class, new EnumOrdinalDeserializer<>(Proxy.Type.class)) // backward compatibility for hasProxy
             .setPrettyPrinting()
             .create();
 
+    @Nullable
     public static Config fromJson(String json) throws JsonParseException {
-        Config instance = CONFIG_GSON.fromJson(json, Config.class);
-        // Gson will replace the property fields (even they are final!)
-        // So we have to add the listeners again after deserialization
-        instance.addListenerToProperties();
+        Config loaded = CONFIG_GSON.fromJson(json, Config.class);
+        if (loaded == null) {
+            return null;
+        }
+        Config instance = new Config();
+        PropertyUtils.copyProperties(loaded, instance);
         return instance;
     }
 
@@ -101,7 +102,7 @@ public final class Config implements Cloneable, Observable {
     private StringProperty proxyHost = new SimpleStringProperty();
 
     @SerializedName("proxyPort")
-    private StringProperty proxyPort = new SimpleStringProperty();
+    private IntegerProperty proxyPort = new SimpleIntegerProperty();
 
     @SerializedName("proxyUserName")
     private StringProperty proxyUser = new SimpleStringProperty();
@@ -124,9 +125,6 @@ public final class Config implements Cloneable, Observable {
     @SerializedName("accounts")
     private ObservableList<Map<Object, Object>> accountStorages = FXCollections.observableArrayList();
 
-    @SerializedName("selectedAccount")
-    private StringProperty selectedAccount = new SimpleStringProperty("");
-
     @SerializedName("fontFamily")
     private StringProperty fontFamily = new SimpleStringProperty("Consolas");
 
@@ -137,7 +135,7 @@ public final class Config implements Cloneable, Observable {
     private IntegerProperty logLines = new SimpleIntegerProperty(100);
 
     @SerializedName("authlibInjectorServers")
-    private ObservableList<AuthlibInjectorServer> authlibInjectorServers = FXCollections.observableArrayList();
+    private ObservableList<AuthlibInjectorServer> authlibInjectorServers = FXCollections.observableArrayList(server -> new Observable[] { server });
 
     @SerializedName("updateChannel")
     private ObjectProperty<UpdateChannel> updateChannel = new SimpleObjectProperty<>(UpdateChannel.STABLE);
@@ -145,30 +143,26 @@ public final class Config implements Cloneable, Observable {
     @SerializedName("_version")
     private IntegerProperty configVersion = new SimpleIntegerProperty(0);
 
+    /**
+     * The version of UI that the user have last used.
+     * If there is a major change in UI, {@link Config#CURRENT_UI_VERSION} should be increased.
+     * When {@link #CURRENT_UI_VERSION} is higher than the property, the user guide should be shown,
+     * then this property is set to the same value as {@link #CURRENT_UI_VERSION}.
+     * In particular, the property is default to 0, so that whoever open the application for the first time will see the guide.
+     */
     @SerializedName("uiVersion")
     private IntegerProperty uiVersion = new SimpleIntegerProperty(0);
 
+    /**
+     * The preferred login type to use when the user wants to add an account.
+     */
+    @SerializedName("preferredLoginType")
+    private StringProperty preferredLoginType = new SimpleStringProperty();
+
     private transient ObservableHelper helper = new ObservableHelper(this);
 
     public Config() {
-        addListenerToProperties();
-    }
-
-    private void addListenerToProperties() {
-        Stream.of(getClass().getDeclaredFields())
-                .filter(it -> {
-                    int modifiers = it.getModifiers();
-                    return !Modifier.isTransient(modifiers) && !Modifier.isStatic(modifiers);
-                })
-                .filter(it -> Observable.class.isAssignableFrom(it.getType()))
-                .map(it -> {
-                    try {
-                        return (Observable) it.get(this);
-                    } catch (IllegalAccessException e) {
-                        throw new IllegalStateException("Failed to get my own properties");
-                    }
-                })
-                .forEach(helper::receiveUpdatesFrom);
+        PropertyUtils.attachListener(this, helper);
     }
 
     @Override
@@ -299,15 +293,15 @@ public final class Config implements Cloneable, Observable {
         return proxyHost;
     }
 
-    public String getProxyPort() {
+    public int getProxyPort() {
         return proxyPort.get();
     }
 
-    public void setProxyPort(String proxyPort) {
+    public void setProxyPort(int proxyPort) {
         this.proxyPort.set(proxyPort);
     }
 
-    public StringProperty proxyPortProperty() {
+    public IntegerProperty proxyPortProperty() {
         return proxyPort;
     }
 
@@ -379,18 +373,6 @@ public final class Config implements Cloneable, Observable {
         return accountStorages;
     }
 
-    public String getSelectedAccount() {
-        return selectedAccount.get();
-    }
-
-    public void setSelectedAccount(String selectedAccount) {
-        this.selectedAccount.set(selectedAccount);
-    }
-
-    public StringProperty selectedAccountProperty() {
-        return selectedAccount;
-    }
-
     public String getFontFamily() {
         return fontFamily.get();
     }
@@ -466,4 +448,16 @@ public final class Config implements Cloneable, Observable {
     public void setUiVersion(int uiVersion) {
         this.uiVersion.set(uiVersion);
     }
+
+    public String getPreferredLoginType() {
+        return preferredLoginType.get();
+    }
+
+    public void setPreferredLoginType(String preferredLoginType) {
+        this.preferredLoginType.set(preferredLoginType);
+    }
+
+    public StringProperty preferredLoginTypeProperty() {
+        return preferredLoginType;
+    }
 }

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,12 +13,16 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.setting;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonParseException;
+import org.jackhuang.hmcl.util.InvocationDispatcher;
+import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -27,10 +31,6 @@ import java.nio.file.Paths;
 import java.util.Map;
 import java.util.logging.Level;
 
-import org.jackhuang.hmcl.util.InvocationDispatcher;
-import org.jackhuang.hmcl.util.Lang;
-import org.jackhuang.hmcl.util.platform.OperatingSystem;
-
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.jackhuang.hmcl.util.Logging.LOG;
 
@@ -52,13 +52,6 @@ public final class ConfigHolder {
         return configInstance;
     }
 
-    public static boolean isNewlyCreated() {
-        if (configInstance == null) {
-            throw new IllegalStateException("Configuration hasn't been loaded");
-        }
-        return newlyCreated;
-    }
-
     public synchronized static void init() throws IOException {
         if (configInstance != null) {
             throw new IllegalStateException("Configuration is already loaded");
@@ -106,7 +99,7 @@ public final class ConfigHolder {
     private static Config loadConfig() throws IOException {
         if (Files.exists(configLocation)) {
             try {
-                String content = new String(Files.readAllBytes(configLocation), UTF_8);
+                String content = FileUtils.readText(configLocation);
                 Config deserialized = Config.fromJson(content);
                 if (deserialized == null) {
                     LOG.info("Config is empty");

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,17 +13,12 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.setting;
 
-import org.jackhuang.hmcl.auth.offline.OfflineAccount;
-import org.jackhuang.hmcl.auth.offline.OfflineAccountFactory;
 import org.jackhuang.hmcl.util.StringUtils;
-import org.jackhuang.hmcl.util.gson.UUIDTypeAdapter;
-
-import java.util.LinkedList;
-import java.util.List;
+import java.util.HashMap;
 import java.util.Map;
 
 import static org.jackhuang.hmcl.util.Lang.tryCast;
@@ -67,20 +62,21 @@ final class ConfigUpgrader {
         // Convert OfflineAccounts whose stored uuid is important.
         tryCast(rawJson.get("auth"), Map.class).ifPresent(auth -> {
             tryCast(auth.get("offline"), Map.class).ifPresent(offline -> {
-                List<OfflineAccount> accounts = new LinkedList<>();
+                String selected = rawJson.containsKey("selectedAccount") ? null
+                        : tryCast(offline.get("IAuthenticator_UserName"), String.class).orElse(null);
+
                 tryCast(offline.get("uuidMap"), Map.class).ifPresent(uuidMap -> {
                     ((Map<?, ?>) uuidMap).forEach((key, value) -> {
-                        OfflineAccount account = OfflineAccountFactory.INSTANCE.create((String) key, UUIDTypeAdapter.fromString((String) value));
-                        accounts.add(account);
-                        deserialized.getAccountStorages().add(Accounts.getAccountStorage(account));
+                        Map<Object, Object> storage = new HashMap<>();
+                        storage.put("type", "offline");
+                        storage.put("username", key);
+                        storage.put("uuid", value);
+                        if (key.equals(selected)) {
+                            storage.put("selected", true);
+                        }
+                        deserialized.getAccountStorages().add(storage);
                     });
                 });
-
-                tryCast(offline.get("IAuthenticator_UserName"), String.class).ifPresent(selected -> {
-                    if (!rawJson.containsKey("selectedAccount"))
-                        accounts.stream().filter(account -> selected.equals(account.getUsername())).findAny().ifPresent(account ->
-                                deserialized.setSelectedAccount(Accounts.accountId(account)));
-                });
             });
         });
     }
@@ -112,5 +108,22 @@ final class ConfigUpgrader {
                         }
                     });
         }
+
+        tryCast(rawJson.get("selectedAccount"), String.class)
+                .ifPresent(selected -> {
+                    deserialized.getAccountStorages().stream()
+                            .filter(storage -> {
+                                Object type = storage.get("type");
+                                if ("offline".equals(type)) {
+                                    return selected.equals(storage.get("username") + ":" + storage.get("username"));
+                                } else if ("yggdrasil".equals(type) || "authlibInjector".equals(type)) {
+                                    return selected.equals(storage.get("username") + ":" + storage.get("displayName"));
+                                } else {
+                                    return false;
+                                }
+                            })
+                            .findFirst()
+                            .ifPresent(storage -> storage.put("selected", true));
+                });
     }
 }

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.setting;
 

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.setting;
 

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.setting;
 

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.setting;
 

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.setting;
 

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui
+ * 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
@@ -13,12 +13,13 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.setting;
 
 import com.google.gson.*;
-import com.jfoenix.concurrency.JFXUtilities;
+import com.google.gson.annotations.JsonAdapter;
+import com.jfoenix.utils.JFXUtilities;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
@@ -30,11 +31,8 @@ import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
 import org.jackhuang.hmcl.game.HMCLCacheRepository;
 import org.jackhuang.hmcl.game.HMCLGameRepository;
 import org.jackhuang.hmcl.game.Version;
-import org.jackhuang.hmcl.mod.ModManager;
 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;
@@ -47,10 +45,10 @@ import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
  *
  * @author huangyuhui
  */
+@JsonAdapter(Profile.Serializer.class)
 public final class Profile implements Observable {
     private final WeakListenerHolder listenerHolder = new WeakListenerHolder();
     private final HMCLGameRepository repository;
-    private final ModManager modManager;
 
     private final StringProperty selectedVersion = new SimpleStringProperty();
 
@@ -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,10 +129,9 @@ 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);
-        modManager = new ModManager(repository);
         this.global.set(global == null ? new VersionSetting() : global);
         this.selectedVersion.set(selectedVersion);
         this.useRelativePath.set(useRelativePath);
@@ -164,10 +161,6 @@ public final class Profile implements Observable {
         return repository;
     }
 
-    public ModManager getModManager() {
-        return modManager;
-    }
-
     public DefaultDependencyManager getDependency() {
         return new DefaultDependencyManager(repository, DownloadProviders.getDownloadProvider(), HMCLCacheRepository.REPOSITORY);
     }
@@ -217,11 +210,6 @@ public final class Profile implements Observable {
     }
 
     public static final class Serializer implements JsonSerializer<Profile>, JsonDeserializer<Profile> {
-        public static final Serializer INSTANCE = new Serializer();
-
-        private Serializer() {
-        }
-
         @Override
         public JsonElement serialize(Profile src, Type typeOfSrc, JsonSerializationContext context) {
             if (src == null)

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,11 +13,11 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 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/ProxyManager.java

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,14 +13,13 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.setting;
 
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.ObjectBinding;
 import javafx.beans.value.ObservableObjectValue;
-import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.StringUtils;
 
 import java.net.Authenticator;
@@ -30,6 +29,7 @@ import java.net.Proxy;
 import java.net.Proxy.Type;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.util.Logging.LOG;
 
 public final class ProxyManager {
     private ProxyManager() {
@@ -49,10 +49,14 @@ public final class ProxyManager {
         proxyProperty = Bindings.createObjectBinding(
                 () -> {
                     String host = config().getProxyHost();
-                    Integer port = Lang.toIntOrNull(config().getProxyPort());
-                    if (!config().hasProxy() || StringUtils.isBlank(host) || port == null || config().getProxyType() == Proxy.Type.DIRECT) {
+                    int port = config().getProxyPort();
+                    if (!config().hasProxy() || StringUtils.isBlank(host) || config().getProxyType() == Proxy.Type.DIRECT) {
                         return Proxy.NO_PROXY;
                     } else {
+                        if (port < 0 || port > 0xFFFF) {
+                            LOG.warning("Illegal proxy port: " + port);
+                            return Proxy.NO_PROXY;
+                        }
                         return new Proxy(config().getProxyType(), new InetSocketAddress(host, port));
                     }
                 },

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.setting;
 
@@ -21,9 +21,7 @@ import javafx.beans.binding.Bindings;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.game.HMCLCacheRepository;
 import org.jackhuang.hmcl.util.CacheRepository;
-
-import java.nio.file.InvalidPathException;
-import java.nio.file.Paths;
+import org.jackhuang.hmcl.util.io.FileUtils;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 
@@ -53,11 +51,9 @@ public class Settings {
 
         CacheRepository.setInstance(HMCLCacheRepository.REPOSITORY);
         HMCLCacheRepository.REPOSITORY.directoryProperty().bind(Bindings.createStringBinding(() -> {
-            String str = getCommonDirectory();
-            try {
-                Paths.get(str);
-                return str;
-            } catch (InvalidPathException e) {
+            if (FileUtils.canCreateDirectory(getCommonDirectory())) {
+                return getCommonDirectory();
+            } else {
                 return getDefaultCommonDirectory();
             }
         }, config().commonDirectoryProperty(), config().commonDirTypeProperty()));

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,10 +13,11 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.setting;
 
+import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import javafx.beans.binding.Bindings;
@@ -26,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;
@@ -34,6 +36,7 @@ import java.util.logging.Level;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 
+@JsonAdapter(Theme.TypeAdapter.class)
 public class Theme {
     public static final Theme BLUE = new Theme("blue", "#5C6BC0");
 
@@ -82,14 +85,14 @@ public class Theme {
                     .replace("%base-color%", color)
                     .replace("%font-color%", getColorDisplayName(getForegroundColor())));
             css = temp.toURI().toString();
-        } catch (IOException e) {
+        } catch (IOException | NullPointerException e) {
             Logging.LOG.log(Level.SEVERE, "Unable to create theme stylesheet. Fallback to blue theme.", e);
-            css = Theme.class.getResource("/assets/css/blue.css").toExternalForm();
+            css = "/assets/css/blue.css";
         }
 
         return new String[]{
                 css,
-                Theme.class.getResource("/assets/css/root.css").toExternalForm()
+                "/assets/css/root.css"
         };
     }
 
@@ -130,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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,19 +13,26 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.setting;
 
 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;
 
@@ -43,6 +50,7 @@ import static org.jackhuang.hmcl.setting.ConfigHolder.config;
  *
  * @author huangyuhui
  */
+@JsonAdapter(VersionSetting.Serializer.class)
 public final class VersionSetting {
 
     public transient String id;
@@ -57,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;
     }
 
@@ -81,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;
     }
 
@@ -107,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.
@@ -121,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;
     }
 
@@ -138,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;
     }
 
@@ -155,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;
     }
 
@@ -172,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;
     }
 
@@ -192,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;
     }
 
@@ -206,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;
     }
 
@@ -226,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;
     }
 
@@ -243,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;
     }
 
@@ -260,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;
     }
 
@@ -277,9 +285,26 @@ public final class VersionSetting {
         noJVMArgsProperty.set(noJVMArgs);
     }
 
-    private final ImmediateBooleanProperty notCheckGameProperty = new ImmediateBooleanProperty(this, "notCheckGame", false);
+    private final BooleanProperty notCheckJVMProperty = new SimpleBooleanProperty(this, "notCheckJVM", false);
 
-    public ImmediateBooleanProperty notCheckGameProperty() {
+    public BooleanProperty notCheckJVMProperty() {
+        return notCheckJVMProperty;
+    }
+
+    /**
+     * True if HMCL does not check JVM validity.
+     */
+    public boolean isNotCheckJVM() {
+        return notCheckJVMProperty.get();
+    }
+
+    public void setNotCheckJVM(boolean notCheckJVM) {
+        notCheckJVMProperty.set(notCheckJVM);
+    }
+
+    private final BooleanProperty notCheckGameProperty = new SimpleBooleanProperty(this, "notCheckGame", false);
+
+    public BooleanProperty notCheckGameProperty() {
         return notCheckGameProperty;
     }
 
@@ -294,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;
     }
 
@@ -313,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.
      */
@@ -333,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;
     }
 
@@ -350,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;
     }
 
@@ -372,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;
     }
 
@@ -397,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;
     }
 
@@ -414,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;
     }
 
@@ -435,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;
     }
 
@@ -494,6 +519,7 @@ public final class VersionSetting {
         minecraftArgsProperty.addListener(listener);
         noJVMArgsProperty.addListener(listener);
         notCheckGameProperty.addListener(listener);
+        notCheckJVMProperty.addListener(listener);
         showLogsProperty.addListener(listener);
         serverIpProperty.addListener(listener);
         fullscreenProperty.addListener(listener);
@@ -507,7 +533,7 @@ public final class VersionSetting {
 
     public LaunchOptions toLaunchOptions(File gameDir) throws InterruptedException {
         JavaVersion javaVersion = Optional.ofNullable(getJavaVersion()).orElse(JavaVersion.fromCurrentEnvironment());
-        return new LaunchOptions.Builder()
+        LaunchOptions.Builder builder = new LaunchOptions.Builder()
                 .setGameDir(gameDir)
                 .setJava(javaVersion)
                 .setVersionName(Metadata.TITLE)
@@ -522,21 +548,20 @@ public final class VersionSetting {
                 .setFullscreen(isFullscreen())
                 .setServerIp(getServerIp())
                 .setWrapper(getWrapper())
-                .setProxyHost(config().getProxyHost())
-                .setProxyPort(config().getProxyPort())
-                .setProxyUser(config().getProxyUser())
-                .setProxyPass(config().getProxyPass())
                 .setPrecalledCommand(getPreLaunchCommand())
-                .setNoGeneratedJVMArgs(isNoJVMArgs())
-                .create();
+                .setNoGeneratedJVMArgs(isNoJVMArgs());
+        if (config().hasProxy()) {
+            builder.setProxyHost(config().getProxyHost());
+            builder.setProxyPort(config().getProxyPort());
+            if (config().hasProxyAuth()) {
+                builder.setProxyUser(config().getProxyUser());
+                builder.setProxyPass(config().getProxyPass());
+            }
+        }
+        return builder.create();
     }
 
     public static class Serializer implements JsonSerializer<VersionSetting>, JsonDeserializer<VersionSetting> {
-        public static final Serializer INSTANCE = new Serializer();
-
-        private Serializer() {
-        }
-
         @Override
         public JsonElement serialize(VersionSetting src, Type typeOfSrc, JsonSerializationContext context) {
             if (src == null) return JsonNull.INSTANCE;
@@ -558,6 +583,7 @@ public final class VersionSetting {
             obj.addProperty("fullscreen", src.isFullscreen());
             obj.addProperty("noJVMArgs", src.isNoJVMArgs());
             obj.addProperty("notCheckGame", src.isNotCheckGame());
+            obj.addProperty("notCheckJVM", src.isNotCheckJVM());
             obj.addProperty("showLogs", src.isShowLogs());
             obj.addProperty("gameDir", src.getGameDir());
             obj.addProperty("launcherVisibility", src.getLauncherVisibility().ordinal());
@@ -595,6 +621,7 @@ public final class VersionSetting {
             vs.setFullscreen(Optional.ofNullable(obj.get("fullscreen")).map(JsonElement::getAsBoolean).orElse(false));
             vs.setNoJVMArgs(Optional.ofNullable(obj.get("noJVMArgs")).map(JsonElement::getAsBoolean).orElse(false));
             vs.setNotCheckGame(Optional.ofNullable(obj.get("notCheckGame")).map(JsonElement::getAsBoolean).orElse(false));
+            vs.setNotCheckJVM(Optional.ofNullable(obj.get("notCheckJVM")).map(JsonElement::getAsBoolean).orElse(false));
             vs.setShowLogs(Optional.ofNullable(obj.get("showLogs")).map(JsonElement::getAsBoolean).orElse(false));
             vs.setLauncherVisibility(LauncherVisibility.values()[Optional.ofNullable(obj.get("launcherVisibility")).map(JsonElement::getAsInt).orElse(1)]);
             vs.setGameDirType(EnumGameDirectory.values()[Optional.ofNullable(obj.get("gameDirType")).map(JsonElement::getAsInt).orElse(0)]);

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,15 +13,14 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 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;
-import javafx.scene.input.TransferMode;
 import javafx.scene.layout.Region;
 import javafx.stage.Stage;
 import org.jackhuang.hmcl.Launcher;
@@ -29,12 +28,14 @@ import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.game.HMCLGameRepository;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.setting.Accounts;
+import org.jackhuang.hmcl.setting.EnumCommonDirectory;
 import org.jackhuang.hmcl.setting.Profiles;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.ui.account.AccountList;
 import org.jackhuang.hmcl.ui.account.AuthlibInjectorServersPage;
 import org.jackhuang.hmcl.ui.construct.*;
+import org.jackhuang.hmcl.ui.construct.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;
 
@@ -60,7 +61,6 @@ import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class Controllers {
-    public static final int UI_VERSION = 1;
 
     private static Scene scene;
     private static Stage stage;
@@ -91,8 +91,13 @@ public final class Controllers {
 
     // FXThread
     public static GameList getGameListPage() {
-        if (gameListPage == null)
+        if (gameListPage == null) {
             gameListPage = new GameList();
+            FXUtils.applyDragListener(gameListPage, it -> "zip".equals(FileUtils.getExtension(it)), modpacks -> {
+                File modpack = modpacks.get(0);
+                Controllers.getDecorator().startWizard(new ModpackInstallWizardProvider(Profiles.getSelectedProfile(), modpack), i18n("install.modpack"));
+            });
+        }
         return gameListPage;
     }
 
@@ -140,27 +145,9 @@ public final class Controllers {
     public static MainPage getMainPage() {
         if (mainPage == null) {
             MainPage mainPage = new MainPage();
-            mainPage.setOnDragOver(event -> {
-                if (event.getGestureSource() != mainPage && event.getDragboard().hasFiles()) {
-                    if (event.getDragboard().getFiles().stream().anyMatch(it -> "zip".equals(FileUtils.getExtension(it))))
-                        event.acceptTransferModes(TransferMode.COPY_OR_MOVE);
-                }
-                event.consume();
-            });
-
-            mainPage.setOnDragDropped(event -> {
-                List<File> files = event.getDragboard().getFiles();
-                if (files != null) {
-                    List<File> modpacks = files.stream()
-                            .filter(it -> "zip".equals(FileUtils.getExtension(it)))
-                            .collect(Collectors.toList());
-                    if (!modpacks.isEmpty()) {
-                        File modpack = modpacks.get(0);
-                        Controllers.getDecorator().startWizard(new ModpackInstallWizardProvider(Profiles.getSelectedProfile(), modpack), i18n("install.modpack"));
-                        event.setDropCompleted(true);
-                    }
-                }
-                event.consume();
+            FXUtils.applyDragListener(mainPage, it -> "zip".equals(FileUtils.getExtension(it)), modpacks -> {
+                File modpack = modpacks.get(0);
+                Controllers.getDecorator().startWizard(new ModpackInstallWizardProvider(Profiles.getSelectedProfile(), modpack), i18n("install.modpack"));
             });
 
             FXUtils.onChangeAndOperate(Profiles.selectedVersionProperty(), version -> {
@@ -172,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 -> {
@@ -212,7 +199,13 @@ public final class Controllers {
         leftPaneController = new LeftPaneController();
         decorator.getDecorator().drawerProperty().setAll(leftPaneController);
 
-        Task.of(JavaVersion::initialize).start();
+        if (config().getCommonDirType() == EnumCommonDirectory.CUSTOM &&
+                !FileUtils.canCreateDirectory(config().getCommonDirectory())) {
+            config().setCommonDirType(EnumCommonDirectory.DEFAULT);
+            dialog(i18n("launcher.cache_directory.invalid"));
+        }
+
+        Task.runAsync(JavaVersion::initialize).start();
 
         scene = new Scene(decorator.getDecorator(), 800, 519);
         scene.getStylesheets().setAll(config().getTheme().getStylesheets());
@@ -231,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));
     }
 
@@ -252,6 +245,10 @@ public final class Controllers {
         return pane;
     }
 
+    public static Region taskDialog(TaskExecutor executor, String title) {
+        return taskDialog(executor, title, "");
+    }
+
     public static Region taskDialog(TaskExecutor executor, String title, String subtitle) {
         return taskDialog(executor, title, subtitle, null);
     }

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui;
 

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,24 +13,25 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,11 +13,11 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 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;
@@ -37,6 +37,7 @@ import javafx.scene.control.*;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.input.ScrollEvent;
+import javafx.scene.input.TransferMode;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import javafx.scene.shape.Rectangle;
@@ -47,14 +48,17 @@ 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;
+import java.io.FileFilter;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.net.URI;
+import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BooleanSupplier;
@@ -62,6 +66,7 @@ import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.logging.Level;
+import java.util.stream.Collectors;
 
 import static org.jackhuang.hmcl.util.Lang.thread;
 import static org.jackhuang.hmcl.util.Lang.tryCast;
@@ -230,8 +235,20 @@ public final class FXUtils {
         }
     }
 
-    public static void installTooltip(Node node, String tooltip) {
-        installTooltip(node, 0, 5000, 0, new Tooltip(tooltip));
+    public static void installFastTooltip(Node node, Tooltip tooltip) {
+        installTooltip(node, 50, 5000, 0, tooltip);
+    }
+
+    public static void installFastTooltip(Node node, String tooltip) {
+        installFastTooltip(node, new Tooltip(tooltip));
+    }
+
+    public static void installSlowTooltip(Node node, Tooltip tooltip) {
+        installTooltip(node, 500, 5000, 0, tooltip);
+    }
+
+    public static void installSlowTooltip(Node node, String tooltip) {
+        installSlowTooltip(node, new Tooltip(tooltip));
     }
 
     public static void installTooltip(Node node, double openDelay, double visibleDelay, double closeDelay, Tooltip tooltip) {
@@ -315,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) {
@@ -356,7 +373,7 @@ public final class FXUtils {
      */
     @SuppressWarnings("unchecked")
     @Deprecated
-    public static void bindEnum(JFXComboBox<?> comboBox, Property<? extends Enum> property) {
+    public static void bindEnum(JFXComboBox<?> comboBox, Property<? extends Enum<?>> property) {
         unbindEnum(comboBox);
         ChangeListener<Number> listener = (a, b, newValue) ->
                 ((Property) property).setValue(property.getValue().getClass().getEnumConstants()[newValue.intValue()]);
@@ -445,6 +462,34 @@ public final class FXUtils {
         }
     }
 
+    public static void applyDragListener(Node node, FileFilter filter, Consumer<List<File>> callback) {
+        applyDragListener(node, filter, callback, null);
+    }
+
+    public static void applyDragListener(Node node, FileFilter filter, Consumer<List<File>> callback, Runnable dragDropped) {
+        node.setOnDragOver(event -> {
+            if (event.getGestureSource() != node && event.getDragboard().hasFiles()) {
+                if (event.getDragboard().getFiles().stream().anyMatch(filter::accept))
+                    event.acceptTransferModes(TransferMode.COPY_OR_MOVE);
+            }
+            event.consume();
+        });
+
+        node.setOnDragDropped(event -> {
+            List<File> files = event.getDragboard().getFiles();
+            if (files != null) {
+                List<File> acceptFiles = files.stream().filter(filter::accept).collect(Collectors.toList());
+                if (!acceptFiles.isEmpty()) {
+                    callback.accept(acceptFiles);
+                    event.setDropCompleted(true);
+                }
+            }
+            if (dragDropped != null)
+                dragDropped.run();
+            event.consume();
+        });
+    }
+
     public static <T> StringConverter<T> stringConverter(Function<T, String> func) {
         return new StringConverter<T>() {
 
@@ -466,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/InstallerItem.java

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui;
 

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,11 +13,11 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 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,8 +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.mod.UnsupportedModpackException;
 import org.jackhuang.hmcl.setting.Accounts;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
@@ -37,10 +35,10 @@ import org.jackhuang.hmcl.ui.account.AccountAdvancedListItem;
 import org.jackhuang.hmcl.ui.account.AddAccountPane;
 import org.jackhuang.hmcl.ui.construct.AdvancedListBox;
 import org.jackhuang.hmcl.ui.construct.AdvancedListItem;
-import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 import org.jackhuang.hmcl.ui.profile.ProfileAdvancedListItem;
 import org.jackhuang.hmcl.ui.versions.GameAdvancedListItem;
 import org.jackhuang.hmcl.ui.versions.Versions;
+import org.jackhuang.hmcl.util.io.CompressingUtils;
 
 import java.io.File;
 import java.util.concurrent.atomic.AtomicReference;
@@ -111,7 +109,6 @@ public final class LeftPaneController extends AdvancedListBox {
     // ====
 
     private boolean checkedModpack = false;
-    private static boolean showNewAccount = true;
 
     private void onRefreshedVersions(HMCLGameRepository repository) {
         JFXUtilities.runInFX(() -> {
@@ -121,27 +118,20 @@ public final class LeftPaneController extends AdvancedListBox {
                 if (repository.getVersionCount() == 0) {
                     File modpackFile = new File("modpack.zip").getAbsoluteFile();
                     if (modpackFile.exists()) {
-                        try {
-                            AtomicReference<Region> region = new AtomicReference<>();
-                            Modpack modpack = ModpackHelper.readModpackManifest(modpackFile);
-                            TaskExecutor executor = ModpackHelper.getInstallTask(repository.getProfile(), modpackFile, modpack.getName(), modpack)
-                                    .with(Task.of(Schedulers.javafx(), () -> {
-                                        region.get().fireEvent(new DialogCloseEvent());
-                                        checkAccount();
-                                    })).executor();
-                            region.set(Controllers.taskDialog(executor, i18n("modpack.installing"), ""));
-                            executor.start();
-                            showNewAccount = false;
-                        } catch (UnsupportedModpackException ignore) {
-                        }
+                        Task.supplyAsync(() -> CompressingUtils.findSuitableEncoding(modpackFile.toPath()))
+                                .thenApply(encoding -> ModpackHelper.readModpackManifest(modpackFile.toPath(), encoding))
+                                .thenAccept(modpack -> {
+                                    AtomicReference<Region> region = new AtomicReference<>();
+                                    TaskExecutor executor = ModpackHelper.getInstallTask(repository.getProfile(), modpackFile, modpack.getName(), modpack)
+                                            .withRun(Schedulers.javafx(), this::checkAccount).executor();
+                                    region.set(Controllers.taskDialog(executor, i18n("modpack.installing")));
+                                    executor.start();
+                                }).start();
                     }
                 }
             }
 
-            if (showNewAccount) {
-                showNewAccount = false;
-                checkAccount();
-            }
+            checkAccount();
         });
     }
 }

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui;
 
@@ -30,9 +30,13 @@ import javafx.scene.control.Skin;
 public abstract class ListPage<T extends Node> extends Control {
     private final ListProperty<T> items = new SimpleListProperty<>(this, "items", FXCollections.observableArrayList());
     private final BooleanProperty loading = new SimpleBooleanProperty(this, "loading", false);
+    private final BooleanProperty refreshable = new SimpleBooleanProperty(this, "refreshable", false);
 
     public abstract void add();
 
+    public void refresh() {
+    }
+
     @Override
     protected Skin<?> createDefaultSkin() {
         return new ListPageSkin(this);
@@ -61,4 +65,16 @@ public abstract class ListPage<T extends Node> extends Control {
     public BooleanProperty loadingProperty() {
         return loading;
     }
+
+    public boolean isRefreshable() {
+        return refreshable.get();
+    }
+
+    public BooleanProperty refreshableProperty() {
+        return refreshable;
+    }
+
+    public void setRefreshable(boolean refreshable) {
+        this.refreshable.set(refreshable);
+    }
 }

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,32 +13,32 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui;
 
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXScrollPane;
-import com.jfoenix.controls.JFXSpinner;
 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;
+import org.jackhuang.hmcl.ui.construct.SpinnerPane;
 
-public class ListPageSkin extends SkinBase<ListPage> {
+public class ListPageSkin extends SkinBase<ListPage<?>> {
 
     public ListPageSkin(ListPage<?> skinnable) {
         super(skinnable);
 
-        StackPane rootPane = new StackPane();
-
-        JFXSpinner spinner = new JFXSpinner();
-        spinner.setRadius(16);
-        spinner.getStyleClass().setAll("materialDesign-purple", "first-spinner");
+        SpinnerPane spinnerPane = new SpinnerPane();
+        spinnerPane.getStyleClass().add("large-spinner-pane");
+        Pane placeholder = new Pane();
 
         StackPane contentPane = new StackPane();
         {
@@ -51,12 +51,15 @@ 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);
             }
-
+            
             VBox vBox = new VBox();
             {
                 vBox.setAlignment(Pos.BOTTOM_RIGHT);
@@ -67,24 +70,40 @@ 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());
 
+                JFXButton btnRefresh = new JFXButton();
+                FXUtils.setLimitWidth(btnRefresh, 40);
+                FXUtils.setLimitHeight(btnRefresh, 40);
+                btnRefresh.getStyleClass().add("jfx-button-raised-round");
+                btnRefresh.setButtonType(JFXButton.ButtonType.RAISED);
+                btnRefresh.setGraphic(SVG.refresh(Theme.whiteFillBinding(), -1, -1));
+                btnRefresh.setOnMouseClicked(e -> skinnable.refresh());
+
                 vBox.getChildren().setAll(btnAdd);
+
+                FXUtils.onChangeAndOperate(skinnable.refreshableProperty(),
+                        refreshable -> {
+                            if (refreshable) vBox.getChildren().setAll(btnRefresh, btnAdd);
+                            else vBox.getChildren().setAll(btnAdd);
+                        });
             }
 
-            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);
         }
 
-        rootPane.getChildren().setAll(contentPane);
+        spinnerPane.loadingProperty().bind(skinnable.loadingProperty());
+        spinnerPane.setContent(contentPane);
 
-        skinnable.loadingProperty().addListener((a, b, newValue) -> {
-            if (newValue) rootPane.getChildren().setAll(spinner);
-            else rootPane.getChildren().setAll(contentPane);
-        });
-
-        getChildren().setAll(rootPane);
+        getChildren().setAll(spinnerPane);
     }
 }

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui;
 
@@ -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/MainPage.java

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui;
 
@@ -33,7 +33,6 @@ import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
-import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
 import javafx.util.Duration;
 import org.jackhuang.hmcl.setting.Profile;
@@ -87,11 +86,8 @@ public final class MainPage extends StackPane implements DecoratorPage {
                 lblIcon.setGraphic(SVG.update(Theme.whiteFillBinding(), 20, 20));
 
                 TwoLineListItem prompt = new TwoLineListItem();
-                prompt.setTitleFill(Color.WHITE);
-                prompt.setSubtitleFill(Color.WHITE);
                 prompt.setSubtitle(i18n("update.bubble.subtitle"));
                 prompt.setPickOnBounds(false);
-                prompt.setStyle("-jfx-title-font-weight: BOLD;");
                 prompt.titleProperty().bind(latestVersionProperty());
 
                 hBox.getChildren().setAll(lblIcon, prompt);

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui;
 
@@ -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) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
- * 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 {http://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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui;
 
@@ -24,13 +24,14 @@ import javafx.beans.InvalidationListener;
 import javafx.beans.WeakInvalidationListener;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.When;
-import javafx.beans.property.*;
+import javafx.beans.property.ReadOnlyStringProperty;
+import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.scene.control.ToggleGroup;
 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;
@@ -41,7 +42,7 @@ import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.i18n.Locales;
 import org.jackhuang.hmcl.util.javafx.SafeStringConverter;
 
-import java.awt.Desktop;
+import java.awt.*;
 import java.io.IOException;
 import java.net.Proxy;
 import java.nio.file.Files;
@@ -95,7 +96,11 @@ public final class SettingsPage extends SettingsView implements DecoratorPage {
 
         // ==== Proxy ====
         txtProxyHost.textProperty().bindBidirectional(config().proxyHostProperty());
-        txtProxyPort.textProperty().bindBidirectional(config().proxyPortProperty());
+        txtProxyPort.textProperty().bindBidirectional(config().proxyPortProperty(),
+                SafeStringConverter.fromInteger()
+                        .restrict(it -> it >= 0 && it <= 0xFFFF)
+                        .fallbackTo(0)
+                        .asPredicate(Validator.addTo(txtProxyPort)));
         txtProxyUsername.textProperty().bindBidirectional(config().proxyUserProperty());
         txtProxyPassword.textProperty().bindBidirectional(config().proxyPassProperty());
 
@@ -114,17 +119,17 @@ public final class SettingsPage extends SettingsView implements DecoratorPage {
         // ====
 
         fileCommonLocation.loadChildren(Arrays.asList(
-                fileCommonLocation.createChildren(i18n("launcher.common_directory.default"), EnumCommonDirectory.DEFAULT)
+                fileCommonLocation.createChildren(i18n("launcher.cache_directory.default"), EnumCommonDirectory.DEFAULT)
         ), EnumCommonDirectory.CUSTOM);
         fileCommonLocation.selectedDataProperty().bindBidirectional(config().commonDirTypeProperty());
         fileCommonLocation.customTextProperty().bindBidirectional(config().commonDirectoryProperty());
         fileCommonLocation.subtitleProperty().bind(
                 Bindings.createObjectBinding(() -> Optional.ofNullable(Settings.instance().getCommonDirectory())
-                                .orElse(i18n("launcher.common_directory.disabled")),
+                                .orElse(i18n("launcher.cache_directory.disabled")),
                         config().commonDirectoryProperty(), config().commonDirTypeProperty()));
 
         // ==== Update ====
-        FXUtils.installTooltip(btnUpdate, i18n("update.tooltip"));
+        FXUtils.installFastTooltip(btnUpdate, i18n("update.tooltip"));
         updateListener = any -> {
             btnUpdate.setVisible(UpdateChecker.isOutdated());
 
@@ -223,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;
             }
@@ -242,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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui;
 
@@ -21,22 +21,22 @@ 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.*;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextAlignment;
-
-import static org.jackhuang.hmcl.setting.ConfigHolder.config;
-import static org.jackhuang.hmcl.ui.FXUtils.stringConverter;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
 import org.jackhuang.hmcl.setting.EnumBackgroundImage;
 import org.jackhuang.hmcl.setting.EnumCommonDirectory;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.construct.*;
 import org.jackhuang.hmcl.util.i18n.Locales.SupportedLocale;
 
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.ui.FXUtils.stringConverter;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
 public abstract class SettingsView extends StackPane {
     protected final JFXTextField txtProxyHost;
     protected final JFXTextField txtProxyPort;
@@ -76,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);
@@ -84,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);
@@ -93,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);
@@ -125,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);
@@ -134,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);
@@ -144,9 +157,9 @@ public abstract class SettingsView extends StackPane {
 
                 {
                     fileCommonLocation = new MultiFileItem<>(true);
-                    fileCommonLocation.setTitle(i18n("launcher.common_directory"));
+                    fileCommonLocation.setTitle(i18n("launcher.cache_directory"));
                     fileCommonLocation.setDirectory(true);
-                    fileCommonLocation.setChooserTitle(i18n("launcher.common_directory.choose"));
+                    fileCommonLocation.setChooserTitle(i18n("launcher.cache_directory.choose"));
                     fileCommonLocation.setHasSubtitle(true);
                     fileCommonLocation.setCustomText("settings.custom");
 
@@ -338,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);
                     }
@@ -360,7 +373,7 @@ public abstract class SettingsView extends StackPane {
                                 HBox hBox = new HBox();
                                 hBox.setSpacing(3);
 
-                                cboFont = new FontComboBox(12, false);
+                                cboFont = new FontComboBox(12);
                                 txtFontSize = new JFXTextField();
                                 FXUtils.setLimitWidth(txtFontSize, 50);
                                 hBox.getChildren().setAll(cboFont, txtFontSize);
@@ -492,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/WeakListenerHolder.java

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui;
 

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui;
 

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,19 +13,19 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.account;
 
+import javafx.beans.binding.Bindings;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.image.Image;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.offline.OfflineAccount;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
-import org.jackhuang.hmcl.game.AccountHelper;
+import org.jackhuang.hmcl.game.TexturesLoader;
 import org.jackhuang.hmcl.setting.Theme;
-import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.construct.AdvancedListItem;
 
@@ -38,23 +38,15 @@ public class AccountAdvancedListItem extends AdvancedListItem {
         protected void invalidated() {
             Account account = get();
             if (account == null) {
+                titleProperty().unbind();
                 setTitle(i18n("account.missing"));
                 setSubtitle(i18n("account.missing.add"));
+                imageProperty().unbind();
                 setImage(new Image("/assets/img/craft_table.png"));
             } else {
-                setTitle(account.getCharacter());
+                titleProperty().bind(Bindings.createStringBinding(account::getCharacter, account));
                 setSubtitle(accountSubtitle(account));
-
-                final int scaleRatio = 4;
-                Image defaultSkin = AccountHelper.getDefaultSkin(account.getUUID(), scaleRatio);
-                setImage(AccountHelper.getHead(defaultSkin, scaleRatio));
-
-                if (account instanceof YggdrasilAccount) {
-                    AccountHelper.loadSkinAsync((YggdrasilAccount) account).subscribe(Schedulers.javafx(), () -> {
-                        Image image = AccountHelper.getSkin((YggdrasilAccount) account, scaleRatio);
-                        setImage(AccountHelper.getHead(image, scaleRatio));
-                    });
-                }
+                imageProperty().bind(TexturesLoader.fxAvatarBinding(account, 32));
             }
         }
     };

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.account;
 

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,25 +13,33 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.account;
 
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.StringBinding;
 import javafx.beans.property.*;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.Skin;
 import javafx.scene.image.Image;
 import org.jackhuang.hmcl.auth.Account;
+import org.jackhuang.hmcl.auth.AuthenticationException;
+import org.jackhuang.hmcl.auth.CredentialExpiredException;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.auth.offline.OfflineAccount;
-import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
-import org.jackhuang.hmcl.game.AccountHelper;
+import org.jackhuang.hmcl.game.TexturesLoader;
 import org.jackhuang.hmcl.setting.Accounts;
-import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.ui.DialogController;
 
+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 {
 
     private final Account account;
@@ -44,23 +52,24 @@ public class AccountListItem extends RadioButton {
         getStyleClass().clear();
         setUserData(account);
 
-        StringBuilder subtitleString = new StringBuilder(Accounts.getAccountTypeName(account));
+        String loginTypeName = Accounts.getLocalizedLoginTypeName(Accounts.getAccountFactory(account));
         if (account instanceof AuthlibInjectorAccount) {
             AuthlibInjectorServer server = ((AuthlibInjectorAccount) account).getServer();
-            subtitleString.append(", ").append(i18n("account.injector.server")).append(": ").append(server.getName());
+            subtitle.bind(Bindings.concat(
+                    loginTypeName, ", ", i18n("account.injector.server"), ": ",
+                    Bindings.createStringBinding(server::getName, server)));
+        } else {
+            subtitle.set(loginTypeName);
         }
 
-        if (account instanceof OfflineAccount)
-            title.set(account.getCharacter());
-        else
-            title.set(account.getUsername() + " - " + account.getCharacter());
-        subtitle.set(subtitleString.toString());
+        StringBinding characterName = Bindings.createStringBinding(account::getCharacter, account);
+        if (account instanceof OfflineAccount) {
+            title.bind(characterName);
+        } else {
+            title.bind(Bindings.concat(account.getUsername(), " - ", characterName));
+        }
 
-        final int scaleRatio = 4;
-        Image image = account instanceof YggdrasilAccount ?
-                AccountHelper.getSkin((YggdrasilAccount) account, scaleRatio) :
-                AccountHelper.getDefaultSkin(account.getUUID(), scaleRatio);
-        this.image.set(AccountHelper.getHead(image, scaleRatio));
+        image.bind(TexturesLoader.fxAvatarBinding(account, 32));
     }
 
     @Override
@@ -69,19 +78,22 @@ public class AccountListItem extends RadioButton {
     }
 
     public void refresh() {
-        if (account instanceof YggdrasilAccount) {
-            // progressBar.setVisible(true);
-            AccountHelper.refreshSkinAsync((YggdrasilAccount) account)
-                    .finalized(Schedulers.javafx(), (variables, isDependentsSucceeded) -> {
-                        // progressBar.setVisible(false);
-
-                        if (isDependentsSucceeded) {
-                            final int scaleRatio = 4;
-                            Image image = AccountHelper.getSkin((YggdrasilAccount) account, scaleRatio);
-                            this.image.set(AccountHelper.getHead(image, scaleRatio));
-                        }
-                    }).start();
-        }
+        account.clearCache();
+        thread(() -> {
+            try {
+                account.logIn();
+            } 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);
+                }
+            } catch (AuthenticationException e) {
+                LOG.log(Level.WARNING, "Failed to refresh " + account + " with token", e);
+            }
+        });
     }
 
     public void remove() {

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,26 +13,34 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 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;
+
 import javafx.geometry.Pos;
+import javafx.scene.control.Label;
 import javafx.scene.control.SkinBase;
+import javafx.scene.control.Tooltip;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
+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.TwoLineListItem;
+import org.jackhuang.hmcl.util.javafx.BindingMapping;
 
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
+
 public class AccountListItemSkin extends SkinBase<AccountListItem> {
 
     public AccountListItemSkin(AccountListItem skinnable) {
@@ -58,8 +66,22 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {
         FXUtils.limitSize(imageView, 32, 32);
         imageView.imageProperty().bind(skinnable.imageProperty());
 
-        TwoLineListItem item = new TwoLineListItem();
+        Label title = new Label();
+        title.getStyleClass().add("title");
+        title.textProperty().bind(skinnable.titleProperty());
+        Label subtitle = new Label();
+        subtitle.getStyleClass().add("subtitle");
+        subtitle.textProperty().bind(skinnable.subtitleProperty());
+        if (skinnable.getAccount() instanceof AuthlibInjectorAccount) {
+            Tooltip tooltip = new Tooltip();
+            AuthlibInjectorServer server = ((AuthlibInjectorAccount) skinnable.getAccount()).getServer();
+            tooltip.textProperty().bind(BindingMapping.of(server, AuthlibInjectorServer::toString));
+            FXUtils.installSlowTooltip(subtitle, tooltip);
+        }
+        VBox item = new VBox(title, subtitle);
+        item.getStyleClass().add("two-line-list-item");
         BorderPane.setAlignment(item, Pos.CENTER);
+
         center.getChildren().setAll(imageView, item);
         root.setCenter(center);
 
@@ -69,7 +91,7 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {
         btnRefresh.setOnMouseClicked(e -> skinnable.refresh());
         btnRefresh.getStyleClass().add("toggle-icon4");
         btnRefresh.setGraphic(SVG.refresh(Theme.blackFillBinding(), -1, -1));
-        JFXUtilities.runInFX(() -> FXUtils.installTooltip(btnRefresh, i18n("button.refresh")));
+        JFXUtilities.runInFX(() -> FXUtils.installFastTooltip(btnRefresh, i18n("button.refresh")));
         right.getChildren().add(btnRefresh);
 
         JFXButton btnRemove = new JFXButton();
@@ -77,14 +99,12 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {
         btnRemove.getStyleClass().add("toggle-icon4");
         BorderPane.setAlignment(btnRemove, Pos.CENTER);
         btnRemove.setGraphic(SVG.delete(Theme.blackFillBinding(), -1, -1));
-        JFXUtilities.runInFX(() -> FXUtils.installTooltip(btnRemove, i18n("button.delete")));
+        JFXUtilities.runInFX(() -> FXUtils.installFastTooltip(btnRemove, i18n("button.delete")));
         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());
 
         getChildren().setAll(root);
     }

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.account;
 
@@ -31,14 +31,16 @@ 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;
     private final Consumer<AuthInfo> success;
     private final Runnable failed;
 
-    @FXML
-    private Label lblUsername;
+    @FXML private Label lblUsername;
     @FXML private JFXPasswordField txtPassword;
     @FXML private Label lblCreationWarning;
     @FXML private JFXProgressBar progressBar;
@@ -59,25 +61,20 @@ public class AccountLoginPane extends StackPane {
         String password = txtPassword.getText();
         progressBar.setVisible(true);
         lblCreationWarning.setText("");
-        Task.ofResult("login", () -> {
-            try {
-                return oldAccount.logInWithPassword(password);
-            } catch (Exception e) {
-                return e;
-            }
-        }).subscribe(Schedulers.javafx(), variable -> {
-            Object account = variable.get("login");
-            if (account instanceof AuthInfo) {
-                success.accept(((AuthInfo) account));
-                fireEvent(new DialogCloseEvent());
-            } else if (account instanceof NoSelectedCharacterException) {
-                fireEvent(new DialogCloseEvent());
-            } else if (account instanceof Exception) {
-                lblCreationWarning.setText(AddAccountPane.accountException((Exception) account));
-            }
-
-            progressBar.setVisible(false);
-        });
+        Task.supplyAsync(() -> oldAccount.logInWithPassword(password))
+                .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 {
+                        lblCreationWarning.setText(AddAccountPane.accountException(e));
+                    }
+                    progressBar.setVisible(false);
+                }).start();
     }
 
     @FXML

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,19 +13,23 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.account;
 
-import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.utils.JFXUtilities;
 import com.jfoenix.controls.*;
+
+import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
+import javafx.beans.property.ListProperty;
 import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
 import javafx.geometry.Pos;
 import javafx.scene.control.Hyperlink;
 import javafx.scene.control.Label;
-import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
@@ -35,20 +39,22 @@ import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDownloadException;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.auth.yggdrasil.GameProfile;
 import org.jackhuang.hmcl.auth.yggdrasil.RemoteAuthenticationException;
-import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
-import org.jackhuang.hmcl.game.AccountHelper;
+import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilService;
+import org.jackhuang.hmcl.game.TexturesLoader;
 import org.jackhuang.hmcl.setting.Accounts;
 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.construct.*;
-import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.javafx.BindingMapping;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.CountDownLatch;
-import java.util.logging.Level;
-
+import static java.util.Collections.emptyList;
+import static java.util.Collections.unmodifiableList;
 import static java.util.Objects.requireNonNull;
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.ui.FXUtils.*;
@@ -63,12 +69,13 @@ public class AddAccountPane extends StackPane {
     @FXML private JFXComboBox<AccountFactory<?>> cboType;
     @FXML private JFXComboBox<AuthlibInjectorServer> cboServers;
     @FXML private Label lblInjectorServer;
-    @FXML private Hyperlink linkManageInjectorServers;
-    @FXML private JFXDialogLayout layout;
     @FXML private JFXButton btnAccept;
     @FXML private JFXButton btnAddServer;
     @FXML private JFXButton btnManageServer;
     @FXML private SpinnerPane acceptPane;
+    @FXML private HBox linksContainer;
+
+    private ListProperty<Hyperlink> links = new SimpleListProperty<>();;
 
     public AddAccountPane() {
         FXUtils.loadFXML(this, "/assets/fxml/account-add.fxml");
@@ -79,9 +86,14 @@ public class AddAccountPane extends StackPane {
         cboServers.getItems().addListener(onInvalidating(this::selectDefaultServer));
         selectDefaultServer();
 
-        cboType.getItems().setAll(Accounts.FACTORY_OFFLINE, Accounts.FACTORY_YGGDRASIL, Accounts.FACTORY_AUTHLIB_INJECTOR);
-        cboType.setConverter(stringConverter(Accounts::getAccountTypeName));
-        cboType.getSelectionModel().select(0);
+        cboType.getItems().setAll(Accounts.FACTORY_OFFLINE, Accounts.FACTORY_MOJANG, Accounts.FACTORY_AUTHLIB_INJECTOR);
+        cboType.setConverter(stringConverter(Accounts::getLocalizedLoginTypeName));
+        // try selecting the preferred login type
+        cboType.getSelectionModel().select(
+                cboType.getItems().stream()
+                        .filter(type -> Accounts.getLoginType(type).equals(config().getPreferredLoginType()))
+                        .findFirst()
+                        .orElse(Accounts.FACTORY_OFFLINE));
 
         btnAddServer.visibleProperty().bind(cboServers.visibleProperty());
         btnManageServer.visibleProperty().bind(cboServers.visibleProperty());
@@ -91,6 +103,9 @@ public class AddAccountPane extends StackPane {
 
         ReadOnlyObjectProperty<AccountFactory<?>> loginType = cboType.getSelectionModel().selectedItemProperty();
 
+        // remember the last used login type
+        loginType.addListener((observable, oldValue, newValue) -> config().setPreferredLoginType(Accounts.getLoginType(newValue)));
+
         txtPassword.visibleProperty().bind(loginType.isNotEqualTo(Accounts.FACTORY_OFFLINE));
         lblPassword.visibleProperty().bind(txtPassword.visibleProperty());
 
@@ -109,6 +124,34 @@ public class AddAccountPane extends StackPane {
                 txtUsername.textProperty(),
                 txtPassword.textProperty(), txtPassword.visibleProperty(),
                 cboServers.getSelectionModel().selectedItemProperty(), cboServers.visibleProperty()));
+
+        // authlib-injector links
+        links.bind(BindingMapping.of(cboServers.getSelectionModel().selectedItemProperty())
+                .map(AddAccountPane::createHyperlinks)
+                .map(FXCollections::observableList));
+        Bindings.bindContent(linksContainer.getChildren(), links);
+        linksContainer.visibleProperty().bind(cboServers.visibleProperty());
+    }
+
+    private static final String[] ALLOWED_LINKS = { "register" };
+
+    public static List<Hyperlink> createHyperlinks(AuthlibInjectorServer server) {
+        if (server == null) {
+            return emptyList();
+        }
+
+        Map<String, String> links = server.getLinks();
+        List<Hyperlink> result = new ArrayList<>();
+        for (String key : ALLOWED_LINKS) {
+            String value = links.get(key);
+            if (value != null) {
+                Hyperlink link = new Hyperlink(i18n("account.injector.link." + key));
+                FXUtils.installSlowTooltip(link, value);
+                link.setOnAction(e -> FXUtils.openLink(value));
+                result.add(link);
+            }
+        }
+        return unmodifiableList(result);
     }
 
     /**
@@ -152,10 +195,8 @@ public class AddAccountPane extends StackPane {
         AccountFactory<?> factory = cboType.getSelectionModel().getSelectedItem();
         Object additionalData = getAuthAdditionalData();
 
-        Task.ofResult("create_account", () -> factory.create(new Selector(), username, password, additionalData))
-                .finalized(Schedulers.javafx(), variables -> {
-
-                    Account account = variables.get("create_account");
+        Task.supplyAsync(() -> factory.create(new Selector(), username, password, additionalData))
+                .whenComplete(Schedulers.javafx(), account -> {
                     int oldIndex = Accounts.getAccounts().indexOf(account);
                     if (oldIndex == -1) {
                         Accounts.getAccounts().add(account);
@@ -206,7 +247,7 @@ public class AddAccountPane extends StackPane {
         private final CountDownLatch latch = new CountDownLatch(1);
         private GameProfile selectedProfile = null;
 
-        {
+        public Selector() {
             setStyle("-fx-padding: 8px;");
 
             cancel.setText(i18n("button.cancel"));
@@ -224,45 +265,33 @@ public class AddAccountPane extends StackPane {
         }
 
         @Override
-        public GameProfile select(Account account, List<GameProfile> names) throws NoSelectedCharacterException {
-            if (!(account instanceof YggdrasilAccount))
-                return CharacterSelector.DEFAULT.select(account, names);
-            YggdrasilAccount yggdrasilAccount = (YggdrasilAccount) account;
+        public GameProfile select(YggdrasilService service, List<GameProfile> profiles) throws NoSelectedCharacterException {
+            Platform.runLater(() -> {
+                for (GameProfile profile : profiles) {
+                    ImageView portraitView = new ImageView();
+                    portraitView.setSmooth(false);
+                    portraitView.imageProperty().bind(TexturesLoader.fxAvatarBinding(service, profile.getId(), 32));
+                    FXUtils.limitSize(portraitView, 32, 32);
 
-            for (GameProfile profile : names) {
-                Image image;
-                final int scaleRatio = 4;
-                try {
-                    image = AccountHelper.getSkinImmediately(yggdrasilAccount, profile, scaleRatio);
-                } catch (Exception e) {
-                    Logging.LOG.log(Level.WARNING, "Failed to get skin for " + profile.getName(), e);
-                    image = AccountHelper.getDefaultSkin(profile.getId(), scaleRatio);
+                    IconedItem accountItem = new IconedItem(portraitView, profile.getName());
+                    accountItem.setOnMouseClicked(e -> {
+                        selectedProfile = profile;
+                        latch.countDown();
+                    });
+                    listBox.add(accountItem);
                 }
-
-                ImageView portraitView = new ImageView();
-                portraitView.setSmooth(false);
-                portraitView.setImage(AccountHelper.getHead(image, scaleRatio));
-                FXUtils.limitSize(portraitView, 32, 32);
-
-                IconedItem accountItem = new IconedItem(portraitView, profile.getName());
-                accountItem.setOnMouseClicked(e -> {
-                    selectedProfile = profile;
-                    latch.countDown();
-                });
-                listBox.add(accountItem);
-            }
-
-            JFXUtilities.runInFX(() -> Controllers.dialog(this));
+                Controllers.dialog(this);
+            });
 
             try {
                 latch.await();
 
                 if (selectedProfile == null)
-                    throw new NoSelectedCharacterException(account);
+                    throw new NoSelectedCharacterException();
 
                 return selectedProfile;
             } catch (InterruptedException ignore) {
-                throw new NoSelectedCharacterException(account);
+                throw new NoSelectedCharacterException();
             } finally {
                 JFXUtilities.runInFX(() -> Selector.this.fireEvent(new DialogCloseEvent()));
             }
@@ -290,6 +319,8 @@ public class AddAccountPane extends StackPane {
             return exception.getMessage();
         } else if (exception instanceof AuthlibInjectorDownloadException) {
             return i18n("account.failed.injector_download_failure");
+        } else if (exception instanceof CharacterDeletedException) {
+            return i18n("account.failed.character_deleted");
         } else if (exception.getClass() == AuthenticationException.class) {
             return exception.getLocalizedMessage();
         } else {

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.account;
 
@@ -35,9 +35,11 @@ import org.jackhuang.hmcl.ui.construct.SpinnerPane;
 import org.jackhuang.hmcl.util.io.NetworkUtils;
 
 import java.io.IOException;
+import java.util.logging.Level;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.ui.FXUtils.loadFXML;
+import static org.jackhuang.hmcl.util.Logging.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public class AddAuthlibInjectorServerPane extends StackPane implements DialogAware {
@@ -102,13 +104,13 @@ public class AddAuthlibInjectorServerPane extends StackPane implements DialogAwa
         nextPane.showSpinner();
         addServerPane.setDisable(true);
 
-        Task.of(() -> {
+        Task.runAsync(() -> {
             serverBeingAdded = AuthlibInjectorServer.locateServer(url);
-        }).finalized(Schedulers.javafx(), (variables, isDependentsSucceeded) -> {
+        }).whenComplete(Schedulers.javafx(), exception -> {
             addServerPane.setDisable(false);
             nextPane.hideSpinner();
 
-            if (isDependentsSucceeded) {
+            if (exception == null) {
                 lblServerName.setText(serverBeingAdded.getName());
                 lblServerUrl.setText(serverBeingAdded.getUrl());
 
@@ -116,7 +118,8 @@ public class AddAuthlibInjectorServerPane extends StackPane implements DialogAwa
 
                 transitionHandler.setContent(confirmServerPane, ContainerAnimations.SWIPE_LEFT.getAnimationProducer());
             } else {
-                lblCreationWarning.setText(resolveFetchExceptionMessage(variables.<Exception>get("lastException")));
+                LOG.log(Level.WARNING, "Failed to resolve auth server: " + url, exception);
+                lblCreationWarning.setText(resolveFetchExceptionMessage(exception));
             }
         }).start();
 

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,12 +13,14 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.account;
 
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.effects.JFXDepthManager;
+
+import javafx.beans.binding.Bindings;
 import javafx.geometry.Pos;
 import javafx.scene.control.Label;
 import javafx.scene.layout.BorderPane;
@@ -33,17 +35,17 @@ public final class AuthlibInjectorServerItem extends BorderPane {
     private final AuthlibInjectorServer server;
 
     private final Label lblServerName = new Label();
-    private final Label lblServerIp = new Label();
+    private final Label lblServerUrl = new Label();
 
     public AuthlibInjectorServerItem(AuthlibInjectorServer server, Consumer<AuthlibInjectorServerItem> deleteCallback) {
         this.server = server;
 
         lblServerName.setStyle("-fx-font-size: 15;");
-        lblServerIp.setStyle("-fx-font-size: 10;");
+        lblServerUrl.setStyle("-fx-font-size: 10;");
 
         VBox center = new VBox();
         BorderPane.setAlignment(center, Pos.CENTER);
-        center.getChildren().addAll(lblServerName, lblServerIp);
+        center.getChildren().addAll(lblServerName, lblServerUrl);
         setCenter(center);
 
         JFXButton right = new JFXButton();
@@ -55,8 +57,8 @@ public final class AuthlibInjectorServerItem extends BorderPane {
 
         setStyle("-fx-background-radius: 2; -fx-background-color: white; -fx-padding: 8;");
         JFXDepthManager.setDepth(this, 1);
-        lblServerName.setText(server.getName());
-        lblServerIp.setText(server.getUrl());
+        lblServerName.textProperty().bind(Bindings.createStringBinding(server::getName, server));
+        lblServerUrl.setText(server.getUrl());
     }
 
     public AuthlibInjectorServer getServer() {

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.account;
 

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.animation;
 

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.animation;
 

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright c 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.animation;
 

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.animation;
 

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 
@@ -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/ClassTitle.java

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 

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

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

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 
@@ -61,7 +61,7 @@ public class FileItem extends BorderPane {
         right.setGraphic(SVG.pencil(Theme.blackFillBinding(), 15, 15));
         right.getStyleClass().add("toggle-icon4");
         right.setOnMouseClicked(e -> onExplore());
-        FXUtils.installTooltip(right, i18n("button.edit"));
+        FXUtils.installFastTooltip(right, i18n("button.edit"));
         setRight(right);
 
         Tooltip tip = new Tooltip();

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 
@@ -21,35 +21,35 @@ 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;
 
 import javafx.beans.NamedArg;
 import javafx.beans.binding.Bindings;
-import javafx.scene.control.ListCell;
 import javafx.scene.text.Font;
 
 public class FontComboBox extends JFXComboBox<String> {
 
     private boolean loaded = false;
 
-    public FontComboBox(@NamedArg(value = "fontSize", defaultValue = "12.0") double fontSize,
-                        @NamedArg(value = "enableStyle", defaultValue = "false") boolean enableStyle) {
+    public FontComboBox(@NamedArg(value = "fontSize", defaultValue = "12.0") double fontSize) {
         styleProperty().bind(Bindings.concat("-fx-font-family: \"", valueProperty(), "\""));
 
-        setCellFactory(listView -> new ListCell<String>() {
+        setCellFactory(listView -> new JFXListCell<String>() {
             @Override
-            protected void updateItem(String item, boolean empty) {
+            public void updateItem(String item, boolean empty) {
                 super.updateItem(item, empty);
-                if (item != null) {
+                if (!empty) {
                     setText(item);
-                    setFont(new Font(item, fontSize));
+                    setGraphic(null);
+                    setStyle("-fx-font-family: \"" + item + "\"");
                 }
             }
         });
 
-        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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,11 +13,10 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 
-import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
@@ -45,7 +44,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/IconedMenuItem.java

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,11 +13,12 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 
 import javafx.scene.Node;
+import org.jackhuang.hmcl.ui.FXUtils;
 
 public class IconedMenuItem extends IconedItem {
 
@@ -27,4 +28,9 @@ public class IconedMenuItem extends IconedItem {
         getStyleClass().setAll("iconed-menu-item");
         setOnMouseClicked(e -> action.run());
     }
+
+    public IconedMenuItem addTooltip(String tooltip) {
+        FXUtils.installFastTooltip(this, tooltip);
+        return this;
+    }
 }

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

@@ -1,3 +1,20 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package org.jackhuang.hmcl.ui.construct;
 
 import com.jfoenix.controls.JFXButton;
@@ -46,7 +63,7 @@ public final class ImagePickerItem extends BorderPane {
         deleteButton.onMouseClickedProperty().bind(onDeleteButtonClicked);
         deleteButton.getStyleClass().add("toggle-icon4");
 
-        FXUtils.installTooltip(selectButton, i18n("button.edit"));
+        FXUtils.installFastTooltip(selectButton, i18n("button.edit"));
 
         HBox hBox = new HBox();
         hBox.getChildren().setAll(imageView, selectButton, deleteButton);

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 
@@ -38,15 +38,20 @@ public class InputDialogPane extends StackPane {
     private Label content;
     @FXML
     private Label lblCreationWarning;
+    @FXML
+    private SpinnerPane acceptPane;
 
     public InputDialogPane(String text, FutureCallback<String> onResult) {
         FXUtils.loadFXML(this, "/assets/fxml/input-dialog.fxml");
         content.setText(text);
         cancelButton.setOnMouseClicked(e -> fireEvent(new DialogCloseEvent()));
         acceptButton.setOnMouseClicked(e -> {
+            acceptPane.showSpinner();
             onResult.call(textField.getText(), () -> {
+                acceptPane.hideSpinner();
                 fireEvent(new DialogCloseEvent());
             }, msg -> {
+                acceptPane.hideSpinner();
                 lblCreationWarning.setText(msg);
             });
         });

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

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

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

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

@@ -1,172 +0,0 @@
-/*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
- * 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 {http://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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun4008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 
@@ -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/MultiColorItem.java

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

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 
@@ -32,6 +32,7 @@ import org.jackhuang.hmcl.util.Logging;
 
 import java.util.Optional;
 import java.util.Stack;
+import java.util.logging.Level;
 
 public class Navigator extends StackPane {
     private static final String PROPERTY_DIALOG_CLOSE_HANDLER = Navigator.class.getName() + ".closeListener";
@@ -94,10 +95,14 @@ public class Navigator extends StackPane {
         if (!initialized)
             throw new IllegalStateException("Navigator must have a root page");
 
+        if (stack.peek() != from) {
+            // Allow page to be closed multiple times.
+            Logging.LOG.log(Level.INFO, "Closing already closed page: " + from, new Throwable());
+            return;
+        }
+
         Logging.LOG.info("Closed page " + from);
 
-        if (stack.peek() != from)
-            throw new IllegalStateException();
         stack.pop();
         Node node = stack.peek();
 

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 
@@ -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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,12 +13,11 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 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;
@@ -27,7 +26,12 @@ import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import javafx.css.*;
+import javafx.css.CssMetaData;
+import javafx.css.PseudoClass;
+import javafx.css.SimpleStyleableObjectProperty;
+import javafx.css.Styleable;
+import javafx.css.StyleableObjectProperty;
+import javafx.css.StyleablePropertyFactory;
 import javafx.geometry.Insets;
 import javafx.scene.Node;
 import javafx.scene.layout.Background;
@@ -39,8 +43,6 @@ import javafx.scene.paint.Paint;
 import javafx.scene.shape.Rectangle;
 import org.jackhuang.hmcl.util.Lang;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 @DefaultProperty("container")
@@ -61,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();
@@ -150,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();
     }
@@ -210,32 +154,12 @@ public class RipplerContainer extends StackPane {
     }
 
     public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
-        return StyleableProperties.STYLEABLES;
+        return StyleableProperties.FACTORY.getCssMetaData();
     }
 
     private static class StyleableProperties {
+        private static final StyleablePropertyFactory<RipplerContainer> FACTORY = new StyleablePropertyFactory<>(StackPane.getClassCssMetaData());
 
-        private static final CssMetaData<RipplerContainer, Paint> RIPPLER_FILL = new CssMetaData<RipplerContainer, Paint>("-jfx-rippler-fill", StyleConverter.getPaintConverter(), Color.rgb(0, 200, 255)) {
-            @Override
-            public boolean isSettable(RipplerContainer control) {
-                return control.ripplerFill == null || !control.ripplerFill.isBound();
-            }
-
-            @Override
-            public StyleableProperty<Paint> getStyleableProperty(RipplerContainer control) {
-                return control.ripplerFillProperty();
-            }
-        };
-
-        private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
-
-        private StyleableProperties() {
-        }
-
-        static {
-            List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(Node.getClassCssMetaData());
-            Collections.addAll(styleables, RIPPLER_FILL);
-            STYLEABLES = Collections.unmodifiableList(styleables);
-        }
+        private static final CssMetaData<RipplerContainer, Paint> RIPPLER_FILL = FACTORY.createPaintCssMetaData("-jfx-rippler-fill", s -> s.ripplerFill, Color.rgb(0, 200, 255));
     }
 }

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,13 +13,15 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 
 import com.jfoenix.controls.JFXSpinner;
 import javafx.beans.DefaultProperty;
+import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.Node;
 import javafx.scene.layout.StackPane;
@@ -32,19 +34,29 @@ public class SpinnerPane extends StackPane {
     private final JFXSpinner spinner = new JFXSpinner();
     private final StackPane contentPane = new StackPane();
     private final ObjectProperty<Node> content = new SimpleObjectProperty<>(this, "content");
+    private final BooleanProperty loading = new SimpleBooleanProperty(this, "loading") {
+    	protected void invalidated() {
+    		if (get())
+    	        transitionHandler.setContent(spinner, ContainerAnimations.FADE.getAnimationProducer());
+    		else
+    	        transitionHandler.setContent(contentPane, ContainerAnimations.FADE.getAnimationProducer());
+    	}
+    };
 
     public SpinnerPane() {
+    	getStyleClass().add("spinner-pane");
+    	
         getChildren().setAll(contentPane);
 
         content.addListener((a, b, newValue) -> contentPane.getChildren().setAll(newValue));
     }
 
     public void showSpinner() {
-        transitionHandler.setContent(spinner, ContainerAnimations.FADE.getAnimationProducer());
+    	setLoading(true);
     }
 
     public void hideSpinner() {
-        transitionHandler.setContent(contentPane, ContainerAnimations.FADE.getAnimationProducer());
+    	setLoading(false);
     }
 
     public Node getContent() {
@@ -58,4 +70,16 @@ public class SpinnerPane extends StackPane {
     public void setContent(Node content) {
         this.content.set(content);
     }
+
+    public boolean isLoading() {
+    	return loading.get();
+    }
+    
+    public BooleanProperty loadingProperty() {
+    	return loading;
+    }
+    
+    public void setLoading(boolean loading) {
+    	this.loading.set(loading);
+    }
 }

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,13 +13,14 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 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;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.StringProperty;
 import javafx.fxml.FXML;
@@ -27,6 +28,7 @@ import javafx.scene.control.Label;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.task.TaskExecutor;
+import org.jackhuang.hmcl.task.TaskListener;
 import org.jackhuang.hmcl.ui.FXUtils;
 
 import java.util.Optional;
@@ -66,10 +68,23 @@ public class TaskExecutorDialogPane extends StackPane {
     }
 
     public void setExecutor(TaskExecutor executor) {
+        setExecutor(executor, true);
+    }
+
+    public void setExecutor(TaskExecutor executor, boolean autoClose) {
         this.executor = executor;
 
-        if (executor != null)
+        if (executor != null) {
             taskListPane.setExecutor(executor);
+
+            if (autoClose)
+                executor.addTaskListener(new TaskListener() {
+                    @Override
+                    public void onStop(boolean success, TaskExecutor executor) {
+                        Platform.runLater(() -> fireEvent(new DialogCloseEvent()));
+                    }
+                });
+        }
     }
 
     public StringProperty titleProperty() {

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 
@@ -24,7 +24,6 @@ import javafx.beans.property.ReadOnlyIntegerWrapper;
 import javafx.scene.control.Label;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
 import org.jackhuang.hmcl.download.forge.ForgeInstallTask;
 import org.jackhuang.hmcl.download.game.GameAssetDownloadTask;
 import org.jackhuang.hmcl.download.liteloader.LiteLoaderInstallTask;
@@ -43,7 +42,7 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class TaskListPane extends StackPane {
     private final AdvancedListBox listBox = new AdvancedListBox();
-    private final Map<Task, ProgressListNode> nodes = new HashMap<>();
+    private final Map<Task<?>, ProgressListNode> nodes = new HashMap<>();
     private final ReadOnlyIntegerWrapper finishedTasks = new ReadOnlyIntegerWrapper();
     private final ReadOnlyIntegerWrapper totTasks = new ReadOnlyIntegerWrapper();
 
@@ -73,12 +72,12 @@ public final class TaskListPane extends StackPane {
             }
 
             @Override
-            public void onReady(Task task) {
+            public void onReady(Task<?> task) {
                 Platform.runLater(() -> totTasks.set(totTasks.getValue() + 1));
             }
 
             @Override
-            public void onRunning(Task task) {
+            public void onRunning(Task<?> task) {
                 if (!task.getSignificance().shouldShow())
                     return;
 
@@ -94,6 +93,8 @@ public final class TaskListPane extends StackPane {
                     task.setName(i18n("modpack.type.curse.completion"));
                 } else if (task instanceof ModpackInstallTask) {
                     task.setName(i18n("modpack.installing"));
+                } else if (task instanceof ModpackUpdateTask) {
+                    task.setName(i18n("modpack.update"));
                 } else if (task instanceof CurseInstallTask) {
                     task.setName(i18n("modpack.install", i18n("modpack.type.curse")));
                 } else if (task instanceof MultiMCModpackInstallTask) {
@@ -109,11 +110,10 @@ public final class TaskListPane extends StackPane {
                 ProgressListNode node = new ProgressListNode(task);
                 nodes.put(task, node);
                 Platform.runLater(() -> listBox.add(node));
-
             }
 
             @Override
-            public void onFinished(Task task) {
+            public void onFinished(Task<?> task) {
                 ProgressListNode node = nodes.remove(task);
                 if (node == null)
                     return;
@@ -125,7 +125,7 @@ public final class TaskListPane extends StackPane {
             }
 
             @Override
-            public void onFailed(Task task, Throwable throwable) {
+            public void onFailed(Task<?> task, Throwable throwable) {
                 ProgressListNode node = nodes.remove(task);
                 if (node == null)
                     return;
@@ -137,20 +137,19 @@ public final class TaskListPane extends StackPane {
         });
     }
 
-    private static class ProgressListNode extends VBox {
+    private static class ProgressListNode extends BorderPane {
         private final JFXProgressBar bar = new JFXProgressBar();
         private final Label title = new Label();
         private final Label state = new Label();
 
-        public ProgressListNode(Task task) {
+        public ProgressListNode(Task<?> task) {
             bar.progressProperty().bind(task.progressProperty());
             title.setText(task.getName());
             state.textProperty().bind(task.messageProperty());
 
-            BorderPane borderPane = new BorderPane();
-            borderPane.setLeft(title);
-            borderPane.setRight(state);
-            getChildren().addAll(borderPane, bar);
+            setLeft(title);
+            setRight(state);
+            setBottom(bar);
 
             bar.minWidthProperty().bind(widthProperty());
             bar.prefWidthProperty().bind(widthProperty());

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,37 +13,21 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-import javafx.css.*;
-import javafx.scene.Node;
 import javafx.scene.control.Label;
-import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
-import javafx.scene.paint.Color;
-import javafx.scene.paint.Paint;
-import javafx.scene.text.Font;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class TwoLineListItem extends StackPane {
+public class TwoLineListItem extends VBox {
     private static final String DEFAULT_STYLE_CLASS = "two-line-list-item";
 
     private final StringProperty title = new SimpleStringProperty(this, "title");
     private final StringProperty subtitle = new SimpleStringProperty(this, "subtitle");
 
-    private final StyleableObjectProperty<Font> titleFont = new SimpleStyleableObjectProperty<>(StyleableProperties.TITLE_FONT, this, "title-font", Font.font(15));
-    private final StyleableObjectProperty<Font> subtitleFont = new SimpleStyleableObjectProperty<>(StyleableProperties.SUBTITLE_FONT, this, "subtitle-font", Font.getDefault());
-
-    private final StyleableObjectProperty<Paint> titleFill = new SimpleStyleableObjectProperty<>(StyleableProperties.TITLE_FILL, this, "title-fill", Color.BLACK);
-    private final StyleableObjectProperty<Paint> subtitleFill = new SimpleStyleableObjectProperty<>(StyleableProperties.SUBTITLE_FILL, this, "subtitle-fill", Color.GRAY);
-
     public TwoLineListItem(String titleString, String subtitleString) {
         this();
 
@@ -52,20 +36,16 @@ public class TwoLineListItem extends StackPane {
     }
 
     public TwoLineListItem() {
+        setMouseTransparent(true);
         Label lblTitle = new Label();
-        lblTitle.textFillProperty().bind(titleFill);
-        lblTitle.fontProperty().bind(titleFont);
+        lblTitle.getStyleClass().add("title");
         lblTitle.textProperty().bind(title);
 
         Label lblSubtitle = new Label();
-        lblSubtitle.textFillProperty().bind(subtitleFill);
-        lblSubtitle.fontProperty().bind(subtitleFont);
+        lblSubtitle.getStyleClass().add("subtitle");
         lblSubtitle.textProperty().bind(subtitle);
 
-        VBox vbox = new VBox();
-        vbox.getChildren().setAll(lblTitle, lblSubtitle);
-        getChildren().setAll(vbox);
-
+        getChildren().setAll(lblTitle, lblSubtitle);
         getStyleClass().add(DEFAULT_STYLE_CLASS);
     }
 
@@ -93,128 +73,8 @@ public class TwoLineListItem extends StackPane {
         this.subtitle.set(subtitle);
     }
 
-    public Font getTitleFont() {
-        return titleFont.get();
-    }
-
-    public StyleableObjectProperty<Font> titleFontProperty() {
-        return titleFont;
-    }
-
-    public void setTitleFont(Font titleFont) {
-        this.titleFont.set(titleFont);
-    }
-
-    public Font getSubtitleFont() {
-        return subtitleFont.get();
-    }
-
-    public StyleableObjectProperty<Font> subtitleFontProperty() {
-        return subtitleFont;
-    }
-
-    public void setSubtitleFont(Font subtitleFont) {
-        this.subtitleFont.set(subtitleFont);
-    }
-
-    public Paint getTitleFill() {
-        return titleFill.get();
-    }
-
-    public StyleableObjectProperty<Paint> titleFillProperty() {
-        return titleFill;
-    }
-
-    public void setTitleFill(Paint titleFill) {
-        this.titleFill.set(titleFill);
-    }
-
-    public Paint getSubtitleFill() {
-        return subtitleFill.get();
-    }
-
-    public StyleableObjectProperty<Paint> subtitleFillProperty() {
-        return subtitleFill;
-    }
-
-    public void setSubtitleFill(Paint subtitleFill) {
-        this.subtitleFill.set(subtitleFill);
-    }
-
     @Override
     public String toString() {
         return getTitle();
     }
-
-    @Override
-    public List<CssMetaData<? extends Styleable, ?>> getCssMetaData() {
-        return getClassCssMetaData();
-    }
-
-    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
-        return StyleableProperties.STYLEABLES;
-    }
-
-    private static class StyleableProperties {
-
-        private static final FontCssMetaData<TwoLineListItem> TITLE_FONT = new FontCssMetaData<TwoLineListItem>("-jfx-title-font", Font.font(15)) {
-            @Override
-            public boolean isSettable(TwoLineListItem control) {
-                return control.title == null || !control.title.isBound();
-            }
-
-            @Override
-            public StyleableProperty<Font> getStyleableProperty(TwoLineListItem control) {
-                return control.titleFontProperty();
-            }
-        };
-
-        private static final FontCssMetaData<TwoLineListItem> SUBTITLE_FONT = new FontCssMetaData<TwoLineListItem>("-jfx-subtitle-font", Font.getDefault()) {
-            @Override
-            public boolean isSettable(TwoLineListItem control) {
-                return control.subtitle == null || !control.subtitle.isBound();
-            }
-
-            @Override
-            public StyleableProperty<Font> getStyleableProperty(TwoLineListItem control) {
-                return control.subtitleFontProperty();
-            }
-        };
-
-        private static final CssMetaData<TwoLineListItem, Paint> TITLE_FILL = new CssMetaData<TwoLineListItem, Paint>("-jfx-title-fill", StyleConverter.getPaintConverter(), Color.BLACK) {
-            @Override
-            public boolean isSettable(TwoLineListItem control) {
-                return control.titleFill == null || !control.titleFill.isBound();
-            }
-
-            @Override
-            public StyleableProperty<Paint> getStyleableProperty(TwoLineListItem control) {
-                return control.titleFillProperty();
-            }
-        };
-
-        private static final CssMetaData<TwoLineListItem, Paint> SUBTITLE_FILL = new CssMetaData<TwoLineListItem, Paint>("-jfx-subtitle-fill", StyleConverter.getPaintConverter(), Color.GRAY) {
-            @Override
-            public boolean isSettable(TwoLineListItem control) {
-                return control.subtitleFill == null || !control.subtitleFill.isBound();
-            }
-
-            @Override
-            public StyleableProperty<Paint> getStyleableProperty(TwoLineListItem control) {
-                return control.subtitleFillProperty();
-            }
-        };
-
-        private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
-
-        private StyleableProperties() {
-        }
-
-        static {
-            List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(Node.getClassCssMetaData());
-            Collections.addAll(styleables, TITLE_FONT);
-            Collections.addAll(styleables, SUBTITLE_FONT);
-            STYLEABLES = Collections.unmodifiableList(styleables);
-        }
-    }
 }

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.decorator;
 

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.decorator;
 
@@ -40,16 +40,14 @@ import javafx.util.Duration;
 import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDnD;
-import org.jackhuang.hmcl.setting.ConfigHolder;
+import org.jackhuang.hmcl.setting.Config;
 import org.jackhuang.hmcl.setting.EnumBackgroundImage;
-import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.account.AddAuthlibInjectorServerPane;
 import org.jackhuang.hmcl.ui.construct.*;
 import org.jackhuang.hmcl.ui.wizard.Refreshable;
 import org.jackhuang.hmcl.ui.wizard.WizardProvider;
-import org.jackhuang.hmcl.util.FutureCallback;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -59,7 +57,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
 import java.util.Random;
-import java.util.function.Consumer;
 import java.util.logging.Level;
 
 import static java.util.stream.Collectors.toList;
@@ -108,9 +105,11 @@ public class DecoratorController {
             nowAnimation.play();
         });
 
-        if (ConfigHolder.config().getUiVersion() < Controllers.UI_VERSION && config().getLocalization().getLocale() == Locale.CHINA) {
-            ConfigHolder.config().setUiVersion(Controllers.UI_VERSION);
-            decorator.getContainer().setAll(welcomeView);
+        if (switchedToNewUI()) {
+            if (config().getLocalization().getLocale() == Locale.CHINA) {
+                // currently, user guide is only available in Chinese
+                decorator.getContainer().setAll(welcomeView);
+            }
         }
 
         setupBackground();
@@ -122,6 +121,17 @@ public class DecoratorController {
         return decorator;
     }
 
+    /**
+     * @return true if the user is seeing the current version of UI for the first time.
+     */
+    private boolean switchedToNewUI() {
+        if (config().getUiVersion() < Config.CURRENT_UI_VERSION) {
+            config().setUiVersion(Config.CURRENT_UI_VERSION);
+            return true;
+        }
+        return false;
+    }
+
     // ==== Background ====
 
     private void setupBackground() {
@@ -346,45 +356,6 @@ public class DecoratorController {
         }
     }
 
-    public void showDialog(String text) {
-        showDialog(text, null);
-    }
-
-    public void showDialog(String text, String title) {
-        showDialog(text, title, MessageBox.INFORMATION_MESSAGE);
-    }
-
-    public void showDialog(String text, String title, int type) {
-        showDialog(text, title, type, null);
-    }
-
-    public void showDialog(String text, String title, int type, Runnable onAccept) {
-        showDialog(new MessageDialogPane(text, title, type, onAccept));
-    }
-
-    public void showConfirmDialog(String text, String title, Runnable onAccept, Runnable onCancel) {
-        showDialog(new MessageDialogPane(text, title, onAccept, onCancel));
-    }
-
-    public InputDialogPane showInputDialog(String text, FutureCallback<String> onResult) {
-        InputDialogPane pane = new InputDialogPane(text, onResult);
-        showDialog(pane);
-        return pane;
-    }
-
-    public Region showTaskDialog(TaskExecutor executor, String title, String subtitle) {
-        return showTaskDialog(executor, title, subtitle, null);
-    }
-
-    public Region showTaskDialog(TaskExecutor executor, String title, String subtitle, Consumer<Region> onCancel) {
-        TaskExecutorDialogPane pane = new TaskExecutorDialogPane(onCancel);
-        pane.setTitle(title);
-        pane.setSubtitle(subtitle);
-        pane.setExecutor(executor);
-        showDialog(pane);
-        return pane;
-    }
-
     // ==== Wizard ====
 
     public void startWizard(WizardProvider wizardProvider) {

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -13,7 +13,7 @@
  * 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 {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.decorator;