add: support change download provider in install wizard

add up-to-date download link

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,28 @@
+# 公告
+
+提交前请确保你的启动器版本是**最新的开发版**，可以在启动器设置中更换更新通道至开发版获取更新。
+
+**如果你在阅读完本公告后仍然希望在此处发布 issue，请将公告内容删去，并按照下面的模板填入相关信息。**
+
+
+
+我们发现，对于不经常检查邮箱的人来说，GitHub Issues 的反馈效率太低，时隔几个小时甚至一天的情况很多。为了改善反馈效率，并将积极为 HMCL 提供问题反馈和建议的人聚集起来，我们希望在这里反馈的人可以在 HMCL 3 用户 QQ 群：219177735 中反馈信息，**而不在 GitHub Issues 中反馈问题**。
+
+如果你希望在 QQ 群中反馈问题，也请将下面的信息表填好直接发在群中，加快我们的沟通速度。
+
+
+
+# 问题提交
+
+*完整地填下面的问题提交表对我们很重要，这可以加快我们分析问题原因的速度。*
+
+* 启动器版本：
+* 操作系统：
+* Java 版本：
+* 错误截图（最好请将整个电脑屏幕的截图发上来）：
+* 游戏版本（如果是启动通过启动器自带的自动安装功能安装的游戏）：
+* 对游戏做的修改（是否自行通过安装器安装 Rift 等 API，以及 mod）：
+* 游戏崩溃报告（如果有）：
+* 启动器崩溃报告（如果有）：
+* 启动器日志文件（出现问题后点击启动器设置中的【导出启动器日志】按钮）：
+* 问题描述（如何触发问题）：

.github/workflows/gradle.yml

@@ -0,0 +1,18 @@
+name: Java CI
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+        java-package: jdk+fx
+    - name: Build with Gradle
+      run: ./gradlew build

.gitignore

@@ -25,8 +25,14 @@ NVIDIA
 /HMCLCore/out/
 
 # eclipse
+/bin/
+/HMCL/bin/
+/HMCLCore/bin/
 .classpath
 .project
+.settings
 
 # netbeans
-.nb-gradle
+.nb-gradle
+
+*.exe

HMCL/build.gradle

@@ -1,5 +1,6 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '2.0.4'
+    id 'com.github.johnrengelman.shadow' version '4.0.0'
+    id 'application'
 }
 
 import java.nio.file.FileSystems
@@ -20,9 +21,11 @@ import org.tukaani.xz.XZOutputStream
 def buildnumber = System.getenv("BUILD_NUMBER") ?: "SNAPSHOT"
 if (System.getenv("BUILD_NUMBER") != null && System.getenv("BUILD_NUMBER_OFFSET") != null)
     buildnumber = (Integer.parseInt(System.getenv("BUILD_NUMBER")) - Integer.parseInt(System.getenv("BUILD_NUMBER_OFFSET"))).toString()
-def versionroot = System.getenv("VERSION_ROOT") ?: "3.1"
+def versionroot = System.getenv("VERSION_ROOT") ?: "3.2"
 version = versionroot + '.' + buildnumber
 
+mainClassName = 'org.jackhuang.hmcl.Main'
+
 dependencies {
     compile project(":HMCLCore")
     compile rootProject.files("lib/JFoenix.jar")
@@ -75,7 +78,7 @@ def repack(File file) {
 jar {
     manifest {
         attributes 'Created-By': 'Copyright(c) 2013-2018 huangyuhui.',
-                'Main-Class': 'org.jackhuang.hmcl.Main',
+                'Main-Class': mainClassName,
                 'Multi-Release': 'true',
                 'Implementation-Version': version
     }
@@ -107,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 {
@@ -119,7 +140,7 @@ task makePack(dependsOn: jar) {
 
 task makePackXz(dependsOn: makePack) doLast {
     def packXz = new File(makePack.outputPath.parentFile, makePack.outputPath.name + ".xz")
-    new XZOutputStream(packXz.newOutputStream(), new LZMA2Options(6)).withCloseable { it << makePack.outputPath.bytes }
+    new XZOutputStream(packXz.newOutputStream(), new LZMA2Options(5)).withCloseable { it << makePack.outputPath.bytes }
     createChecksum(packXz)
 }
 

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,20 +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;
 
-import com.jfoenix.concurrency.JFXUtilities;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.stage.Stage;
+import org.jackhuang.hmcl.setting.ConfigHolder;
 import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.AsyncTaskExecutor;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.upgrade.UpdateChecker;
-import org.jackhuang.hmcl.util.*;
+import org.jackhuang.hmcl.util.CrashReporter;
+import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;
 
 import java.io.File;
+import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -36,7 +41,9 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class Launcher extends Application {
 
@@ -45,16 +52,23 @@ public final class Launcher extends Application {
         Thread.currentThread().setUncaughtExceptionHandler(CRASH_REPORTER);
 
         try {
-            // 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());
+            try {
+                ConfigHolder.init();
+            } catch (IOException e) {
+                Main.showErrorAndExit(i18n("fatal.config_loading_failure", Paths.get("").toAbsolutePath().normalize()));
+            }
 
-            UpdateChecker.init();
+            // 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.show();
+                UpdateChecker.init();
+
+                primaryStage.show();
+            });
         } catch (Throwable e) {
             CRASH_REPORTER.uncaughtException(Thread.currentThread(), e);
         }
@@ -62,23 +76,16 @@ public final class Launcher extends Application {
 
     public static void main(String[] args) {
         Thread.setDefaultUncaughtExceptionHandler(CRASH_REPORTER);
-
-        if (!FileUtils.makeDirectory(LOG_DIRECTORY))
-            System.out.println("Unable to create log directory " + LOG_DIRECTORY + ", log files cannot be generated.");
+        AsyncTaskExecutor.setUncaughtExceptionHandler(new CrashReporter(false));
 
         try {
-            Logging.start(LOG_DIRECTORY);
-
-            // NetworkUtils.setUserAgentSupplier(() -> "Hello Minecraft! Launcher");
-            Constants.UI_THREAD_SCHEDULER = Constants.JAVAFX_UI_THREAD_SCHEDULER;
-
             LOG.info("*** " + Metadata.TITLE + " ***");
             LOG.info("Operating System: " + System.getProperty("os.name") + ' ' + OperatingSystem.SYSTEM_VERSION);
             LOG.info("Java Version: " + System.getProperty("java.version") + ", " + System.getProperty("java.vendor"));
             LOG.info("Java VM Version: " + System.getProperty("java.vm.name") + " (" + System.getProperty("java.vm.info") + "), " + System.getProperty("java.vm.vendor"));
             LOG.info("Java Home: " + System.getProperty("java.home"));
             LOG.info("Current Directory: " + Paths.get("").toAbsolutePath());
-            LOG.info("HMCL Directory: " + HMCL_DIRECTORY);
+            LOG.info("HMCL Directory: " + Metadata.HMCL_DIRECTORY);
             LOG.info("Memory: " + Runtime.getRuntime().maxMemory() / 1024 / 1024 + "MB");
             ManagementFactory.getMemoryPoolMXBeans().stream().filter(bean -> bean.getName().equals("Metaspace")).findAny()
                     .ifPresent(bean -> LOG.info("Metaspace: " + bean.getUsage().getUsed() / 1024 / 1024 + "MB"));
@@ -92,7 +99,7 @@ public final class Launcher extends Application {
     public static void stopApplication() {
         LOG.info("Stopping application.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
 
-        JFXUtilities.runInFX(() -> {
+        runInFX(() -> {
             if (Controllers.getStage() == null)
                 return;
             Controllers.getStage().close();
@@ -106,7 +113,7 @@ public final class Launcher extends Application {
     public static void stopWithoutPlatform() {
         LOG.info("Stopping application without JavaFX Toolkit.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
 
-        JFXUtilities.runInFX(() -> {
+        runInFX(() -> {
             if (Controllers.getStage() == null)
                 return;
             Controllers.getStage().close();
@@ -135,9 +142,5 @@ public final class Launcher extends Application {
             return result;
     }
 
-    public static final File MINECRAFT_DIRECTORY = OperatingSystem.getWorkingDirectory("minecraft");
-    public static final File HMCL_DIRECTORY = OperatingSystem.getWorkingDirectory("hmcl");
-    public static final File LOG_DIRECTORY = new File(Launcher.HMCL_DIRECTORY, "logs");
-
-    public static final CrashReporter CRASH_REPORTER = new CrashReporter();
+    public static final CrashReporter CRASH_REPORTER = new CrashReporter(true);
 }

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,26 +13,31 @@
  * 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 org.jackhuang.hmcl.setting.ConfigHolder;
 import org.jackhuang.hmcl.upgrade.UpdateHandler;
+import org.jackhuang.hmcl.util.Logging;
 
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.X509TrustManager;
+import javax.net.ssl.*;
 import javax.swing.*;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.security.KeyManagementException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
+import java.util.Collections;
 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;
 
@@ -40,21 +45,24 @@ 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(() -> {
+            fixLetsEncrypt();
+            checkDSTRootCAX3();
+        }, "CA Certificate Check", true);
+
+        Logging.start(Metadata.HMCL_DIRECTORY.resolve("logs"));
 
         if (UpdateHandler.processArguments(args)) {
             return;
         }
 
-        try {
-            ConfigHolder.init();
-        } catch (IOException e) {
-            showErrorAndExit(i18n("fatal.config_loading_failure", Paths.get("").toAbsolutePath().normalize()));
-        }
-
         Launcher.main(args);
     }
 
@@ -100,7 +108,7 @@ public final class Main {
     /**
      * Indicates that a fatal error has occurred, and that the application cannot start.
      */
-    private static void showErrorAndExit(String message) {
+    static void showErrorAndExit(String message) {
         System.err.println(message);
         System.err.println("A fatal error has occurred, forcibly exiting.");
         JOptionPane.showMessageDialog(null, message, "Error", JOptionPane.ERROR_MESSAGE);
@@ -110,10 +118,37 @@ public final class Main {
     /**
      * Indicates that potential issues have been detected, and that the application may not function properly (but it can still run).
      */
-    private static void showWarningAndContinue(String message) {
+    static void showWarningAndContinue(String message) {
         System.err.println(message);
         System.err.println("Potential issues have been detected.");
         JOptionPane.showMessageDialog(null, message, "Warning", JOptionPane.WARNING_MESSAGE);
     }
 
+    static void fixLetsEncrypt() {
+        try {
+            KeyStore defaultKeyStore = KeyStore.getInstance(KeyStore.getDefaultType());
+            Path ksPath = Paths.get(System.getProperty("java.home"), "lib", "security", "cacerts");
+            defaultKeyStore.load(Files.newInputStream(ksPath), "changeit".toCharArray());
+
+            KeyStore letsEncryptKeyStore = KeyStore.getInstance(KeyStore.getDefaultType());
+            InputStream letsEncryptFile = Main.class.getResourceAsStream("/assets/lekeystore.jks");
+            letsEncryptKeyStore.load(letsEncryptFile, "supersecretpassword".toCharArray());
+
+            KeyStore merged = KeyStore.getInstance(KeyStore.getDefaultType());
+            merged.load(null, new char[0]);
+            for (String alias : Collections.list(letsEncryptKeyStore.aliases()))
+                merged.setCertificateEntry(alias, letsEncryptKeyStore.getCertificate(alias));
+            for (String alias : Collections.list(defaultKeyStore.aliases()))
+                merged.setCertificateEntry(alias, defaultKeyStore.getCertificate(alias));
+
+            TrustManagerFactory instance = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+            instance.init(merged);
+            SSLContext tls = SSLContext.getInstance("TLS");
+            tls.init(null, instance.getTrustManagers(), null);
+            HttpsURLConnection.setDefaultSSLSocketFactory(tls.getSocketFactory());
+            LOG.info("Added Lets Encrypt root certificates as additional trust");
+        } catch (KeyStoreException | IOException | NoSuchAlgorithmException | CertificateException | KeyManagementException e) {
+            LOG.log(Level.SEVERE, "Failed to load lets encrypt certificate. Expect problems", e);
+        }
+    }
 }

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,11 +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;
 
-import org.jackhuang.hmcl.util.JarUtils;
+import java.nio.file.Path;
+
+import org.jackhuang.hmcl.util.io.JarUtils;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;
 
 /**
  * Stores metadata about this application.
@@ -31,5 +34,10 @@ public final class Metadata {
     
     public static final String UPDATE_URL = System.getProperty("hmcl.update_source.override", "https://hmcl.huangyuhui.net/api/update_link");
     public static final String CONTACT_URL = "https://hmcl.huangyuhui.net/contact";
+    public static final String HELP_URL = "https://hmcl.huangyuhui.net/help";
+    public static final String CHANGELOG_URL = "https://hmcl.huangyuhui.net/changelog/";
     public static final String PUBLISH_URL = "http://www.mcbbs.net/thread-142335-1-1.html";
+
+    public static final Path MINECRAFT_DIRECTORY = OperatingSystem.getWorkingDirectory("minecraft");
+    public static final Path HMCL_DIRECTORY = OperatingSystem.getWorkingDirectory("hmcl");
 }

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

@@ -1,176 +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.geometry.Rectangle2D;
-import javafx.scene.image.Image;
-import org.jackhuang.hmcl.Launcher;
-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.NetworkUtils;
-
-import java.io.File;
-import java.util.*;
-
-public final class AccountHelper {
-
-    private AccountHelper() {}
-
-    public static final File SKIN_DIR = new File(Launcher.HMCL_DIRECTORY, "skins");
-
-    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 Rectangle2D getViewport(double scaleRatio) {
-        double size = 8.0 * scaleRatio;
-        return new Rectangle2D(size, size, size, size);
-    }
-
-    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();
-
-        Optional<Texture> texture = account.getSkin(profile);
-        if (!texture.isPresent()) return;
-        String url = texture.get().getUrl();
-        File file = getSkinFile(profile.getId());
-        if (!refresh && file.exists())
-            return;
-        new FileDownloadTask(NetworkUtils.toURL(url), file).run();
-    }
-
-    private static void downloadSkin(YggdrasilAccount account, boolean refresh) throws Exception {
-        account.clearCache();
-
-        if (account.getCharacter() == null) return;
-        Optional<Texture> texture = account.getSkin();
-        if (!texture.isPresent()) return;
-        String url = texture.get().getUrl();
-        File file = getSkinFile(account.getUUID());
-        if (!refresh && file.exists())
-            return;
-        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", 4);
-    }
-
-    public static Image getAlexSkin(double scaleRatio) {
-        return scale("/assets/img/alex.png", 4);
-    }
-
-    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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package org.jackhuang.hmcl.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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -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;
 
@@ -29,16 +29,16 @@ import java.util.Map;
  */
 public final class HMCLGameLauncher extends DefaultLauncher {
 
-    public HMCLGameLauncher(GameRepository repository, String versionId, AuthInfo authInfo, LaunchOptions options) {
-        this(repository, versionId, authInfo, options, null);
+    public HMCLGameLauncher(GameRepository repository, Version version, AuthInfo authInfo, LaunchOptions options) {
+        this(repository, version, authInfo, options, null);
     }
 
-    public HMCLGameLauncher(GameRepository repository, String versionId, AuthInfo authInfo, LaunchOptions options, ProcessListener listener) {
-        this(repository, versionId, authInfo, options, listener, true);
+    public HMCLGameLauncher(GameRepository repository, Version version, AuthInfo authInfo, LaunchOptions options, ProcessListener listener) {
+        this(repository, version, authInfo, options, listener, true);
     }
 
-    public HMCLGameLauncher(GameRepository repository, String versionId, AuthInfo authInfo, LaunchOptions options, ProcessListener listener, boolean daemon) {
-        super(repository, versionId, authInfo, options, listener, daemon);
+    public HMCLGameLauncher(GameRepository repository, Version version, AuthInfo authInfo, LaunchOptions options, ProcessListener listener, boolean daemon) {
+        super(repository, version, authInfo, options, listener, daemon);
     }
 
     @Override

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,33 +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.game;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-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 javafx.scene.image.Image;
+import org.jackhuang.hmcl.mod.Modpack;
 import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.setting.VersionSetting;
-import org.jackhuang.hmcl.util.FileUtils;
 import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.io.FileUtils;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.util.*;
 import java.util.logging.Level;
 
+import static org.jackhuang.hmcl.ui.FXUtils.newImage;
+
 public class HMCLGameRepository extends DefaultGameRepository {
     private final Profile profile;
-    private final Map<String, VersionSetting> versionSettings = new HashMap<>();
-    private final Set<String> beingModpackVersions = new HashSet<>();
 
-    public boolean checkedModpack = false, checkingModpack = false;
+    // local version settings
+    private final Map<String, VersionSetting> localVersionSettings = new HashMap<>();
+    private final Set<String> beingModpackVersions = new HashSet<>();
 
     public HMCLGameRepository(Profile profile, File baseDirectory) {
         super(baseDirectory);
@@ -50,26 +50,30 @@ public class HMCLGameRepository extends DefaultGameRepository {
         return profile;
     }
 
+    @Override
+    public GameDirectoryType getGameDirectoryType(String id) {
+        if (beingModpackVersions.contains(id) || isModpack(id)) {
+            return GameDirectoryType.VERSION_FOLDER;
+        } else {
+            return getVersionSetting(id).getGameDirType();
+        }
+    }
+
     @Override
     public File getRunDirectory(String id) {
-        if (beingModpackVersions.contains(id) || isModpack(id))
-            return getVersionRoot(id);
-        else {
-            VersionSetting vs = profile.getVersionSetting(id);
-            switch (vs.getGameDirType()) {
-                case VERSION_FOLDER: return getVersionRoot(id);
-                case ROOT_FOLDER: return super.getRunDirectory(id);
-                case CUSTOM: return new File(vs.getGameDir());
-                default: throw new Error();
-            }
+        switch (getGameDirectoryType(id)) {
+            case VERSION_FOLDER: return getVersionRoot(id);
+            case ROOT_FOLDER: return super.getRunDirectory(id);
+            case CUSTOM: return new File(getVersionSetting(id).getGameDir());
+            default: throw new Error();
         }
     }
 
     @Override
     protected void refreshVersionsImpl() {
-        versionSettings.clear();
+        localVersionSettings.clear();
         super.refreshVersionsImpl();
-        versions.keySet().forEach(this::loadVersionSetting);
+        versions.keySet().forEach(this::loadLocalVersionSetting);
 
         try {
             File file = new File(getBaseDirectory(), "launcher_profiles.json");
@@ -80,31 +84,72 @@ 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();
     }
 
-    private File getVersionSettingFile(String id) {
+    private void clean(File directory) throws IOException {
+        FileUtils.deleteDirectory(new File(directory, "crash-reports"));
+        FileUtils.deleteDirectory(new File(directory, "logs"));
+    }
+
+    public void clean(String id) throws IOException {
+        clean(getBaseDirectory());
+        clean(getRunDirectory(id));
+    }
+
+    public void duplicateVersion(String srcId, String dstId, boolean copySaves) throws IOException {
+        File srcDir = getVersionRoot(srcId);
+        File dstDir = getVersionRoot(dstId);
+
+        if (dstDir.exists()) throw new IOException("Version exists");
+        FileUtils.copyDirectory(srcDir.toPath(), dstDir.toPath());
+        Files.move(dstDir.toPath().resolve(srcId + ".jar"), dstDir.toPath().resolve(dstId + ".jar"));
+        Files.move(dstDir.toPath().resolve(srcId + ".json"), dstDir.toPath().resolve(dstId + ".json"));
+        VersionSetting oldVersionSetting = getVersionSetting(srcId).clone();
+        GameDirectoryType originalGameDirType = oldVersionSetting.getGameDirType();
+        oldVersionSetting.setUsesGlobal(false);
+        oldVersionSetting.setGameDirType(GameDirectoryType.VERSION_FOLDER);
+        VersionSetting newVersionSetting = initLocalVersionSetting(dstId, oldVersionSetting);
+        saveVersionSetting(dstId);
+
+        File srcGameDir = getRunDirectory(srcId);
+        File dstGameDir = getRunDirectory(dstId);
+
+        List<String> blackList = new ArrayList<>(Arrays.asList(
+                "regex:(.*?)\\.log",
+                "usernamecache.json", "usercache.json", // Minecraft
+                "launcher_profiles.json", "launcher.pack.lzma", // Minecraft Launcher
+                "backup", "pack.json", "launcher.jar", "cache", // HMCL
+                ".curseclient", // Curse
+                ".fabric", ".mixin.out", // Fabric
+                "jars", "logs", "versions", "assets", "libraries", "crash-reports", "NVIDIA", "AMD", "screenshots", "natives", "native", "$native", "server-resource-packs", // Minecraft
+                "downloads", // Curse
+                "asm", "backups", "TCNodeTracker", "CustomDISkins", "data", "CustomSkinLoader/caches" // Mods
+        ));
+        blackList.add(srcId + ".jar");
+        blackList.add(srcId + ".json");
+        if (!copySaves)
+            blackList.add("saves");
+
+        if (originalGameDirType != GameDirectoryType.VERSION_FOLDER)
+            FileUtils.copyDirectory(srcGameDir.toPath(), dstGameDir.toPath(), path -> Modpack.acceptFile(path, blackList, null));
+    }
+
+    private File getLocalVersionSettingFile(String id) {
         return new File(getVersionRoot(id), "hmclversion.cfg");
     }
 
-    private void loadVersionSetting(String id) {
-        File file = getVersionSettingFile(id);
+    private void loadLocalVersionSetting(String id) {
+        File file = getLocalVersionSettingFile(id);
         if (file.exists())
             try {
                 VersionSetting versionSetting = GSON.fromJson(FileUtils.readText(file), VersionSetting.class);
-                initVersionSetting(id, versionSetting);
+                initLocalVersionSetting(id, versionSetting);
             } catch (Exception ex) {
                 // If [JsonParseException], [IOException] or [NullPointerException] happens, the json file is malformed and needed to be recreated.
-                initVersionSetting(id, new VersionSetting());
+                initLocalVersionSetting(id, new VersionSetting());
             }
     }
 
@@ -113,18 +158,18 @@ public class HMCLGameRepository extends DefaultGameRepository {
      * @param id the version id.
      * @return new version setting, null if given version does not exist.
      */
-    public VersionSetting createVersionSetting(String id) {
+    public VersionSetting createLocalVersionSetting(String id) {
         if (!hasVersion(id))
             return null;
-        if (versionSettings.containsKey(id))
-            return getVersionSetting(id);
+        if (localVersionSettings.containsKey(id))
+            return getLocalVersionSetting(id);
         else
-            return initVersionSetting(id, new VersionSetting());
+            return initLocalVersionSetting(id, new VersionSetting());
     }
 
-    private VersionSetting initVersionSetting(String id, VersionSetting vs) {
+    private VersionSetting initLocalVersionSetting(String id, VersionSetting vs) {
+        localVersionSettings.put(id, vs);
         vs.addPropertyChangedListener(a -> saveVersionSetting(id));
-        versionSettings.put(id, vs);
         return vs;
     }
 
@@ -133,30 +178,57 @@ public class HMCLGameRepository extends DefaultGameRepository {
      *
      * @param id version id
      *
-     * @return may return null if the id not exists
+     * @return corresponding version setting, null if the version has no its own version setting.
      */
-    public VersionSetting getVersionSetting(String id) {
-        if (!versionSettings.containsKey(id))
-            loadVersionSetting(id);
-        VersionSetting setting = versionSettings.get(id);
+    public VersionSetting getLocalVersionSetting(String id) {
+        if (!localVersionSettings.containsKey(id))
+            loadLocalVersionSetting(id);
+        VersionSetting setting = localVersionSettings.get(id);
         if (setting != null && isModpack(id))
-            setting.setGameDirType(EnumGameDirectory.VERSION_FOLDER);
+            setting.setGameDirType(GameDirectoryType.VERSION_FOLDER);
         return setting;
     }
 
-    public File getVersionIcon(String id) {
+    public VersionSetting getVersionSetting(String id) {
+        VersionSetting vs = getLocalVersionSetting(id);
+        if (vs == null || vs.isUsesGlobal()) {
+            profile.getGlobal().setGlobal(true); // always keep global.isGlobal = true
+            profile.getGlobal().setUsesGlobal(true);
+            return profile.getGlobal();
+        } else
+            return vs;
+    }
+
+    public File getVersionIconFile(String id) {
         return new File(getVersionRoot(id), "icon.png");
     }
 
+    public Image getVersionIconImage(String id) {
+        if (id == null || !isLoaded())
+            return newImage("/assets/img/grass.png");
+
+        Version version = getVersion(id).resolve(this);
+        File iconFile = getVersionIconFile(id);
+        if (iconFile.exists())
+            return new Image("file:" + iconFile.getAbsolutePath());
+        else if (version.getMainClass() != null &&
+                ("net.minecraft.launchwrapper.Launch".equals(version.getMainClass())
+                        || version.getMainClass().startsWith("net.fabricmc")
+                        || "cpw.mods.modlauncher.Launcher".equals(version.getMainClass())))
+            return newImage("/assets/img/furnace.png");
+        else
+            return newImage("/assets/img/grass.png");
+    }
+
     public boolean saveVersionSetting(String id) {
-        if (!versionSettings.containsKey(id))
+        if (!localVersionSettings.containsKey(id))
             return false;
-        File file = getVersionSettingFile(id);
+        File file = getLocalVersionSettingFile(id);
         if (!FileUtils.makeDirectory(file.getAbsoluteFile().getParentFile()))
             return false;
 
         try {
-            FileUtils.writeText(file, GSON.toJson(versionSettings.get(id)));
+            FileUtils.writeText(file, GSON.toJson(localVersionSettings.get(id)));
             return true;
         } catch (IOException e) {
             Logging.LOG.log(Level.SEVERE, "Unable to save version setting of " + id, e);
@@ -164,6 +236,27 @@ public class HMCLGameRepository extends DefaultGameRepository {
         }
     }
 
+    /**
+     * Make version use self version settings instead of the global one.
+     * @param id the version id.
+     * @return specialized version setting, null if given version does not exist.
+     */
+    public VersionSetting specializeVersionSetting(String id) {
+        VersionSetting vs = getLocalVersionSetting(id);
+        if (vs == null)
+            vs = createLocalVersionSetting(id);
+        if (vs == null)
+            return null;
+        vs.setUsesGlobal(false);
+        return vs;
+    }
+
+    public void globalizeVersionSetting(String id) {
+        VersionSetting vs = getLocalVersionSetting(id);
+        if (vs != null)
+            vs.setUsesGlobal(true);
+    }
+
     public boolean forbidsVersion(String id) {
         return FORBIDDEN.contains(id);
     }
@@ -181,8 +274,22 @@ public class HMCLGameRepository extends DefaultGameRepository {
         beingModpackVersions.remove(id);
     }
 
-    private static final Gson GSON = new GsonBuilder().setPrettyPrinting()
-            .registerTypeAdapter(VersionSetting.class, VersionSetting.Serializer.INSTANCE)
+    public void markVersionLaunchedAbnormally(String id) {
+        try {
+            Files.createFile(getVersionRoot(id).toPath().resolve(".abnormal"));
+        } catch (IOException ignored) {
+        }
+    }
+
+    public boolean unmarkVersionLaunchedAbnormally(String id) {
+        File file = new File(getVersionRoot(id), ".abnormal");
+        boolean result = file.isFile();
+        file.delete();
+        return result;
+    }
+
+    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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,24 +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.game;
 
+import org.jackhuang.hmcl.mod.ModAdviser;
 import org.jackhuang.hmcl.mod.Modpack;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.util.Constants;
 import org.jackhuang.hmcl.util.Logging;
-import org.jackhuang.hmcl.util.Zipper;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
+import org.jackhuang.hmcl.util.io.Zipper;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 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;
@@ -55,26 +57,18 @@ public class HMCLModpackExportTask extends Task {
 
     @Override
     public void execute() throws Exception {
-        ArrayList<String> blackList = new ArrayList<>(HMCLModpackManager.MODPACK_BLACK_LIST);
+        ArrayList<String> blackList = new ArrayList<>(ModAdviser.MODPACK_BLACK_LIST);
         blackList.add(version + ".jar");
         blackList.add(version + ".json");
         Logging.LOG.info("Compressing game files without some files in blacklist, including files or directories: usernamecache.json, asm, logs, backups, versions, assets, usercache.json, libraries, crash-reports, launcher_profiles.json, NVIDIA, TCNodeTracker");
         try (Zipper zip = new Zipper(output.toPath())) {
-            zip.putDirectory(repository.getRunDirectory(version).toPath(), "minecraft", path -> {
-                for (String s : blackList)
-                    if (path.equals(s))
-                        return false;
-                for (String s : whitelist)
-                    if (path.equals(s))
-                        return true;
-                return false;
-            });
+            zip.putDirectory(repository.getRunDirectory(version).toPath(), "minecraft", path -> Modpack.acceptFile(path, blackList, whitelist));
 
-            Version mv = repository.getResolvedVersion(version);
+            Version mv = repository.getResolvedPreservingPatchesVersion(version);
             String gameVersion = GameVersion.minecraftVersion(repository.getVersionJar(version))
-                    .orElseThrow(() ->  new IllegalStateException("Cannot parse the version of " + version));
-            zip.putTextFile(Constants.GSON.toJson(mv.setJar(gameVersion)), "minecraft/pack.json"); // Making "jar" to gameVersion is to be compatible with old HMCL.
-            zip.putTextFile(Constants.GSON.toJson(modpack.setGameVersion(gameVersion)), "modpack.json"); // Newer HMCL only reads 'gameVersion' field.
+                    .orElseThrow(() ->  new IOException("Cannot parse the version of " + version));
+            zip.putTextFile(JsonUtils.GSON.toJson(mv.setJar(gameVersion)), "minecraft/pack.json"); // Making "jar" to gameVersion is to be compatible with old HMCL.
+            zip.putTextFile(JsonUtils.GSON.toJson(modpack.setGameVersion(gameVersion)), "modpack.json"); // Newer HMCL only reads 'gameVersion' field.
         }
     }
 }

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,39 +13,42 @@
  * 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.JsonParseException;
 import com.google.gson.reflect.TypeToken;
-import org.jackhuang.hmcl.download.DependencyManager;
-import org.jackhuang.hmcl.download.game.VersionJsonSaveTask;
+import org.jackhuang.hmcl.download.DefaultDependencyManager;
+import org.jackhuang.hmcl.download.LibraryAnalyzer;
 import org.jackhuang.hmcl.mod.MinecraftInstanceTask;
 import org.jackhuang.hmcl.mod.Modpack;
 import org.jackhuang.hmcl.mod.ModpackConfiguration;
 import org.jackhuang.hmcl.mod.ModpackInstallTask;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.util.CompressingUtils;
-import org.jackhuang.hmcl.util.Constants;
-import org.jackhuang.hmcl.util.FileUtils;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
+import org.jackhuang.hmcl.util.io.CompressingUtils;
+import org.jackhuang.hmcl.util.io.FileUtils;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
-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 DefaultDependencyManager dependency;
     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();
+        dependency = profile.getDependency();
         repository = profile.getRepository();
         this.zipFile = zipFile;
         this.name = name;
@@ -65,7 +68,7 @@ public final class HMCLModpackInstallTask extends Task {
         ModpackConfiguration<Modpack> config = null;
         try {
             if (json.exists()) {
-                config = Constants.GSON.fromJson(FileUtils.readText(json), new TypeToken<ModpackConfiguration<Modpack>>() {
+                config = JsonUtils.GSON.fromJson(FileUtils.readText(json), new TypeToken<ModpackConfiguration<Modpack>>() {
                 }.getType());
 
                 if (!MODPACK_TYPE.equals(config.getType()))
@@ -73,25 +76,43 @@ 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;
     }
 
     @Override
     public void execute() throws Exception {
         String json = CompressingUtils.readTextZipEntry(zipFile, "minecraft/pack.json");
-        Version version = Constants.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)));
+        Version originalVersion = JsonUtils.GSON.fromJson(json, Version.class).setId(name).setJar(null);
+        LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(originalVersion);
+        Task<Version> libraryTask = Task.supplyAsync(() -> originalVersion);
+        // reinstall libraries
+        // libraries of Forge and OptiFine should be obtained by installation.
+        for (LibraryAnalyzer.LibraryMark mark : analyzer) {
+            if (LibraryAnalyzer.LibraryType.MINECRAFT.getPatchId().equals(mark.getLibraryId()))
+                continue;
+            libraryTask = libraryTask.thenComposeAsync(version -> dependency.installLibraryAsync(modpack.getGameVersion(), version, mark.getLibraryId(), mark.getLibraryVersion()));
+        }
+
+        dependencies.add(libraryTask.thenComposeAsync(repository::save));
+        dependencies.add(new MinecraftInstanceTask<>(zipFile, modpack.getEncoding(), "/minecraft", modpack, MODPACK_TYPE, repository.getModpackConfiguration(name)).withStage("hmcl.modpack"));
+    }
+
+    @Override
+    public List<String> getStages() {
+        return Stream.concat(
+                dependents.stream().flatMap(task -> task.getStages().stream()),
+                Stream.of("hmcl.modpack")
+        ).collect(Collectors.toList());
     }
 
     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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,76 +13,38 @@
  * 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.JsonParseException;
 import org.jackhuang.hmcl.mod.Modpack;
-import org.jackhuang.hmcl.util.CompressingUtils;
-import org.jackhuang.hmcl.util.JsonUtils;
-import org.jackhuang.hmcl.util.Lang;
 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.util.List;
+import java.nio.charset.Charset;
+import java.nio.file.Path;
 
 /**
  * @author huangyuhui
  */
 public final class HMCLModpackManager {
 
-    public static final List<String> MODPACK_BLACK_LIST = Lang.immutableListOf(
-            "usernamecache.json", "usercache.json", // Minecraft
-            "launcher_profiles.json", "launcher.pack.lzma", // Minecraft Launcher
-            "pack.json", "launcher.jar", "hmclmc.log", // HMCL
-            "manifest.json", "minecraftinstance.json", ".curseclient", // Curse
-            "minetweaker.log", // Mods
-            "jars", "logs", "versions", "assets", "libraries", "crash-reports", "NVIDIA", "AMD", "screenshots", "natives", "native", "$native", "server-resource-packs", // Minecraft
-            "downloads", // Curse
-            "asm", "backups", "TCNodeTracker", "CustomDISkins", "data" // Mods
-    );
-    public static final List<String> MODPACK_SUGGESTED_BLACK_LIST = Lang.immutableListOf(
-            "fonts", // BetterFonts
-            "saves", "servers.dat", "options.txt", // Minecraft
-            "blueprints" /* BuildCraft */,
-            "optionsof.txt" /* OptiFine */,
-            "journeymap" /* JourneyMap */,
-            "optionsshaders.txt",
-            "mods/VoxelMods");
-
-    public static ModAdviser.ModSuggestion suggestMod(String fileName, boolean isDirectory) {
-        if (match(MODPACK_BLACK_LIST, fileName, isDirectory))
-            return ModAdviser.ModSuggestion.HIDDEN;
-        if (match(MODPACK_SUGGESTED_BLACK_LIST, fileName, isDirectory))
-            return ModAdviser.ModSuggestion.NORMAL;
-        else
-            return ModAdviser.ModSuggestion.SUGGESTED;
-    }
-
-    private static boolean match(List<String> l, String fileName, boolean isDirectory) {
-        for (String s : l)
-            if (isDirectory) {
-                if (fileName.startsWith(s + "/"))
-                    return true;
-            } else if (fileName.equals(s))
-                return true;
-        return false;
-    }
-
     /**
      * 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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,180 +13,213 @@
  * 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 javafx.application.Platform;
+import javafx.stage.Stage;
 import org.jackhuang.hmcl.Launcher;
-import org.jackhuang.hmcl.auth.Account;
-import org.jackhuang.hmcl.auth.AuthInfo;
-import org.jackhuang.hmcl.auth.AuthenticationException;
-import org.jackhuang.hmcl.auth.CredentialExpiredException;
+import org.jackhuang.hmcl.auth.*;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDownloadException;
 import org.jackhuang.hmcl.download.DefaultDependencyManager;
 import org.jackhuang.hmcl.download.MaintainTask;
+import org.jackhuang.hmcl.download.game.GameAssetIndexDownloadTask;
 import org.jackhuang.hmcl.download.game.LibraryDownloadException;
-import org.jackhuang.hmcl.launch.*;
-import org.jackhuang.hmcl.mod.CurseCompletionException;
-import org.jackhuang.hmcl.mod.CurseCompletionTask;
+import org.jackhuang.hmcl.launch.NotDecompressingNativesException;
+import org.jackhuang.hmcl.launch.PermissionException;
+import org.jackhuang.hmcl.launch.ProcessCreationException;
+import org.jackhuang.hmcl.launch.ProcessListener;
 import org.jackhuang.hmcl.mod.ModpackConfiguration;
+import org.jackhuang.hmcl.mod.curse.CurseCompletionException;
+import org.jackhuang.hmcl.mod.curse.CurseCompletionTask;
+import org.jackhuang.hmcl.mod.server.ServerModpackCompletionTask;
 import org.jackhuang.hmcl.setting.LauncherVisibility;
 import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.setting.VersionSetting;
-import org.jackhuang.hmcl.task.*;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.task.TaskExecutor;
+import org.jackhuang.hmcl.task.TaskListener;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.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.*;
+import org.jackhuang.hmcl.util.gson.UUIDTypeAdapter;
+import org.jackhuang.hmcl.util.io.ResponseCodeException;
+import org.jackhuang.hmcl.util.platform.CommandBuilder;
+import org.jackhuang.hmcl.util.platform.JavaVersion;
+import org.jackhuang.hmcl.util.platform.ManagedProcess;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;
+import org.jackhuang.hmcl.util.versioning.VersionNumber;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.net.URL;
 import java.util.*;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.CountDownLatch;
-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;
 
 public final class LauncherHelper {
-    public static final LauncherHelper INSTANCE = new LauncherHelper();
-    private LauncherHelper(){}
 
-    public static final Queue<ManagedProcess> PROCESSES = new ConcurrentLinkedQueue<>();
+    private final Profile profile;
+    private final Account account;
+    private final String selectedVersion;
+    private File scriptFile;
+    private final VersionSetting setting;
+    private LauncherVisibility launcherVisibility;
+    private boolean showLogs;
+
+    public LauncherHelper(Profile profile, Account account, String selectedVersion) {
+        this.profile = Objects.requireNonNull(profile);
+        this.account = Objects.requireNonNull(account);
+        this.selectedVersion = Objects.requireNonNull(selectedVersion);
+        this.setting = profile.getVersionSetting(selectedVersion);
+        this.launcherVisibility = setting.getLauncherVisibility();
+        this.showLogs = setting.isShowLogs();
+        this.launchingStepsPane.setTitle(i18n("version.launch"));
+    }
+
     private final TaskExecutorDialogPane launchingStepsPane = new TaskExecutorDialogPane(it -> {});
+    private CountDownLatch launchingLatch;
 
-    public void launch(Profile profile, Account account, String selectedVersion, File scriptFile) {
-        if (account == null)
-            throw new IllegalArgumentException("No account");
+    public void setTestMode() {
+        launcherVisibility = LauncherVisibility.KEEP;
+        showLogs = true;
+    }
 
+    public void launch() {
         Logging.LOG.info("Launching game version: " + selectedVersion);
 
         GameRepository repository = profile.getRepository();
-
         Version version = repository.getResolvedVersion(selectedVersion);
-        VersionSetting setting = profile.getVersionSetting(selectedVersion);
 
         Platform.runLater(() -> {
             try {
                 checkGameState(profile, setting, version, () -> {
                     Controllers.dialog(launchingStepsPane);
-                    Schedulers.newThread().schedule(() -> launch0(profile, account, selectedVersion, scriptFile));
+                    Schedulers.newThread().execute(this::launch0);
                 });
             } catch (InterruptedException ignore) {
             }
         });
     }
 
-    private void launch0(Profile profile, Account account, String selectedVersion, File scriptFile) {
+    public void makeLaunchScript(File scriptFile) {
+        this.scriptFile = Objects.requireNonNull(scriptFile);
+
+        launch();
+    }
+
+    private void launch0() {
         HMCLGameRepository repository = profile.getRepository();
         DefaultDependencyManager dependencyManager = profile.getDependency();
-        Version version = MaintainTask.maintain(repository.getResolvedVersion(selectedVersion));
-        VersionSetting setting = profile.getVersionSetting(selectedVersion);
+        Version version = MaintainTask.maintain(repository, 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.allOf(
+                Task.composeAsync(() -> {
                     if (setting.isNotCheckGame())
                         return null;
                     else
-                        return dependencyManager.checkGameCompletionAsync(version);
-                })
-                .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.MODS)))
-                .then(var -> {
+                        return dependencyManager.checkGameCompletionAsync(version, repository.unmarkVersionLaunchedAbnormally(selectedVersion));
+                }), Task.composeAsync(() -> {
                     try {
                         ModpackConfiguration<?> configuration = ModpackHelper.readModpackConfiguration(repository.getModpackConfiguration(selectedVersion));
                         if ("Curse".equals(configuration.getType()))
                             return new CurseCompletionTask(dependencyManager, selectedVersion);
+                        else if ("Server".equals(configuration.getType()))
+                            return new ServerModpackCompletionTask(dependencyManager, selectedVersion);
                         else
                             return null;
                     } catch (IOException e) {
                         return null;
                     }
-                })
-                .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.LOGGING_IN)))
-                .then(Task.of(i18n("account.methods"), variables -> {
+                })).withStage("launch.state.dependencies")
+                .thenComposeAsync(Task.supplyAsync(() -> {
                     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(
+                }).withStage("launch.state.logging_in"))
+                .thenComposeAsync(authInfo -> Task.supplyAsync(() -> {
+                    return new HMCLGameLauncher(
                             repository,
-                            selectedVersion,
-                            variables.get("account"),
-                            setting.toLaunchOptions(profile.getGameDir()),
-                            setting.getLauncherVisibility() == LauncherVisibility.CLOSE
+                            version.getPatches().isEmpty() ? repository.getResolvedVersion(selectedVersion) : version,
+                            authInfo,
+                            setting.toLaunchOptions(profile.getGameDir(), !setting.isNotCheckJVM()),
+                            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");
+                                    : new HMCLProcessListener(repository, selectedVersion, authInfo, gameVersion.isPresent())
+                    );
+                }).thenComposeAsync(launcher -> { // launcher is prev task's result
                     if (scriptFile == null) {
-                        return new LaunchTask<>(launcher::launch).setName(i18n("version.launch"));
+                        return Task.supplyAsync(launcher::launch);
                     } else {
-                        return new LaunchTask<>(() -> {
+                        return Task.supplyAsync(() -> {
                             launcher.makeLaunchScript(scriptFile);
                             return null;
-                        }).setName(i18n("version.launch_script"));
+                        });
                     }
-                })
-                .then(Task.of(variables -> {
+                }).thenAcceptAsync(process -> { // process is LaunchTask's result
                     if (scriptFile == null) {
-                        ManagedProcess process = variables.get(LaunchTask.LAUNCH_ID);
                         PROCESSES.add(process);
-                        if (setting.getLauncherVisibility() == LauncherVisibility.CLOSE)
+                        if (launcherVisibility == LauncherVisibility.CLOSE)
                             Launcher.stopApplication();
                         else
                             launchingStepsPane.setCancel(it -> {
                                 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);
+                    }
+                }).thenRunAsync(Schedulers.defaultScheduler(), () -> {
+                    launchingLatch = new CountDownLatch(1);
+                    launchingLatch.await();
+                }).withStage("launch.state.waiting_launching"))
+                .withStagesHint(Lang.immutableListOf(
+                        "launch.state.dependencies",
+                        "launch.state.logging_in",
+                        "launch.state.waiting_launching"))
+                .cancellableExecutor();
+        launchingStepsPane.setExecutor(executor, false);
         executor.addTaskListener(new TaskListener() {
-            final AtomicInteger finished = new AtomicInteger(0);
-
-            @Override
-            public void onFinished(Task task) {
-                finished.incrementAndGet();
-                int runningTasks = executor.getRunningTasks();
-                Platform.runLater(() -> launchingStepsPane.setProgress(1.0 * finished.get() / runningTasks));
-            }
 
             @Override
             public void onStop(boolean success, TaskExecutor executor) {
-                if (!success && !Controllers.isStopped()) {
-                    Platform.runLater(() -> {
-                        // Check if the application has stopped
-                        // 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();
+                Platform.runLater(() -> {
+                    // Check if the application has stopped
+                    // because onStop will be invoked if tasks fail when the executor service shut down.
+                    if (!Controllers.isStopped()) {
+                        launchingStepsPane.fireEvent(new DialogCloseEvent());
+                        if (!success) {
+                            Exception ex = executor.getException();
                             if (ex != null) {
                                 String message;
                                 if (ex instanceof CurseCompletionException) {
-                                    message = i18n("modpack.type.curse.error");
+                                    if (ex.getCause() instanceof FileNotFoundException)
+                                        message = i18n("modpack.type.curse.not_found");
+                                    else
+                                        message = i18n("modpack.type.curse.error");
                                 } else if (ex instanceof PermissionException) {
                                     message = i18n("launch.failed.executable_permission");
                                 } else if (ex instanceof ProcessCreationException) {
@@ -194,18 +227,43 @@ public final class LauncherHelper {
                                 } else if (ex instanceof NotDecompressingNativesException) {
                                     message = i18n("launch.failed.decompressing_natives") + ex.getLocalizedMessage();
                                 } else if (ex instanceof LibraryDownloadException) {
-                                    message = i18n("launch.failed.download_library", ((LibraryDownloadException) ex).getLibrary().getName()) + "\n" + StringUtils.getStackTrace(ex.getCause());
+                                    message = i18n("launch.failed.download_library", ((LibraryDownloadException) ex).getLibrary().getName()) + "\n";
+                                    if (ex.getCause() instanceof ResponseCodeException) {
+                                        ResponseCodeException rce = (ResponseCodeException) ex.getCause();
+                                        int responseCode = rce.getResponseCode();
+                                        URL url = rce.getUrl();
+                                        if (responseCode == 404)
+                                            message += i18n("download.code.404", url);
+                                        else
+                                            message += i18n("download.failed", url, responseCode);
+                                    } else {
+                                        message += StringUtils.getStackTrace(ex.getCause());
+                                    }
+                                } else if (ex instanceof GameAssetIndexDownloadTask.GameAssetIndexMalformedException) {
+                                    message = i18n("assets.index.malformed");
+                                } else if (ex instanceof AuthlibInjectorDownloadException) {
+                                    message = i18n("account.failed.injector_download_failure");
+                                } else if (ex instanceof CharacterDeletedException) {
+                                    message = i18n("account.failed.character_deleted");
+                                } else if (ex instanceof ResponseCodeException) {
+                                    ResponseCodeException rce = (ResponseCodeException) ex;
+                                    int responseCode = rce.getResponseCode();
+                                    URL url = rce.getUrl();
+                                    if (responseCode == 404)
+                                        message = i18n("download.code.404", url);
+                                    else
+                                        message = i18n("download.failed", url, responseCode);
                                 } else {
                                     message = StringUtils.getStackTrace(ex);
                                 }
                                 Controllers.dialog(message,
                                         scriptFile == null ? i18n("launch.failed") : i18n("version.launch_script.failed"),
-                                        MessageBox.ERROR_MESSAGE);
+                                        MessageType.ERROR);
                             }
                         }
-                    });
-                }
-                launchingStepsPane.setExecutor(null);
+                    }
+                    launchingStepsPane.setExecutor(null);
+                });
             }
         });
 
@@ -213,6 +271,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;
@@ -222,7 +285,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();
@@ -231,7 +294,7 @@ public final class LauncherHelper {
 
         // Game later than 1.7.2 accepts Java 8.
         if (!flag && java.getParsedVersion() < JavaVersion.JAVA_8 && gameVersion.compareTo(VersionNumber.asVersion("1.7.2")) > 0) {
-            Optional<JavaVersion> java8 = JavaVersion.getJREs().stream()
+            Optional<JavaVersion> java8 = JavaVersion.getJavas().stream()
                     .filter(javaVersion -> javaVersion.getParsedVersion() >= JavaVersion.JAVA_8)
                     .max(Comparator.comparing(JavaVersion::getVersionNumber));
             if (java8.isPresent()) {
@@ -241,53 +304,55 @@ 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;
             }
         }
 
         // LaunchWrapper 1.12 will crash because of assuming the system class loader is an instance of URLClassLoader.
-        if (!flag && java.getParsedVersion() >= JavaVersion.JAVA_9
+        if (!flag && java.getParsedVersion() >= JavaVersion.JAVA_9_AND_LATER
                 && version.getMainClass().contains("launchwrapper")
                 && version.getLibraries().stream()
                 .filter(library -> "launchwrapper".equals(library.getArtifactId()))
                 .anyMatch(library -> VersionNumber.asVersion(library.getVersion()).compareTo(VersionNumber.asVersion("1.13")) < 0)) {
-            Optional<JavaVersion> java8 = JavaVersion.getJREs().stream().filter(javaVersion -> javaVersion.getParsedVersion() == JavaVersion.JAVA_8).findAny();
+            Optional<JavaVersion> java8 = JavaVersion.getJavas().stream().filter(javaVersion -> javaVersion.getParsedVersion() == JavaVersion.JAVA_8).findAny();
             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;
             }
         }
 
         // Minecraft 1.13 may crash when generating world on Java 8 earlier than 1.8.0_51
-        VersionNumber JAVA_8 = VersionNumber.asVersion("1.8.0.51");
+        VersionNumber JAVA_8 = VersionNumber.asVersion("1.8.0_51");
         if (!flag && gameVersion.compareTo(VersionNumber.asVersion("1.13")) >= 0 && java.getParsedVersion() == JavaVersion.JAVA_8 && java.getVersionNumber().compareTo(JAVA_8) < 0) {
-            Optional<JavaVersion> java8 = JavaVersion.getJREs().stream()
+            Optional<JavaVersion> java8 = JavaVersion.getJavas().stream()
                     .filter(javaVersion -> javaVersion.getVersionNumber().compareTo(JAVA_8) >= 0)
                     .max(Comparator.comparing(JavaVersion::getVersionNumber));
             if (java8.isPresent()) {
                 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;
             }
         }
 
-        if (!flag && java.getPlatform() == org.jackhuang.hmcl.util.Platform.BIT_32 &&
-                org.jackhuang.hmcl.util.Platform.IS_64_BIT) {
+        if (!flag && java.getPlatform() == org.jackhuang.hmcl.util.platform.Platform.BIT_32 &&
+                org.jackhuang.hmcl.util.platform.Platform.IS_64_BIT) {
             final JavaVersion java32 = java;
 
             // First find if same java version but whose platform is 64-bit installed.
-            Optional<JavaVersion> java64 = JavaVersion.getJREs().stream()
-                    .filter(javaVersion -> javaVersion.getPlatform() == org.jackhuang.hmcl.util.Platform.PLATFORM)
+            Optional<JavaVersion> java64 = JavaVersion.getJavas().stream()
+                    .filter(javaVersion -> javaVersion.getPlatform() == org.jackhuang.hmcl.util.platform.Platform.PLATFORM)
                     .filter(javaVersion -> javaVersion.getParsedVersion() == java32.getParsedVersion())
                     .max(Comparator.comparing(JavaVersion::getVersionNumber));
 
@@ -295,8 +360,8 @@ public final class LauncherHelper {
                 final boolean java8requiredFinal = java8required, newJavaRequiredFinal = newJavaRequired;
 
                 // Then find if other java version which satisfies requirements installed.
-                java64 = JavaVersion.getJREs().stream()
-                        .filter(javaVersion -> javaVersion.getPlatform() == org.jackhuang.hmcl.util.Platform.PLATFORM)
+                java64 = JavaVersion.getJavas().stream()
+                        .filter(javaVersion -> javaVersion.getPlatform() == org.jackhuang.hmcl.util.platform.Platform.PLATFORM)
                         .filter(javaVersion -> {
                             if (java8requiredFinal) return javaVersion.getParsedVersion() == JavaVersion.JAVA_8;
                             if (newJavaRequiredFinal) return javaVersion.getParsedVersion() >= JavaVersion.JAVA_8;
@@ -308,46 +373,50 @@ 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;
             }
         }
 
-        if (!flag && java.getPlatform() == org.jackhuang.hmcl.util.Platform.BIT_32 &&
+        // 32-bit JVM cannot make use of too much memory.
+        if (!flag && java.getPlatform() == org.jackhuang.hmcl.util.platform.Platform.BIT_32 &&
                 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~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("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"), MessageType.ERROR, onAccept);
+                flag = true;
+            }
+        }
+
         if (!flag)
             onAccept.run();
     }
 
-    public static void stopManagedProcesses() {
-        while (!PROCESSES.isEmpty())
-            Optional.ofNullable(PROCESSES.poll()).ifPresent(ManagedProcess::stop);
-    }
-
-    public void emitStatus(LoadingState state) {
-        if (state == LoadingState.DONE) {
-            launchingStepsPane.fireEvent(new DialogCloseEvent());
-        }
-
-        launchingStepsPane.setTitle(state.getLocalizedMessage());
-        launchingStepsPane.setSubtitle((state.ordinal() + 1) + " / " + LoadingState.values().length);
-    }
-
-    private void checkExit(LauncherVisibility v) {
-        switch (v) {
+    private void checkExit() {
+        switch (launcherVisibility) {
             case HIDE_AND_REOPEN:
-                Platform.runLater(Controllers.getStage()::show);
+                Platform.runLater(() -> {
+                    Optional.ofNullable(Controllers.getStage())
+                            .ifPresent(Stage::show);
+                });
                 break;
             case KEEP:
                 // No operations here
@@ -365,26 +434,6 @@ public final class LauncherHelper {
         }
     }
 
-    private static class LaunchTask<T> extends TaskResult<T> {
-        private final ExceptionalSupplier<T, Exception> supplier;
-
-        public LaunchTask(ExceptionalSupplier<T, Exception> supplier) {
-            this.supplier = supplier;
-        }
-
-        @Override
-        public void execute() throws Exception {
-            setResult(supplier.get());
-        }
-
-        @Override
-        public String getId() {
-            return LAUNCH_ID;
-        }
-
-        static final String LAUNCH_ID = "launch";
-    }
-
     /**
      * The managed process listener.
      * Guarantee that one [JavaProcess], one [HMCLProcessListener].
@@ -392,9 +441,9 @@ public final class LauncherHelper {
      */
     class HMCLProcessListener implements ProcessListener {
 
-        private final VersionSetting setting;
+        private final HMCLGameRepository repository;
+        private final String version;
         private final Map<String, String> forbiddenTokens;
-        private final LauncherVisibility visibility;
         private ManagedProcess process;
         private boolean lwjgl;
         private LogWindow logWindow;
@@ -402,8 +451,9 @@ 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(HMCLGameRepository repository, String version, AuthInfo authInfo, boolean detectWindow) {
+            this.repository = repository;
+            this.version = version;
             this.detectWindow = detectWindow;
 
             if (authInfo == null)
@@ -415,7 +465,6 @@ public final class LauncherHelper {
                         pair(authInfo.getUsername(), "<player>")
                 );
 
-            visibility = setting.getLauncherVisibility();
             logs = new LinkedList<>();
         }
 
@@ -423,7 +472,13 @@ public final class LauncherHelper {
         public void setProcess(ManagedProcess process) {
             this.process = process;
 
-            if (setting.isShowLogs())
+            String command = new CommandBuilder().addAll(process.getCommands()).toString();
+            for (Map.Entry<String, String> entry : forbiddenTokens.entrySet())
+                command = command.replace(entry.getKey(), entry.getValue());
+
+            LOG.info("Launched process: " + command);
+
+            if (showLogs)
                 Platform.runLater(() -> {
                     logWindow = new LogWindow();
                     logWindow.show();
@@ -431,88 +486,116 @@ public final class LauncherHelper {
                 });
         }
 
+        private void finishLaunch() {
+            switch (launcherVisibility) {
+                case HIDE_AND_REOPEN:
+                    Platform.runLater(() -> {
+                        // If application was stopped and execution services did not finish termination,
+                        // these codes will be executed.
+                        if (Controllers.getStage() != null) {
+                            Controllers.getStage().hide();
+                            launchingLatch.countDown();
+                        }
+                    });
+                    break;
+                case CLOSE:
+                    // Never come to here.
+                    break;
+                case KEEP:
+                    Platform.runLater(() -> {
+                        launchingLatch.countDown();
+                    });
+                    break;
+                case HIDE:
+                    launchingLatch.countDown();
+                    Platform.runLater(() -> {
+                        // If application was stopped and execution services did not finish termination,
+                        // these codes will be executed.
+                        if (Controllers.getStage() != null) {
+                            Controllers.getStage().close();
+                            Controllers.shutdown();
+                            Schedulers.shutdown();
+                        }
+                    });
+                    break;
+            }
+        }
+
         @Override
         public synchronized void onLog(String log, Log4jLevel level) {
             String newLog = log;
             for (Map.Entry<String, String> entry : forbiddenTokens.entrySet())
                 newLog = newLog.replace(entry.getKey(), entry.getValue());
+            String filteredLog = newLog;
 
             if (level.lessOrEqual(Log4jLevel.ERROR))
-                System.err.print(log);
+                System.err.println(filteredLog);
             else
-                System.out.print(log);
+                System.out.println(filteredLog);
 
-            logs.add(pair(log, level));
-            if (logs.size() > Settings.instance().getLogLines())
+            logs.add(pair(filteredLog, level));
+            if (logs.size() > config().getLogLines())
                 logs.removeFirst();
 
-            if (setting.isShowLogs()) {
+            if (showLogs) {
                 try {
                     latch.await();
-                    logWindow.waitForLoaded();
                 } catch (InterruptedException e) {
                     Thread.currentThread().interrupt();
                     return;
                 }
 
-                Platform.runLater(() -> logWindow.logLine(log, level));
+                Platform.runLater(() -> logWindow.logLine(filteredLog, level));
             }
 
-            if (!lwjgl && (log.contains("LWJGL Version: ") || !detectWindow)) {
+            if (!lwjgl && (filteredLog.toLowerCase().contains("lwjgl version") || !detectWindow)) {
                 lwjgl = true;
-                switch (visibility) {
-                    case HIDE_AND_REOPEN:
-                        Platform.runLater(() -> {
-                            Controllers.getStage().hide();
-                            emitStatus(LoadingState.DONE);
-                        });
-                        break;
-                    case CLOSE:
-                        // Never come to here.
-                        break;
-                    case KEEP:
-                        Platform.runLater(() -> {
-                            emitStatus(LoadingState.DONE);
-                        });
-                        break;
-                    case HIDE:
-                        Platform.runLater(() -> {
-                            Controllers.getStage().close();
-                            emitStatus(LoadingState.DONE);
-                        });
-                        break;
-                }
+                finishLaunch();
             }
         }
 
         @Override
         public void onExit(int exitCode, ExitType exitType) {
+            launchingLatch.countDown();
+
             if (exitType == ExitType.INTERRUPTED)
                 return;
 
-            if (exitType != ExitType.NORMAL && logWindow == null)
+            // Game crashed before opening the game window.
+            if (!lwjgl) finishLaunch();
+
+            if (exitType != ExitType.NORMAL) {
+                repository.markVersionLaunchedAbnormally(version);
                 Platform.runLater(() -> {
-                    logWindow = new LogWindow();
+                    if (logWindow == null) {
+                        logWindow = new LogWindow();
 
-                    switch (exitType) {
-                        case JVM_ERROR:
-                            logWindow.setTitle(i18n("launch.failed.cannot_create_jvm"));
-                            break;
-                        case APPLICATION_ERROR:
-                            logWindow.setTitle(i18n("launch.failed.exited_abnormally"));
-                            break;
-                    }
+                        switch (exitType) {
+                            case JVM_ERROR:
+                                logWindow.setTitle(i18n("launch.failed.cannot_create_jvm"));
+                                break;
+                            case APPLICATION_ERROR:
+                                logWindow.setTitle(i18n("launch.failed.exited_abnormally"));
+                                break;
+                        }
 
-                    logWindow.show();
-                    logWindow.onDone.register(() -> {
                         logWindow.logLine("Command: " + new CommandBuilder().addAll(process.getCommands()).toString(), Log4jLevel.INFO);
                         for (Map.Entry<String, Log4jLevel> entry : logs)
                             logWindow.logLine(entry.getKey(), entry.getValue());
-                    });
-                });
+                    }
 
-            checkExit(visibility);
+                    logWindow.showGameCrashReport();
+                });
+            }
+
+            checkExit();
         }
 
     }
+
+    public static final Queue<ManagedProcess> PROCESSES = new ConcurrentLinkedQueue<>();
+    public static void stopManagedProcesses() {
+        while (!PROCESSES.isEmpty())
+            Optional.ofNullable(PROCESSES.poll()).ifPresent(ManagedProcess::stop);
+    }
 }

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,49 +13,66 @@
  * 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.JsonParseException;
 import com.google.gson.reflect.TypeToken;
 import org.jackhuang.hmcl.mod.*;
-import org.jackhuang.hmcl.setting.EnumGameDirectory;
+import org.jackhuang.hmcl.mod.curse.CurseCompletionException;
+import org.jackhuang.hmcl.mod.curse.CurseInstallTask;
+import org.jackhuang.hmcl.mod.curse.CurseManifest;
+import org.jackhuang.hmcl.mod.multimc.MultiMCInstanceConfiguration;
+import org.jackhuang.hmcl.mod.multimc.MultiMCModpackInstallTask;
+import org.jackhuang.hmcl.mod.server.ServerModpackLocalInstallTask;
+import org.jackhuang.hmcl.mod.server.ServerModpackManifest;
+import org.jackhuang.hmcl.mod.server.ServerModpackRemoteInstallTask;
 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.Constants;
-import org.jackhuang.hmcl.util.FileUtils;
 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.
         }
 
+        try {
+            return ServerModpackManifest.readManifest(file, charset);
+        } catch (Exception e) {
+            // ignore it, not a valid Server modpack.
+        }
+
         throw new UnsupportedModpackException(file.toString());
     }
 
@@ -64,7 +81,7 @@ public final class ModpackHelper {
             throw new FileNotFoundException(file.getPath());
         else
             try {
-                return Constants.GSON.fromJson(FileUtils.readText(file), new TypeToken<ModpackConfiguration<?>>() {
+                return JsonUtils.GSON.fromJson(FileUtils.readText(file), new TypeToken<ModpackConfiguration<?>>() {
                 }.getType());
             } catch (JsonParseException e) {
                 throw new IOException("Malformed modpack configuration");
@@ -82,51 +99,83 @@ 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, ServerModpackManifest manifest, String name, Modpack modpack) {
         profile.getRepository().markVersionAsModpack(name);
 
-        FinalizedCallback finalizeTask = (variables, isDependentsSucceeded) -> {
-            if (isDependentsSucceeded) {
-                profile.getRepository().refreshVersions();
-                VersionSetting vs = profile.specializeVersionSetting(name);
-                profile.getRepository().undoMark(name);
-                if (vs != null)
-                    vs.setGameDirType(EnumGameDirectory.VERSION_FOLDER);
+        ExceptionalRunnable<?> success = () -> {
+            HMCLGameRepository repository = profile.getRepository();
+            repository.refreshVersions();
+            VersionSetting vs = repository.specializeVersionSetting(name);
+            repository.undoMark(name);
+            if (vs != null)
+                vs.setGameDirType(GameDirectoryType.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
+            }
+        };
+
+        return new ServerModpackRemoteInstallTask(profile.getDependency(), manifest, name)
+                .whenComplete(Schedulers.defaultScheduler(), success, failure);
+    }
+
+    public static Task<Void> getInstallTask(Profile profile, File zipFile, String name, Modpack modpack) {
+        profile.getRepository().markVersionAsModpack(name);
+
+        ExceptionalRunnable<?> success = () -> {
+            HMCLGameRepository repository = profile.getRepository();
+            repository.refreshVersions();
+            VersionSetting vs = repository.specializeVersionSetting(name);
+            repository.undoMark(name);
+            if (vs != null)
+                vs.setGameDirType(GameDirectoryType.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
             }
         };
 
         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));
-        else throw new IllegalStateException("Unrecognized modpack: " + modpack);
+            return new MultiMCModpackInstallTask(profile.getDependency(), zipFile, modpack, ((MultiMCInstanceConfiguration) modpack.getManifest()), name)
+                    .whenComplete(Schedulers.defaultScheduler(), success, failure)
+                    .thenComposeAsync(new MultiMCInstallVersionSettingTask(profile, ((MultiMCInstanceConfiguration) modpack.getManifest()), name));
+        else if (modpack.getManifest() instanceof ServerModpackManifest)
+            return new ServerModpackLocalInstallTask(profile.getDependency(), zipFile, modpack, ((ServerModpackManifest) modpack.getManifest()), name)
+                    .whenComplete(Schedulers.defaultScheduler(), success, failure);
+        else throw new IllegalArgumentException("Unrecognized modpack: " + modpack.getManifest());
     }
 
-    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();
         }
@@ -134,7 +183,7 @@ public final class ModpackHelper {
 
     public static void toVersionSetting(MultiMCInstanceConfiguration c, VersionSetting vs) {
         vs.setUsesGlobal(false);
-        vs.setGameDirType(EnumGameDirectory.VERSION_FOLDER);
+        vs.setGameDirType(GameDirectoryType.VERSION_FOLDER);
 
         if (c.isOverrideJavaLocation()) {
             vs.setJavaDir(Lang.nonNull(c.getJavaPath(), ""));

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -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.mod.multimc.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,16 +34,13 @@ 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
     public void execute() {
-        VersionSetting vs = Objects.requireNonNull(profile.specializeVersionSetting(version));
+        VersionSetting vs = Objects.requireNonNull(profile.getRepository().specializeVersionSetting(version));
         ModpackHelper.toVersionSetting(manifest, vs);
     }
 }

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

@@ -0,0 +1,220 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.game;
+
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.ObjectBinding;
+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.ServerResponseMalformedException;
+import org.jackhuang.hmcl.auth.yggdrasil.*;
+import org.jackhuang.hmcl.task.FileDownloadTask;
+import org.jackhuang.hmcl.util.ResourceNotFoundError;
+import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.javafx.BindingMapping;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+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 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;
+
+/**
+ * @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);
+        }
+        if (img == null)
+            throw new IOException("Texture is malformed");
+
+        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 = ResourceNotFoundError.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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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;
 
@@ -23,20 +23,25 @@ import javafx.beans.property.ReadOnlyListProperty;
 import javafx.beans.property.ReadOnlyListWrapper;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.ObservableList;
-import org.jackhuang.hmcl.Launcher;
+import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.auth.Account;
 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;
@@ -57,43 +62,46 @@ 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(Launcher.HMCL_DIRECTORY.toPath(), () -> Settings.instance().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));
+        type2factory.forEach((type, factory) -> factory2type.put(factory, type));
+    }
 
-    private static String accountType(Account account) {
+    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) {
         if (account instanceof OfflineAccount)
-            return TYPE_OFFLINE;
+            return FACTORY_OFFLINE;
         else if (account instanceof AuthlibInjectorAccount)
-            return TYPE_AUTHLIB_INJECTOR;
+            return FACTORY_AUTHLIB_INJECTOR;
         else if (account instanceof YggdrasilAccount)
-            return TYPE_YGGDRASIL_ACCOUNT;
+            return FACTORY_MOJANG;
         else
             throw new IllegalArgumentException("Failed to determine account type: " + account);
     }
 
-    public static AccountFactory<?> getAccountFactory(Account account) {
-        return type2factory.get(accountType(account));
-    }
-
-    static String accountId(Account account) {
-        return account.getUsername() + ":" + account.getCharacter();
-    }
-
     private static ObservableList<Account> accounts = observableArrayList(account -> new Observable[] { account });
-    private static ReadOnlyListWrapper<Account> accountsWrapper = new ReadOnlyListWrapper<>(accounts);
+    private static ReadOnlyListWrapper<Account> accountsWrapper = new ReadOnlyListWrapper<>(Accounts.class, "accounts", accounts);
 
-    private static ObjectProperty<Account> selectedAccount = new SimpleObjectProperty<Account>() {
+    private static ObjectProperty<Account> selectedAccount = new SimpleObjectProperty<Account>(Accounts.class, "selectedAccount") {
         {
             accounts.addListener(onInvalidating(this::invalidated));
         }
@@ -124,7 +132,7 @@ public final class Accounts {
             // selection is valid, store it
             if (!initialized)
                 return;
-            config().setSelectedAccount(selected == null ? "" : accountId(selected));
+            updateAccountStorages();
         }
     };
 
@@ -137,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;
     }
 
@@ -174,18 +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
-        selectedAccount.set(
-                accounts.stream()
-                        .filter(it -> accountId(it).equals(config().getSelectedAccount()))
-                        .findFirst()
-                        .orElse(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() {
@@ -209,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;
                 });
@@ -244,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/AuthlibInjectorServers.java

@@ -0,0 +1,91 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.setting;
+
+import com.google.gson.JsonParseException;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
+import org.jackhuang.hmcl.util.gson.Validation;
+import org.jackhuang.hmcl.util.io.FileUtils;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Level;
+
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.util.Logging.LOG;
+
+public class AuthlibInjectorServers implements Validation {
+
+    public static final String CONFIG_FILENAME = "authlib-injectors.json";
+
+    private final List<String> urls;
+
+    public AuthlibInjectorServers(List<String> urls) {
+        this.urls = urls;
+    }
+
+    public List<String> getUrls() {
+        return urls;
+    }
+
+    @Override
+    public void validate() throws JsonParseException {
+        if (urls == null)
+            throw new JsonParseException("authlib-injectors.json -> urls cannot be null");
+    }
+
+    private static final Path configLocation = Paths.get(CONFIG_FILENAME);
+    private static AuthlibInjectorServers configInstance;
+
+    public synchronized static void init() {
+        if (configInstance != null) {
+            throw new IllegalStateException("AuthlibInjectorServers is already loaded");
+        }
+
+        configInstance = new AuthlibInjectorServers(Collections.emptyList());
+
+        if (Files.exists(configLocation)) {
+            try {
+                String content = FileUtils.readText(configLocation);
+                configInstance = JsonUtils.GSON.fromJson(content, AuthlibInjectorServers.class);
+            } catch (IOException | JsonParseException e) {
+                LOG.log(Level.WARNING, "Malformed authlib-injectors.json", e);
+            }
+        }
+
+        if (ConfigHolder.isNewlyCreated() && !AuthlibInjectorServers.getConfigInstance().getUrls().isEmpty()) {
+            config().setPreferredLoginType(Accounts.getLoginType(Accounts.FACTORY_AUTHLIB_INJECTOR));
+            for (String url : AuthlibInjectorServers.getConfigInstance().getUrls()) {
+                Task.supplyAsync(Schedulers.io(), () -> AuthlibInjectorServer.locateServer(url))
+                        .thenAcceptAsync(Schedulers.javafx(), server -> config().getAuthlibInjectorServers().add(server))
+                        .start();
+            }
+        }
+    }
+
+    public static AuthlibInjectorServers getConfigInstance() {
+        return configInstance;
+    }
+}

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -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;
 
@@ -32,44 +32,45 @@ import org.hildan.fxgson.creators.ObservableListCreator;
 import org.hildan.fxgson.creators.ObservableMapCreator;
 import org.hildan.fxgson.creators.ObservableSetCreator;
 import org.hildan.fxgson.factories.JavaFxPropertyTypeAdapterFactory;
-import org.jackhuang.hmcl.Launcher;
+import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.upgrade.UpdateChannel;
-import org.jackhuang.hmcl.util.EnumOrdinalDeserializer;
-import org.jackhuang.hmcl.util.FileTypeAdapter;
-import org.jackhuang.hmcl.util.ObservableHelper;
+import org.jackhuang.hmcl.util.gson.EnumOrdinalDeserializer;
+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;
     }
 
@@ -86,7 +87,7 @@ public final class Config implements Cloneable, Observable {
     private ObjectProperty<EnumCommonDirectory> commonDirType = new SimpleObjectProperty<>(EnumCommonDirectory.DEFAULT);
 
     @SerializedName("commonpath")
-    private StringProperty commonDirectory = new SimpleStringProperty(Launcher.MINECRAFT_DIRECTORY.getAbsolutePath());
+    private StringProperty commonDirectory = new SimpleStringProperty(Metadata.MINECRAFT_DIRECTORY.toString());
 
     @SerializedName("hasProxy")
     private BooleanProperty hasProxy = new SimpleBooleanProperty();
@@ -95,13 +96,13 @@ public final class Config implements Cloneable, Observable {
     private BooleanProperty hasProxyAuth = new SimpleBooleanProperty();
 
     @SerializedName("proxyType")
-    private ObjectProperty<Proxy.Type> proxyType = new SimpleObjectProperty<>(Proxy.Type.DIRECT);
+    private ObjectProperty<Proxy.Type> proxyType = new SimpleObjectProperty<>(Proxy.Type.HTTP);
 
     @SerializedName("proxyHost")
     private StringProperty proxyHost = new SimpleStringProperty();
 
     @SerializedName("proxyPort")
-    private StringProperty proxyPort = new SimpleStringProperty();
+    private IntegerProperty proxyPort = new SimpleIntegerProperty();
 
     @SerializedName("proxyUserName")
     private StringProperty proxyUser = new SimpleStringProperty();
@@ -115,8 +116,8 @@ public final class Config implements Cloneable, Observable {
     @SerializedName("localization")
     private ObjectProperty<SupportedLocale> localization = new SimpleObjectProperty<>(Locales.DEFAULT);
 
-    @SerializedName("downloadtype")
-    private IntegerProperty downloadType = new SimpleIntegerProperty(1);
+    @SerializedName("downloadType")
+    private StringProperty downloadType = new SimpleStringProperty("bmclapi");
 
     @SerializedName("configurations")
     private ObservableMap<String, Profile> configurations = FXCollections.observableMap(new TreeMap<>());
@@ -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,38 +135,34 @@ 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);
 
-    @SerializedName("enableMainPageGameList")
-    private BooleanProperty enableMainPageGameList = new SimpleBooleanProperty(false);
-
     @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;
     }
 
@@ -359,15 +353,15 @@ public final class Config implements Cloneable, Observable {
         return localization;
     }
 
-    public int getDownloadType() {
+    public String getDownloadType() {
         return downloadType.get();
     }
 
-    public void setDownloadType(int downloadType) {
+    public void setDownloadType(String downloadType) {
         this.downloadType.set(downloadType);
     }
 
-    public IntegerProperty downloadTypeProperty() {
+    public StringProperty downloadTypeProperty() {
         return downloadType;
     }
 
@@ -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();
     }
@@ -443,15 +425,39 @@ public final class Config implements Cloneable, Observable {
         this.updateChannel.set(updateChannel);
     }
 
-    public boolean isEnableMainPageGameList() {
-        return enableMainPageGameList.get();
+    public int getConfigVersion() {
+        return configVersion.get();
     }
 
-    public BooleanProperty enableMainPageGameListProperty() {
-        return enableMainPageGameList;
+    public IntegerProperty configVersionProperty() {
+        return configVersion;
     }
 
-    public void setEnableMainPageGameList(boolean enableMainPageGameList) {
-        this.enableMainPageGameList.set(enableMainPageGameList);
+    public void setConfigVersion(int configVersion) {
+        this.configVersion.set(configVersion);
+    }
+
+    public int getUiVersion() {
+        return uiVersion.get();
+    }
+
+    public IntegerProperty uiVersionProperty() {
+        return uiVersion;
+    }
+
+    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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,13 +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.OperatingSystem;
+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;
@@ -50,9 +53,6 @@ public final class ConfigHolder {
     }
 
     public static boolean isNewlyCreated() {
-        if (configInstance == null) {
-            throw new IllegalStateException("Configuration hasn't been loaded");
-        }
         return newlyCreated;
     }
 
@@ -68,7 +68,7 @@ public final class ConfigHolder {
         Settings.init();
 
         if (newlyCreated) {
-            saveConfig();
+            saveConfigSync();
 
             // hide the config file on windows
             if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
@@ -103,7 +103,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");
@@ -122,22 +122,26 @@ public final class ConfigHolder {
         return new Config();
     }
 
-    private static void saveConfig() throws IOException {
-        LOG.info("Saving config");
+    private static InvocationDispatcher<String> configWriter = InvocationDispatcher.runOn(Lang::thread, content -> {
         try {
-            Files.write(configLocation, configInstance.toJson().getBytes(UTF_8));
+            writeToConfig(content);
         } catch (IOException e) {
             LOG.log(Level.SEVERE, "Failed to save config", e);
-            throw e;
+        }
+    });
+
+    private static void writeToConfig(String content) throws IOException {
+        LOG.info("Saving config");
+        synchronized (configLocation) {
+            Files.write(configLocation, content.getBytes(UTF_8));
         }
     }
 
     static void markConfigDirty() {
-        // TODO: change this to async
-        try {
-            saveConfig();
-        } catch (IOException ignored) {
-            // ignore it as it has been logged
-        }
+        configWriter.accept(configInstance.toJson());
+    }
+
+    private static void saveConfigSync() throws IOException {
+        writeToConfig(configInstance.toJson());
     }
 }

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,22 +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.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.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;
 
 final class ConfigUpgrader {
+    private static final int VERSION = 0;
+
     private ConfigUpgrader() {
     }
 
@@ -37,10 +34,22 @@ final class ConfigUpgrader {
      *
      * @param deserialized deserialized config settings
      * @param rawJson      raw json structure of the config settings without modification
+     * @return true if config version is upgraded
      */
-    static void upgradeConfig(Config deserialized, Map<?, ?> rawJson) {
+    static boolean upgradeConfig(Config deserialized, Map<?, ?> rawJson) {
+        boolean upgraded;
+        if (deserialized.getConfigVersion() < VERSION) {
+            deserialized.setConfigVersion(VERSION);
+            // TODO: Add upgrade code here.
+            upgraded = true;
+        } else {
+            upgraded = false;
+        }
+
         upgradeV2(deserialized, rawJson);
         upgradeV3(deserialized, rawJson);
+
+        return upgraded;
     }
 
     /**
@@ -53,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)));
-                });
             });
         });
     }
@@ -86,5 +96,34 @@ final class ConfigUpgrader {
             deserialized.setHasProxy(StringUtils.isNotBlank(deserialized.getProxyHost()));
         if (!rawJson.containsKey("hasProxyAuth"))
             deserialized.setHasProxyAuth(StringUtils.isNotBlank(deserialized.getProxyUser()));
+
+        if (!rawJson.containsKey("downloadType")) {
+            tryCast(rawJson.get("downloadtype"), Number.class)
+                    .map(Number::intValue)
+                    .ifPresent(id -> {
+                        if (id == 0) {
+                            deserialized.setDownloadType("mojang");
+                        } else if (id == 1) {
+                            deserialized.setDownloadType("bmclapi");
+                        }
+                    });
+        }
+
+        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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,24 +13,75 @@
  * 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.download.AdaptedDownloadProvider;
 import org.jackhuang.hmcl.download.BMCLAPIDownloadProvider;
-import org.jackhuang.hmcl.download.CurseCDNDownloadProvider;
 import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.download.MojangDownloadProvider;
-import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.ui.FXUtils;
 
-import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.util.Lang.mapOf;
+import static org.jackhuang.hmcl.util.Pair.pair;
 
 public final class DownloadProviders {
     private DownloadProviders() {}
 
-    public static final List<DownloadProvider> DOWNLOAD_PROVIDERS = Lang.immutableListOf(new MojangDownloadProvider(), BMCLAPIDownloadProvider.INSTANCE, CurseCDNDownloadProvider.INSTANCE);
+    private static final AdaptedDownloadProvider DOWNLOAD_PROVIDER = new AdaptedDownloadProvider();
 
-    public static DownloadProvider getDownloadProvider(int index) {
-        return Lang.get(DOWNLOAD_PROVIDERS, index).orElse(DOWNLOAD_PROVIDERS.get(0));
+    public static final Map<String, DownloadProvider> providersById = mapOf(
+            pair("mojang", new MojangDownloadProvider()),
+            pair("bmclapi", new BMCLAPIDownloadProvider("https://bmclapi2.bangbang93.com")),
+            pair("mcbbs", new BMCLAPIDownloadProvider("https://download.mcbbs.net")));
+
+    public static final String DEFAULT_PROVIDER_ID = "mcbbs";
+
+    static void init() {
+        FXUtils.onChangeAndOperate(config().downloadTypeProperty(), downloadType -> {
+            DownloadProvider primary = Optional.ofNullable(providersById.get(config().getDownloadType()))
+                    .orElse(providersById.get(DEFAULT_PROVIDER_ID));
+            DOWNLOAD_PROVIDER.setDownloadProviderCandidates(
+                    Stream.concat(
+                            Stream.of(primary),
+                            providersById.values().stream().filter(x -> x != primary)
+                    ).collect(Collectors.toList())
+            );
+        });
+    }
+
+    public static String getPrimaryDownloadProviderId() {
+        String downloadType = config().getDownloadType();
+        if (providersById.containsKey(downloadType))
+            return downloadType;
+        else
+            return DEFAULT_PROVIDER_ID;
+    }
+
+    public static AdaptedDownloadProvider getDownloadProviderByPrimaryId(String primaryId) {
+        AdaptedDownloadProvider adaptedDownloadProvider = new AdaptedDownloadProvider();
+        DownloadProvider primary = Optional.ofNullable(providersById.get(primaryId))
+                .orElse(providersById.get(DEFAULT_PROVIDER_ID));
+        adaptedDownloadProvider.setDownloadProviderCandidates(
+                Stream.concat(
+                        Stream.of(primary),
+                        providersById.values().stream().filter(x -> x != primary)
+                ).collect(Collectors.toList())
+        );
+        return adaptedDownloadProvider;
+    }
+
+    /**
+     * Get current primary preferred download provider
+     */
+    public static AdaptedDownloadProvider getDownloadProvider() {
+        return DOWNLOAD_PROVIDER;
     }
 }

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,38 +13,43 @@
  * 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.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
 import javafx.beans.property.*;
 import org.jackhuang.hmcl.download.DefaultDependencyManager;
+import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.event.EventBus;
+import org.jackhuang.hmcl.event.EventPriority;
 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.WeakListenerHelper;
-import org.jackhuang.hmcl.util.*;
+import org.jackhuang.hmcl.ui.WeakListenerHolder;
+import org.jackhuang.hmcl.util.ToStringBuilder;
+import org.jackhuang.hmcl.util.javafx.ObservableHelper;
 
 import java.io.File;
 import java.lang.reflect.Type;
 import java.util.Optional;
 
 import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
+import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 
 /**
  *
  * @author huangyuhui
  */
+@JsonAdapter(Profile.Serializer.class)
 public final class Profile implements Observable {
-    private final WeakListenerHelper helper = new WeakListenerHelper();
+    private final WeakListenerHolder listenerHolder = new WeakListenerHolder();
     private final HMCLGameRepository repository;
-    private final ModManager modManager;
 
     private final StringProperty selectedVersion = new SimpleStringProperty();
 
@@ -84,9 +89,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;
     }
 
@@ -125,79 +130,48 @@ 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);
 
         gameDir.addListener((a, b, newValue) -> repository.changeDirectory(newValue));
         this.selectedVersion.addListener(o -> checkSelectedVersion());
-        helper.add(EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).registerWeak(event -> checkSelectedVersion()));
+        listenerHolder.add(EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).registerWeak(event -> checkSelectedVersion(), EventPriority.HIGHEST));
 
         addPropertyChangedListener(onInvalidating(this::invalidate));
     }
 
     private void checkSelectedVersion() {
-        if (!repository.isLoaded()) return;
-        String newValue = selectedVersion.get();
-        if (!repository.hasVersion(newValue)) {
-            Optional<String> version = repository.getVersions().stream().findFirst().map(Version::getId);
-            if (version.isPresent())
-                selectedVersion.setValue(version.get());
-            else if (StringUtils.isNotBlank(newValue))
-                selectedVersion.setValue(null);
-        }
+        runInFX(() -> {
+            if (!repository.isLoaded()) return;
+            String newValue = selectedVersion.get();
+            if (!repository.hasVersion(newValue)) {
+                Optional<String> version = repository.getVersions().stream().findFirst().map(Version::getId);
+                if (version.isPresent())
+                    selectedVersion.setValue(version.get());
+                else if (newValue != null)
+                    selectedVersion.setValue(null);
+            }
+        });
     }
 
     public HMCLGameRepository getRepository() {
         return repository;
     }
 
-    public ModManager getModManager() {
-        return modManager;
+    public DefaultDependencyManager getDependency() {
+        return getDependency(DownloadProviders.getDownloadProvider());
     }
 
-    public DefaultDependencyManager getDependency() {
-        return new DefaultDependencyManager(repository, Settings.instance().getDownloadProvider(), HMCLCacheRepository.REPOSITORY);
+    public DefaultDependencyManager getDependency(DownloadProvider downloadProvider) {
+        return new DefaultDependencyManager(repository, downloadProvider, HMCLCacheRepository.REPOSITORY);
     }
 
     public VersionSetting getVersionSetting(String id) {
-        VersionSetting vs = repository.getVersionSetting(id);
-        if (vs == null || vs.isUsesGlobal()) {
-            getGlobal().setGlobal(true); // always keep global.isGlobal = true
-            getGlobal().setUsesGlobal(true);
-            return getGlobal();
-        } else
-            return vs;
-    }
-
-    public boolean isVersionGlobal(String id) {
-        VersionSetting vs = repository.getVersionSetting(id);
-        return vs == null || vs.isUsesGlobal();
-    }
-
-    /**
-     * Make version use self version settings instead of the global one.
-     * @param id the version id.
-     * @return specialized version setting, null if given version does not exist.
-     */
-    public VersionSetting specializeVersionSetting(String id) {
-        VersionSetting vs = repository.getVersionSetting(id);
-        if (vs == null)
-            vs = repository.createVersionSetting(id);
-        if (vs == null)
-            return null;
-        vs.setUsesGlobal(false);
-        return vs;
-    }
-
-    public void globalizeVersionSetting(String id) {
-        VersionSetting vs = repository.getVersionSetting(id);
-        if (vs != null)
-            vs.setUsesGlobal(true);
+        return repository.getVersionSetting(id);
     }
 
     @Override
@@ -230,16 +204,11 @@ public final class Profile implements Observable {
         observableHelper.removeListener(listener);
     }
 
-    protected void invalidate() {
-        observableHelper.invalidate();
+    private void invalidate() {
+        Platform.runLater(observableHelper::invalidate);
     }
 
     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)
@@ -256,7 +225,7 @@ public final class Profile implements Observable {
 
         @Override
         public Profile deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-            if (json == null || json == JsonNull.INSTANCE || !(json instanceof JsonObject)) return null;
+            if (json == JsonNull.INSTANCE || !(json instanceof JsonObject)) return null;
             JsonObject obj = (JsonObject) json;
             String gameDir = Optional.ofNullable(obj.get("gameDir")).map(JsonElement::getAsString).orElse("");
 

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,26 +13,29 @@
  * 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.application.Platform;
 import javafx.beans.Observable;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyListProperty;
-import javafx.beans.property.ReadOnlyListWrapper;
-import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.*;
 import javafx.collections.ObservableList;
-import org.jackhuang.hmcl.Launcher;
+import org.jackhuang.hmcl.Metadata;
+import org.jackhuang.hmcl.event.EventBus;
+import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
 
 import java.io.File;
 import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import static java.util.stream.Collectors.toList;
 import static javafx.collections.FXCollections.observableArrayList;
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
+import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class Profiles {
@@ -64,7 +67,11 @@ public final class Profiles {
 
         @Override
         protected void invalidated() {
+            if (!initialized)
+                return;
+
             Profile profile = get();
+
             if (profiles.isEmpty()) {
                 if (profile != null) {
                     set(null);
@@ -77,17 +84,28 @@ public final class Profiles {
                 }
             }
 
-            if (!initialized)
-                return;
             config().setSelectedProfile(profile == null ? "" : profile.getName());
+            if (profile != null) {
+                if (profile.getRepository().isLoaded())
+                    selectedVersion.bind(profile.selectedVersionProperty());
+                else {
+                    selectedVersion.unbind();
+                    selectedVersion.set(null);
+                    // bind when repository was reloaded.
+                    profile.getRepository().refreshVersionsAsync().start();
+                }
+            } else {
+                selectedVersion.unbind();
+                selectedVersion.set(null);
+            }
         }
     };
 
     private static void checkProfiles() {
         if (profiles.isEmpty()) {
             Profile current = new Profile(Profiles.DEFAULT_PROFILE, new File(".minecraft"), new VersionSetting(), null, true);
-            Profile home = new Profile(Profiles.HOME_PROFILE, Launcher.MINECRAFT_DIRECTORY);
-            profiles.addAll(current, home);
+            Profile home = new Profile(Profiles.HOME_PROFILE, Metadata.MINECRAFT_DIRECTORY.toFile());
+            Platform.runLater(() -> profiles.addAll(current, home));
         }
     }
 
@@ -126,18 +144,33 @@ public final class Profiles {
         HashSet<String> names = new HashSet<>();
         config().getConfigurations().forEach((name, profile) -> {
             if (!names.add(name)) return;
-            profile.setName(name);
             profiles.add(profile);
+            profile.setName(name);
         });
         checkProfiles();
 
-        initialized = true;
+        // Platform.runLater is necessary or profiles will be empty
+        // since checkProfiles adds 2 base profile later.
+        Platform.runLater(() -> {
+            initialized = true;
 
-        selectedProfile.set(
-                profiles.stream()
-                        .filter(it -> it.getName().equals(config().getSelectedProfile()))
-                        .findFirst()
-                        .orElse(profiles.get(0)));
+            selectedProfile.set(
+                    profiles.stream()
+                            .filter(it -> it.getName().equals(config().getSelectedProfile()))
+                            .findFirst()
+                            .orElse(profiles.get(0)));
+        });
+
+        EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).registerWeak(event -> {
+            runInFX(() -> {
+                Profile profile = selectedProfile.get();
+                if (profile != null && profile.getRepository() == event.getSource()) {
+                    selectedVersion.bind(profile.selectedVersionProperty());
+                    for (Consumer<Profile> listener : versionsListeners)
+                        listener.accept(profile);
+                }
+            });
+        });
     }
 
     public static ObservableList<Profile> getProfiles() {
@@ -159,4 +192,24 @@ public final class Profiles {
     public static ObjectProperty<Profile> selectedProfileProperty() {
         return selectedProfile;
     }
+
+    private static final ReadOnlyStringWrapper selectedVersion = new ReadOnlyStringWrapper();
+
+    public static ReadOnlyStringProperty selectedVersionProperty() {
+        return selectedVersion.getReadOnlyProperty();
+    }
+
+    // Guaranteed that the repository is loaded.
+    public static String getSelectedVersion() {
+        return selectedVersion.get();
+    }
+
+    private static final List<Consumer<Profile>> versionsListeners = new LinkedList<>();
+
+    public static void registerVersionsListener(Consumer<Profile> listener) {
+        Profile profile = getSelectedProfile();
+        if (profile != null && profile.getRepository().isLoaded())
+            listener.accept(profile);
+        versionsListeners.add(listener);
+    }
 }

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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,25 +29,13 @@ 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() {
     }
 
-    private static ObjectBinding<Proxy> 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) {
-                    return Proxy.NO_PROXY;
-                } else {
-                    return new Proxy(config().getProxyType(), new InetSocketAddress(host, port));
-                }
-            },
-            config().proxyTypeProperty(),
-            config().proxyHostProperty(),
-            config().proxyPortProperty(),
-            config().hasProxyProperty());
+    private static ObjectBinding<Proxy> proxyProperty;
 
     public static Proxy getProxy() {
         return proxyProperty.get();
@@ -59,12 +46,29 @@ public final class ProxyManager {
     }
 
     static void init() {
-        proxyProperty.addListener(observable -> updateSystemProxy());
+        proxyProperty = Bindings.createObjectBinding(
+                () -> {
+                    String host = config().getProxyHost();
+                    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));
+                    }
+                },
+                config().proxyTypeProperty(),
+                config().proxyHostProperty(),
+                config().proxyPortProperty(),
+                config().hasProxyProperty());
 
+        proxyProperty.addListener(any -> updateSystemProxy());
         updateSystemProxy();
 
         Authenticator.setDefault(new Authenticator() {
-
             @Override
             protected PasswordAuthentication getPasswordAuthentication() {
                 if (config().hasProxyAuth()) {

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,15 +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.setting;
 
-import javafx.scene.text.Font;
-import org.jackhuang.hmcl.Launcher;
-import org.jackhuang.hmcl.download.DownloadProvider;
+import javafx.beans.binding.Bindings;
+import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.game.HMCLCacheRepository;
 import org.jackhuang.hmcl.util.CacheRepository;
+import org.jackhuang.hmcl.util.io.FileUtils;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 
@@ -44,33 +44,24 @@ public class Settings {
     }
 
     private Settings() {
+        DownloadProviders.init();
         ProxyManager.init();
         Accounts.init();
         Profiles.init();
+        AuthlibInjectorServers.init();
 
         CacheRepository.setInstance(HMCLCacheRepository.REPOSITORY);
-        HMCLCacheRepository.REPOSITORY.directoryProperty().bind(config().commonDirectoryProperty());
-    }
-
-    public Font getFont() {
-        return Font.font(config().getFontFamily(), config().getFontSize());
-    }
-
-    public void setFont(Font font) {
-        config().setFontFamily(font.getFamily());
-        config().setFontSize(font.getSize());
-    }
-
-    public int getLogLines() {
-        return Math.max(config().getLogLines(), 100);
-    }
-
-    public void setLogLines(int logLines) {
-        config().setLogLines(logLines);
+        HMCLCacheRepository.REPOSITORY.directoryProperty().bind(Bindings.createStringBinding(() -> {
+            if (FileUtils.canCreateDirectory(getCommonDirectory())) {
+                return getCommonDirectory();
+            } else {
+                return getDefaultCommonDirectory();
+            }
+        }, config().commonDirectoryProperty(), config().commonDirTypeProperty()));
     }
 
     public static String getDefaultCommonDirectory() {
-        return Launcher.MINECRAFT_DIRECTORY.getAbsolutePath();
+        return Metadata.MINECRAFT_DIRECTORY.toString();
     }
 
     public String getCommonDirectory() {
@@ -83,19 +74,4 @@ public class Settings {
                 return null;
         }
     }
-
-    /****************************************
-     *        DOWNLOAD PROVIDERS            *
-     ****************************************/
-
-    public DownloadProvider getDownloadProvider() {
-        return DownloadProviders.getDownloadProvider(config().getDownloadType());
-    }
-
-    public void setDownloadProvider(DownloadProvider downloadProvider) {
-        int index = DownloadProviders.DOWNLOAD_PROVIDERS.indexOf(downloadProvider);
-        if (index == -1)
-            throw new IllegalArgumentException("Unknown download provider: " + downloadProvider);
-        config().setDownloadType(index);
-    }
 }

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,18 +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.setting;
 
+import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.ObjectBinding;
 import javafx.scene.paint.Color;
-import org.jackhuang.hmcl.util.FileUtils;
-import org.jackhuang.hmcl.util.IOUtils;
 import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.ResourceNotFoundError;
+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;
@@ -33,24 +36,27 @@ 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");
-
+    public static final Color BLACK = Color.web("#292929");
     public static final Color[] SUGGESTED_COLORS = new Color[]{
             Color.web("#5C6BC0"), // blue
             Color.web("#283593"), // dark blue
             Color.web("#43A047"), // green
             Color.web("#E67E22"), // orange
             Color.web("#9C27B0"), // purple
-            Color.web("#F44336")  // red
+            Color.web("#B71C1C")  // red
     };
 
+    private final Color paint;
     private final String color;
     private final String name;
 
     Theme(String name, String color) {
         this.name = name;
         this.color = color;
+        this.paint = Color.web(color);
     }
 
     public String getName() {
@@ -74,21 +80,25 @@ public class Theme {
     }
 
     public String[] getStylesheets() {
+        Color textFill = getForegroundColor();
+
         String css;
         try {
             File temp = File.createTempFile("hmcl", ".css");
-            FileUtils.writeText(temp, IOUtils.readFullyAsString(Theme.class.getResourceAsStream("/assets/css/custom.css"))
+            FileUtils.writeText(temp, IOUtils.readFullyAsString(ResourceNotFoundError.getResourceAsStream("/assets/css/custom.css"))
                     .replace("%base-color%", color)
+                    .replace("%base-rippler-color%", String.format("rgba(%d, %d, %d, 0.3)", (int)Math.ceil(paint.getRed() * 256), (int)Math.ceil(paint.getGreen() * 256), (int)Math.ceil(paint.getBlue() * 256)))
+                    .replace("%disabled-font-color%", String.format("rgba(%d, %d, %d, 0.7)", (int)Math.ceil(textFill.getRed() * 256), (int)Math.ceil(textFill.getGreen() * 256), (int)Math.ceil(textFill.getBlue() * 256)))
                     .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"
         };
     }
 
@@ -129,11 +139,12 @@ 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() {
-        return Bindings.createObjectBinding(() -> Color.BLACK);
+        return Bindings.createObjectBinding(() -> BLACK);
     }
 
     public static ObjectBinding<Color> whiteFillBinding() {

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,19 +13,28 @@
  * 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.*;
 import org.jackhuang.hmcl.Metadata;
+import org.jackhuang.hmcl.game.GameDirectoryType;
 import org.jackhuang.hmcl.game.LaunchOptions;
-import org.jackhuang.hmcl.util.*;
+import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.platform.JavaVersion;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;
+import org.jackhuang.hmcl.util.platform.Platform;
 
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Type;
+import java.nio.file.InvalidPathException;
+import java.nio.file.Paths;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -36,7 +45,8 @@ import static org.jackhuang.hmcl.setting.ConfigHolder.config;
  *
  * @author huangyuhui
  */
-public final class VersionSetting {
+@JsonAdapter(VersionSetting.Serializer.class)
+public final class VersionSetting implements Cloneable {
 
     public transient String id;
 
@@ -50,9 +60,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;
     }
 
@@ -74,9 +84,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;
     }
 
@@ -100,7 +110,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.
@@ -114,9 +124,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;
     }
 
@@ -131,9 +141,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;
     }
 
@@ -148,9 +158,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;
     }
 
@@ -165,9 +175,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;
     }
 
@@ -185,9 +195,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;
     }
 
@@ -199,9 +209,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;
     }
 
@@ -219,9 +229,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;
     }
 
@@ -236,9 +246,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;
     }
 
@@ -253,9 +263,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;
     }
 
@@ -270,9 +280,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;
     }
 
@@ -287,9 +314,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;
     }
 
@@ -306,14 +333,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.
      */
@@ -326,9 +353,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;
     }
 
@@ -343,9 +370,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;
     }
 
@@ -365,9 +392,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;
     }
 
@@ -390,26 +417,26 @@ 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<GameDirectoryType> gameDirTypeProperty = new SimpleObjectProperty<>(this, "gameDirType", GameDirectoryType.ROOT_FOLDER);
 
-    public ImmediateObjectProperty<EnumGameDirectory> gameDirTypeProperty() {
+    public ObjectProperty<GameDirectoryType> gameDirTypeProperty() {
         return gameDirTypeProperty;
     }
 
-    public EnumGameDirectory getGameDirType() {
+    public GameDirectoryType getGameDirType() {
         return gameDirTypeProperty.get();
     }
 
-    public void setGameDirType(EnumGameDirectory gameDirType) {
+    public void setGameDirType(GameDirectoryType gameDirType) {
         gameDirTypeProperty.set(gameDirType);
     }
 
     /**
      * 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;
     }
 
@@ -428,9 +455,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;
     }
 
@@ -443,18 +470,25 @@ public final class VersionSetting {
     }
 
     public JavaVersion getJavaVersion() throws InterruptedException {
+        return getJavaVersion(true);
+    }
+
+    public JavaVersion getJavaVersion(boolean checkJava) throws InterruptedException {
         // TODO: lazy initialization may result in UI suspension.
         if (StringUtils.isBlank(getJava()))
             setJava(StringUtils.isBlank(getJavaDir()) ? "Default" : "Custom");
         if ("Default".equals(getJava())) return JavaVersion.fromCurrentEnvironment();
         else if (isUsesCustomJavaDir()) {
             try {
-                return JavaVersion.fromExecutable(new File(getJavaDir()));
-            } catch (IOException e) {
+                if (checkJava)
+                    return JavaVersion.fromExecutable(Paths.get(getJavaDir()));
+                else
+                    return new JavaVersion(Paths.get(getJavaDir()), "", Platform.PLATFORM);
+            } catch (IOException | InvalidPathException e) {
                 return null; // Custom Java Directory not found,
             }
         } else if (StringUtils.isNotBlank(getJava())) {
-            List<JavaVersion> matchedJava = JavaVersion.getJREs().stream()
+            List<JavaVersion> matchedJava = JavaVersion.getJavas().stream()
                     .filter(java -> java.getVersion().equals(getJava()))
                     .collect(Collectors.toList());
             if (matchedJava.isEmpty()) {
@@ -487,6 +521,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);
@@ -498,12 +533,13 @@ public final class VersionSetting {
         defaultJavaPathProperty.addListener(listener);
     }
 
-    public LaunchOptions toLaunchOptions(File gameDir) throws InterruptedException {
-        JavaVersion javaVersion = Optional.ofNullable(getJavaVersion()).orElse(JavaVersion.fromCurrentEnvironment());
-        return new LaunchOptions.Builder()
+    public LaunchOptions toLaunchOptions(File gameDir, boolean checkJava) throws InterruptedException {
+        JavaVersion javaVersion = Optional.ofNullable(getJavaVersion(checkJava)).orElse(JavaVersion.fromCurrentEnvironment());
+        LaunchOptions.Builder builder = new LaunchOptions.Builder()
                 .setGameDir(gameDir)
                 .setJava(javaVersion)
                 .setVersionName(Metadata.TITLE)
+                .setVersionType(Metadata.TITLE)
                 .setProfileName(Metadata.TITLE)
                 .setMinecraftArgs(getMinecraftArgs())
                 .setJavaArgs(getJavaArgs())
@@ -515,21 +551,48 @@ 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();
+    }
+
+    @Override
+    public VersionSetting clone() {
+        VersionSetting versionSetting = new VersionSetting();
+        versionSetting.setUsesGlobal(isUsesGlobal());
+        versionSetting.setJava(getJava());
+        versionSetting.setDefaultJavaPath(getDefaultJavaPath());
+        versionSetting.setJavaDir(getJavaDir());
+        versionSetting.setWrapper(getWrapper());
+        versionSetting.setPermSize(getPermSize());
+        versionSetting.setMaxMemory(getMaxMemory());
+        versionSetting.setMinMemory(getMinMemory());
+        versionSetting.setPreLaunchCommand(getPreLaunchCommand());
+        versionSetting.setJavaArgs(getJavaArgs());
+        versionSetting.setMinecraftArgs(getMinecraftArgs());
+        versionSetting.setNoJVMArgs(isNoJVMArgs());
+        versionSetting.setNotCheckGame(isNotCheckGame());
+        versionSetting.setNotCheckJVM(isNotCheckJVM());
+        versionSetting.setShowLogs(isShowLogs());
+        versionSetting.setServerIp(getServerIp());
+        versionSetting.setFullscreen(isFullscreen());
+        versionSetting.setWidth(getWidth());
+        versionSetting.setHeight(getHeight());
+        versionSetting.setGameDirType(getGameDirType());
+        versionSetting.setGameDir(getGameDir());
+        versionSetting.setLauncherVisibility(getLauncherVisibility());
+        return versionSetting;
     }
 
     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;
@@ -551,6 +614,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());
@@ -562,7 +626,7 @@ public final class VersionSetting {
 
         @Override
         public VersionSetting deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-            if (json == null || json == JsonNull.INSTANCE || !(json instanceof JsonObject))
+            if (json == JsonNull.INSTANCE || !(json instanceof JsonObject))
                 return null;
             JsonObject obj = (JsonObject) json;
 
@@ -588,9 +652,10 @@ 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)]);
+            vs.setGameDirType(GameDirectoryType.values()[Optional.ofNullable(obj.get("gameDirType")).map(JsonElement::getAsInt).orElse(0)]);
             vs.setDefaultJavaPath(Optional.ofNullable(obj.get("defaultJavaPath")).map(JsonElement::getAsString).orElse(null));
 
             return vs;

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,50 +13,49 @@
  * 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 javafx.scene.Node;
 import javafx.scene.Scene;
-import javafx.scene.image.Image;
 import javafx.scene.layout.Region;
 import javafx.stage.Stage;
 import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.Metadata;
-import org.jackhuang.hmcl.setting.Accounts;
-import org.jackhuang.hmcl.setting.Profiles;
+import org.jackhuang.hmcl.setting.EnumCommonDirectory;
 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.animation.ContainerAnimations;
 import org.jackhuang.hmcl.ui.construct.InputDialogPane;
-import org.jackhuang.hmcl.ui.construct.MessageBox;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
+import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
+import org.jackhuang.hmcl.ui.construct.PromptDialogPane;
 import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane;
 import org.jackhuang.hmcl.ui.decorator.DecoratorController;
-import org.jackhuang.hmcl.ui.profile.ProfileList;
-import org.jackhuang.hmcl.ui.versions.GameList;
+import org.jackhuang.hmcl.ui.main.RootPage;
 import org.jackhuang.hmcl.ui.versions.VersionPage;
 import org.jackhuang.hmcl.util.FutureCallback;
-import org.jackhuang.hmcl.util.JavaVersion;
+import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.platform.JavaVersion;
 
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.ui.FXUtils.newImage;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class Controllers {
 
     private static Scene scene;
     private static Stage stage;
-    private static MainPage mainPage = null;
-    private static SettingsPage settingsPage = null;
     private static VersionPage versionPage = null;
-    private static GameList gameListPage = null;
-    private static AccountList accountListPage = null;
-    private static ProfileList profileListPage = null;
     private static AuthlibInjectorServersPage serversPage = null;
-    private static LeftPaneController leftPaneController;
+    private static RootPage rootPage;
     private static DecoratorController decorator;
 
     public static Scene getScene() {
@@ -67,40 +66,6 @@ public final class Controllers {
         return stage;
     }
 
-    // FXThread
-    public static SettingsPage getSettingsPage() {
-        if (settingsPage == null)
-            settingsPage = new SettingsPage();
-        return settingsPage;
-    }
-
-    // FXThread
-    public static GameList getGameListPage() {
-        if (gameListPage == null)
-            gameListPage = new GameList();
-        return gameListPage;
-    }
-
-    // FXThread
-    public static AccountList getAccountListPage() {
-        if (accountListPage == null) {
-            accountListPage = new AccountList();
-            accountListPage.selectedAccountProperty().bindBidirectional(Accounts.selectedAccountProperty());
-            accountListPage.accountsProperty().bindContent(Accounts.accountsProperty());
-        }
-        return accountListPage;
-    }
-
-    // FXThread
-    public static ProfileList getProfileListPage() {
-        if (profileListPage == null) {
-            profileListPage = new ProfileList();
-            profileListPage.selectedProfileProperty().bindBidirectional(Profiles.selectedProfileProperty());
-            profileListPage.profilesProperty().bindContent(Profiles.profilesProperty());
-        }
-        return profileListPage;
-    }
-
     // FXThread
     public static VersionPage getVersionPage() {
         if (versionPage == null)
@@ -108,6 +73,13 @@ public final class Controllers {
         return versionPage;
     }
 
+    // FXThread
+    public static RootPage getRootPage() {
+        if (rootPage == null)
+            rootPage = new RootPage();
+        return rootPage;
+    }
+
     // FXThread
     public static AuthlibInjectorServersPage getServersPage() {
         if (serversPage == null)
@@ -120,32 +92,34 @@ public final class Controllers {
         return decorator;
     }
 
-    public static MainPage getMainPage() {
-        if (mainPage == null)
-            mainPage = new MainPage();
-        return mainPage;
-    }
-
-    public static LeftPaneController getLeftPaneController() {
-        return leftPaneController;
-    }
 
     public static void initialize(Stage stage) {
+        Logging.LOG.info("Start initializing application");
+
         Controllers.stage = stage;
 
         stage.setOnCloseRequest(e -> Launcher.stopApplication());
 
-        decorator = new DecoratorController(stage, getMainPage());
-        leftPaneController = new LeftPaneController();
-        decorator.getDecorator().drawerProperty().setAll(leftPaneController);
+        decorator = new DecoratorController(stage, getRootPage());
 
-        Task.of(JavaVersion::initialize).start();
+        if (config().getCommonDirType() == EnumCommonDirectory.CUSTOM &&
+                !FileUtils.canCreateDirectory(config().getCommonDirectory())) {
+            config().setCommonDirType(EnumCommonDirectory.DEFAULT);
+            dialog(i18n("launcher.cache_directory.invalid"));
+        }
 
-        scene = new Scene(decorator.getDecorator(), 800, 519);
+        Task.runAsync(JavaVersion::initialize).start();
+
+        scene = new Scene(decorator.getDecorator(), 802, 482);
+        stage.setMinHeight(482);
+        stage.setMinWidth(802);
+        decorator.getDecorator().prefWidthProperty().bind(scene.widthProperty());
+        decorator.getDecorator().prefHeightProperty().bind(scene.heightProperty());
         scene.getStylesheets().setAll(config().getTheme().getStylesheets());
 
-        stage.getIcons().add(new Image("/assets/img/icon.png"));
+        stage.getIcons().add(newImage("/assets/img/icon.png"));
         stage.setTitle(Metadata.TITLE);
+        stage.setScene(scene);
     }
 
     public static void dialog(Region content) {
@@ -158,42 +132,51 @@ 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));
     }
 
-    public static void confirmDialog(String text, String title, Runnable onAccept, Runnable onCancel) {
+    public static void confirm(String text, String title, Runnable onAccept, Runnable onCancel) {
         dialog(new MessageDialogPane(text, title, onAccept, onCancel));
     }
 
-    public static InputDialogPane inputDialog(String text, FutureCallback<String> onResult) {
-        InputDialogPane pane = new InputDialogPane(text, onResult);
+    public static CompletableFuture<String> prompt(String title, FutureCallback<String> onResult) {
+        return prompt(title, onResult, "");
+    }
+
+    public static CompletableFuture<String> prompt(String title, FutureCallback<String> onResult, String initialValue) {
+        InputDialogPane pane = new InputDialogPane(title, initialValue, onResult);
         dialog(pane);
-        return pane;
+        return pane.getCompletableFuture();
     }
 
-    public static Region taskDialog(TaskExecutor executor, String title, String subtitle) {
-        return taskDialog(executor, title, subtitle, null);
+    public static CompletableFuture<List<PromptDialogPane.Builder.Question<?>>> prompt(PromptDialogPane.Builder builder) {
+        PromptDialogPane pane = new PromptDialogPane(builder);
+        dialog(pane);
+        return pane.getCompletableFuture();
     }
 
-    public static Region taskDialog(TaskExecutor executor, String title, String subtitle, Consumer<Region> onCancel) {
+    public static TaskExecutorDialogPane taskDialog(TaskExecutor executor, String title) {
+        return taskDialog(executor, title, null);
+    }
+
+    public static TaskExecutorDialogPane taskDialog(TaskExecutor executor, String title, Consumer<Region> onCancel) {
         TaskExecutorDialogPane pane = new TaskExecutorDialogPane(onCancel);
         pane.setTitle(title);
-        pane.setSubtitle(subtitle);
         pane.setExecutor(executor);
         dialog(pane);
         return pane;
     }
 
     public static void navigate(Node node) {
-        decorator.getNavigator().navigate(node);
+        decorator.getNavigator().navigate(node, ContainerAnimations.FADE.getAnimationProducer());
     }
 
     public static boolean isStopped() {
@@ -201,15 +184,11 @@ public final class Controllers {
     }
 
     public static void shutdown() {
-        mainPage = null;
-        settingsPage = null;
+        rootPage = null;
         versionPage = null;
         serversPage = null;
         decorator = null;
         stage = null;
         scene = null;
-        gameListPage = null;
-        accountListPage = null;
-        profileListPage = 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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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;
 
@@ -22,7 +22,6 @@ import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextArea;
-import javafx.scene.image.Image;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
@@ -30,6 +29,7 @@ import javafx.stage.Stage;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.upgrade.UpdateChecker;
 
+import static org.jackhuang.hmcl.ui.FXUtils.newImage;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 /**
@@ -67,7 +67,7 @@ public class CrashWindow extends Stage {
 
         Scene scene = new Scene(pane, 800, 480);
         setScene(scene);
-        getIcons().add(new Image("/assets/img/icon.png"));
+        getIcons().add(newImage("/assets/img/icon.png"));
         setTitle(i18n("message.error"));
 
         setOnCloseRequest(e -> System.exit(1));

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,28 +13,30 @@
  * 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 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;
 
+import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
+
 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);
-            JFXUtilities.runInFX(() -> {
+            runInFX(() -> {
                 AccountLoginPane pane = new AccountLoginPane(account, it -> {
                         res.set(it);
                         latch.countDown();
@@ -42,7 +44,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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,14 +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.controls.*;
-import javafx.animation.Animation;
 import javafx.animation.Interpolator;
 import javafx.animation.KeyFrame;
+import javafx.animation.KeyValue;
 import javafx.animation.Timeline;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
@@ -28,39 +28,59 @@ import javafx.beans.property.Property;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.beans.value.WeakChangeListener;
-import javafx.event.EventHandler;
+import javafx.beans.value.WritableValue;
 import javafx.fxml.FXMLLoader;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.*;
+import javafx.scene.image.Image;
 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;
 import javafx.util.Callback;
 import javafx.util.Duration;
 import javafx.util.StringConverter;
-import org.jackhuang.hmcl.util.*;
+import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.ResourceNotFoundError;
 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.concurrent.CountDownLatch;
-import java.util.concurrent.atomic.AtomicReference;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.BooleanSupplier;
 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;
 
 public final class FXUtils {
     private FXUtils() {
     }
 
+    public static void runInFX(Runnable runnable) {
+        if (Platform.isFxApplicationThread()) {
+            runnable.run();
+        } else {
+            Platform.runLater(runnable);
+        }
+    }
+
     public static void checkFxUserThread() {
         if (!Platform.isFxApplicationThread()) {
             throw new IllegalStateException("Not on FX application thread; currentThread = "
@@ -76,18 +96,25 @@ public final class FXUtils {
         value.addListener((a, b, c) -> consumer.accept(c));
     }
 
-    public static <T> void onWeakChange(ObservableValue<T> value, Consumer<T> consumer) {
-        value.addListener(new WeakChangeListener<>((a, b, c) -> consumer.accept(c)));
+    public static <T> WeakChangeListener<T> onWeakChange(ObservableValue<T> value, Consumer<T> consumer) {
+        WeakChangeListener<T> listener = new WeakChangeListener<>((a, b, c) -> consumer.accept(c));
+        value.addListener(listener);
+        return listener;
     }
 
     public static <T> void onChangeAndOperate(ObservableValue<T> value, Consumer<T> consumer) {
-        onChange(value, consumer);
         consumer.accept(value.getValue());
+        onChange(value, consumer);
     }
 
-    public static <T> void onWeakChangeAndOperate(ObservableValue<T> value, Consumer<T> consumer) {
-        onWeakChange(value, consumer);
+    public static <T> WeakChangeListener<T> onWeakChangeAndOperate(ObservableValue<T> value, Consumer<T> consumer) {
         consumer.accept(value.getValue());
+        return onWeakChange(value, consumer);
+    }
+
+    public static void runLaterIf(BooleanSupplier condition, Runnable runnable) {
+        if (condition.getAsBoolean()) Platform.runLater(() -> runLaterIf(condition, runnable));
+        else runnable.run();
     }
 
     public static void limitSize(ImageView imageView, double maxWidth, double maxHeight) {
@@ -135,6 +162,20 @@ public final class FXUtils {
                 });
     }
 
+    public static <K, T> void setupCellValueFactory(JFXTreeTableColumn<K, T> column, Function<K, ObservableValue<T>> mapper) {
+        column.setCellValueFactory(param -> {
+            if (column.validateValue(param))
+                return mapper.apply(param.getValue().getValue());
+            else
+                return column.getComputedValue(param);
+        });
+    }
+
+    public static Node wrapMargin(Node node, Insets insets) {
+        StackPane.setMargin(node, insets);
+        return new StackPane(node);
+    }
+
     public static void setValidateWhileTextChanged(Node field, boolean validate) {
         if (field instanceof JFXTextField) {
             if (validate) {
@@ -158,19 +199,19 @@ public final class FXUtils {
         return field.getProperties().containsKey("FXUtils.validation");
     }
 
-    public static void setOverflowHidden(Region region, boolean hidden) {
-        if (hidden) {
-            Rectangle rectangle = new Rectangle();
-            rectangle.widthProperty().bind(region.widthProperty());
-            rectangle.heightProperty().bind(region.heightProperty());
-            region.setClip(rectangle);
-        } else {
-            region.setClip(null);
-        }
+    public static Rectangle setOverflowHidden(Region region) {
+        Rectangle rectangle = new Rectangle();
+        rectangle.widthProperty().bind(region.widthProperty());
+        rectangle.heightProperty().bind(region.heightProperty());
+        region.setClip(rectangle);
+        return rectangle;
     }
 
-    public static boolean getOverflowHidden(Region region) {
-        return region.getClip() != null;
+    public static Rectangle setOverflowHidden(Region region, double arc) {
+        Rectangle rectangle = setOverflowHidden(region);
+        rectangle.setArcWidth(arc);
+        rectangle.setArcHeight(arc);
+        return rectangle;
     }
 
     public static void setLimitWidth(Region region, double width) {
@@ -193,6 +234,14 @@ public final class FXUtils {
         return region.getMaxHeight();
     }
 
+    public static Node limitingSize(Node node, double width, double height) {
+        StackPane pane = new StackPane(node);
+        pane.setAlignment(Pos.CENTER);
+        FXUtils.setLimitWidth(pane, width);
+        FXUtils.setLimitHeight(pane, height);
+        return pane;
+    }
+
     public static void smoothScrolling(ScrollPane scrollPane) {
         JFXScrollPane.smoothScrolling(scrollPane);
     }
@@ -201,34 +250,73 @@ public final class FXUtils {
         FXMLLoader loader = new FXMLLoader(node.getClass().getResource(absolutePath), I18n.getResourceBundle());
         loader.setRoot(node);
         loader.setController(node);
-        Lang.invoke((ExceptionalSupplier<Object, IOException>) loader::load);
+        try {
+            loader.load();
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
     }
 
-    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) {
-        try {
-            // Java 8
-            Class<?> behaviorClass = Class.forName("javafx.scene.control.Tooltip$TooltipBehavior");
-            Constructor<?> behaviorConstructor = behaviorClass.getDeclaredConstructor(Duration.class, Duration.class, Duration.class, boolean.class);
-            behaviorConstructor.setAccessible(true);
-            Object behavior = behaviorConstructor.newInstance(new Duration(openDelay), new Duration(visibleDelay), new Duration(closeDelay), false);
-            Method installMethod = behaviorClass.getDeclaredMethod("install", Node.class, Tooltip.class);
-            installMethod.setAccessible(true);
-            installMethod.invoke(behavior, node, tooltip);
-        } catch (ReflectiveOperationException e) {
+        runInFX(() -> {
             try {
-                // Java 9
-                Tooltip.class.getMethod("setShowDelay", Duration.class).invoke(tooltip, new Duration(openDelay));
-                Tooltip.class.getMethod("setShowDuration", Duration.class).invoke(tooltip, new Duration(visibleDelay));
-                Tooltip.class.getMethod("setHideDelay", Duration.class).invoke(tooltip, new Duration(closeDelay));
-            } catch (ReflectiveOperationException e2) {
-                e.addSuppressed(e2);
-                Logging.LOG.log(Level.SEVERE, "Cannot install tooltip", e);
+                // Java 8
+                Class<?> behaviorClass = Class.forName("javafx.scene.control.Tooltip$TooltipBehavior");
+                Constructor<?> behaviorConstructor = behaviorClass.getDeclaredConstructor(Duration.class, Duration.class, Duration.class, boolean.class);
+                behaviorConstructor.setAccessible(true);
+                Object behavior = behaviorConstructor.newInstance(new Duration(openDelay), new Duration(visibleDelay), new Duration(closeDelay), false);
+                Method installMethod = behaviorClass.getDeclaredMethod("install", Node.class, Tooltip.class);
+                installMethod.setAccessible(true);
+                installMethod.invoke(behavior, node, tooltip);
+            } catch (ReflectiveOperationException e) {
+                try {
+                    // Java 9
+                    Tooltip.class.getMethod("setShowDelay", Duration.class).invoke(tooltip, new Duration(openDelay));
+                    Tooltip.class.getMethod("setShowDuration", Duration.class).invoke(tooltip, new Duration(visibleDelay));
+                    Tooltip.class.getMethod("setHideDelay", Duration.class).invoke(tooltip, new Duration(closeDelay));
+                } catch (ReflectiveOperationException e2) {
+                    e.addSuppressed(e2);
+                    Logging.LOG.log(Level.SEVERE, "Cannot install tooltip", e);
+                }
+                Tooltip.install(node, tooltip);
             }
-            Tooltip.install(node, tooltip);
+        });
+    }
+
+    public static void playAnimation(Node node, String animationKey, Timeline timeline) {
+        animationKey = "FXUTILS.ANIMATION." + animationKey;
+        Object oldTimeline = node.getProperties().get(animationKey);
+        if (oldTimeline instanceof Timeline) ((Timeline) oldTimeline).stop();
+        if (timeline != null) timeline.play();
+        node.getProperties().put(animationKey, timeline);
+    }
+
+    public static <T> void playAnimation(Node node, String animationKey, Duration duration, WritableValue<T> property, T from, T to, Interpolator interpolator) {
+        if (from == null) from = property.getValue();
+        if (duration == null || Objects.equals(duration, Duration.ZERO) || Objects.equals(from, to)) {
+            playAnimation(node, animationKey, null);
+            property.setValue(to);
+        } else {
+            playAnimation(node, animationKey, new Timeline(
+                    new KeyFrame(Duration.ZERO, new KeyValue(property, from, interpolator)),
+                    new KeyFrame(duration, new KeyValue(property, to, interpolator))
+            ));
         }
     }
 
@@ -249,11 +337,15 @@ public final class FXUtils {
                 }
                 break;
             default:
-                try {
-                    java.awt.Desktop.getDesktop().open(file);
-                } catch (Throwable e) {
-                    Logging.LOG.log(Level.SEVERE, "Unable to open " + path + " by java.awt.Desktop.getDesktop()::open", e);
-                }
+                thread(() -> {
+                    if (java.awt.Desktop.isDesktopSupported()) {
+                        try {
+                            java.awt.Desktop.getDesktop().open(file);
+                        } catch (Throwable e) {
+                            Logging.LOG.log(Level.SEVERE, "Unable to open " + path + " by java.awt.Desktop.getDesktop()::open", e);
+                        }
+                    }
+                });
         }
     }
 
@@ -265,21 +357,25 @@ public final class FXUtils {
     public static void openLink(String link) {
         if (link == null)
             return;
-        try {
-            java.awt.Desktop.getDesktop().browse(new URI(link));
-        } catch (Throwable e) {
-            if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX)
+        thread(() -> {
+            if (java.awt.Desktop.isDesktopSupported()) {
                 try {
-                    Runtime.getRuntime().exec(new String[] { "/usr/bin/open", link });
-                } catch (IOException ex) {
-                    Logging.LOG.log(Level.WARNING, "Unable to open link: " + link, ex);
+                    java.awt.Desktop.getDesktop().browse(new URI(link));
+                } catch (Throwable e) {
+                    if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX)
+                        try {
+                            Runtime.getRuntime().exec(new String[]{"/usr/bin/open", link});
+                        } catch (IOException ex) {
+                            Logging.LOG.log(Level.WARNING, "Unable to open link: " + link, ex);
+                        }
+                    Logging.LOG.log(Level.WARNING, "Failed to open link: " + link, e);
                 }
-            Logging.LOG.log(Level.WARNING, "Failed to open link: " + link, e);
-        }
+            }
+        });
     }
 
     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) {
@@ -316,9 +412,11 @@ public final class FXUtils {
      * @param comboBox the combo box being bound with {@code property}.
      * @param property the property being bound with {@code combo box}.
      * @see #unbindEnum(JFXComboBox)
+     * @deprecated Use {@link ExtendedProperties#selectedItemPropertyFor(ComboBox)}
      */
     @SuppressWarnings("unchecked")
-    public static void bindEnum(JFXComboBox<?> comboBox, Property<? extends Enum> property) {
+    @Deprecated
+    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()]);
@@ -334,76 +432,54 @@ public final class FXUtils {
      * @see #bindEnum(JFXComboBox, Property)
      */
     @SuppressWarnings("unchecked")
+    @Deprecated
     public static void unbindEnum(JFXComboBox<?> comboBox) {
         ChangeListener listener = tryCast(comboBox.getProperties().get("FXUtils.bindEnum.listener"), ChangeListener.class).orElse(null);
         if (listener == null) return;
         comboBox.getSelectionModel().selectedIndexProperty().removeListener(listener);
     }
 
-    public static void smoothScrolling(ListView<?> listView) {
-        listView.skinProperty().addListener(o -> {
-            ScrollBar bar = (ScrollBar) listView.lookup(".scroll-bar");
-            Node virtualFlow = listView.lookup(".virtual-flow");
-            double[] frictions = new double[]{0.99, 0.1, 0.05, 0.04, 0.03, 0.02, 0.01, 0.04, 0.01, 0.008, 0.008, 0.008, 0.008, 0.0006, 0.0005, 0.00003, 0.00001};
-            double[] pushes = new double[]{1};
-            double[] derivatives = new double[frictions.length];
-
-            Timeline timeline = new Timeline();
-            bar.addEventHandler(MouseEvent.DRAG_DETECTED, e -> timeline.stop());
-
-            EventHandler<ScrollEvent> scrollEventHandler = event -> {
-                if (event.getEventType() == ScrollEvent.SCROLL) {
-                    int direction = event.getDeltaY() > 0 ? -1 : 1;
-                    for (int i = 0; i < pushes.length; ++i)
-                        derivatives[i] += direction * pushes[i];
-                    if (timeline.getStatus() == Animation.Status.STOPPED)
-                        timeline.play();
-                    event.consume();
-                }
-            };
-
-            bar.addEventHandler(ScrollEvent.ANY, scrollEventHandler);
-            virtualFlow.setOnScroll(scrollEventHandler);
-
-            timeline.getKeyFrames().add(new KeyFrame(Duration.millis(3), event -> {
-                for (int i = 0; i < derivatives.length; ++i)
-                    derivatives[i] *= frictions[i];
-                for (int i = 1; i < derivatives.length; ++i)
-                    derivatives[i] += derivatives[i - 1];
-                double dy = derivatives[derivatives.length - 1];
-                double height = listView.getLayoutBounds().getHeight();
-                bar.setValue(Math.min(Math.max(bar.getValue() + dy / height, 0), 1));
-                if (Math.abs(dy) < 0.001)
-                    timeline.stop();
-                listView.requestLayout();
-            }));
-            timeline.setCycleCount(Animation.INDEFINITE);
-        });
+    /**
+     * Suppress IllegalArgumentException since the url is supposed to be correct definitely.
+     * @param url the url of image. The image resource should be a file within the jar.
+     * @return the image resource within the jar.
+     * @see org.jackhuang.hmcl.util.CrashReporter
+     * @see ResourceNotFoundError
+     */
+    public static Image newImage(String url) {
+        try {
+            return new Image(url);
+        } catch (IllegalArgumentException e) {
+            throw new ResourceNotFoundError("Cannot access image: " + url, e);
+        }
     }
 
-    public static <T> T runInUIThread(Supplier<T> supplier) {
-        if (javafx.application.Platform.isFxApplicationThread()) {
-            return supplier.get();
-        } else {
-            CountDownLatch doneLatch = new CountDownLatch(1);
-            AtomicReference<T> reference = new AtomicReference<>();
-            Platform.runLater(() -> {
-                try {
-                    reference.set(supplier.get());
-                } finally {
-                    doneLatch.countDown();
-                }
+    public static void applyDragListener(Node node, FileFilter filter, Consumer<List<File>> callback) {
+        applyDragListener(node, filter, callback, null);
+    }
 
-            });
-
-            try {
-                doneLatch.await();
-            } catch (InterruptedException var3) {
-                Thread.currentThread().interrupt();
+    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();
+        });
 
-            return reference.get();
-        }
+        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) {
@@ -427,6 +503,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));
                 }
             }
@@ -444,4 +521,11 @@ public final class FXUtils {
             return "Interpolator.SINE";
         }
     };
+
+    public static Runnable withJFXPopupClosing(Runnable runnable, JFXPopup popup) {
+        return () -> {
+            runnable.run();
+            popup.hide();
+        };
+    }
 }

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

@@ -1,241 +0,0 @@
-/*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2017  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 com.jfoenix.concurrency.JFXUtilities;
-import com.jfoenix.controls.*;
-import javafx.geometry.Insets;
-import javafx.geometry.Pos;
-import javafx.scene.Node;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.image.Image;
-import javafx.scene.input.MouseButton;
-import javafx.scene.layout.Region;
-import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
-import javafx.stage.FileChooser;
-import org.jackhuang.hmcl.download.LibraryAnalyzer;
-import org.jackhuang.hmcl.event.EventBus;
-import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
-import org.jackhuang.hmcl.event.RefreshingVersionsEvent;
-import org.jackhuang.hmcl.game.GameVersion;
-import org.jackhuang.hmcl.game.HMCLGameRepository;
-import org.jackhuang.hmcl.game.ModpackHelper;
-import org.jackhuang.hmcl.game.Version;
-import org.jackhuang.hmcl.mod.MismatchedModpackTypeException;
-import org.jackhuang.hmcl.mod.UnsupportedModpackException;
-import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.setting.Profiles;
-import org.jackhuang.hmcl.setting.Theme;
-import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.task.TaskExecutor;
-import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
-import org.jackhuang.hmcl.ui.construct.MessageBox;
-import org.jackhuang.hmcl.ui.versions.Versions;
-import org.jackhuang.hmcl.util.Lang;
-import org.jackhuang.hmcl.util.VersionNumber;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
-
-import static org.jackhuang.hmcl.util.StringUtils.removePrefix;
-import static org.jackhuang.hmcl.util.StringUtils.removeSuffix;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
-public class GameVersionListPage extends StackPane {
-    private final JFXSpinner spinner;
-    private final StackPane contentPane;
-    private final JFXMasonryPane masonryPane;
-
-    private Profile profile;
-
-    public GameVersionListPage() {
-        spinner = new JFXSpinner();
-        spinner.getStyleClass().setAll("first-spinner");
-
-        contentPane = new StackPane();
-
-        ScrollPane scrollPane = new ScrollPane();
-        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
-        scrollPane.setFitToWidth(true);
-
-        masonryPane = new JFXMasonryPane();
-        masonryPane.setHSpacing(3);
-        masonryPane.setVSpacing(3);
-        masonryPane.setCellWidth(182);
-        masonryPane.setCellHeight(153);
-
-        scrollPane.setContent(masonryPane);
-
-        VBox vBox = new VBox();
-        vBox.setPadding(new Insets(15));
-        vBox.setPickOnBounds(false);
-        vBox.setAlignment(Pos.BOTTOM_RIGHT);
-        vBox.setSpacing(15);
-
-        JFXButton btnRefresh = new JFXButton();
-        btnRefresh.setPrefWidth(40);
-        btnRefresh.setPrefHeight(40);
-        btnRefresh.setButtonType(JFXButton.ButtonType.RAISED);
-        btnRefresh.getStyleClass().setAll("jfx-button-raised-round");
-        btnRefresh.setGraphic(SVG.refresh(Theme.foregroundFillBinding(), -1, -1));
-        btnRefresh.setOnMouseClicked(e -> profile.getRepository().refreshVersionsAsync().start());
-        FXUtils.installTooltip(btnRefresh, i18n("button.refresh"));
-
-        vBox.getChildren().setAll(btnRefresh);
-
-        contentPane.getChildren().setAll(scrollPane, vBox);
-
-        getChildren().setAll(spinner);
-
-        Profiles.selectedProfileProperty().addListener((o, a, b) -> this.profile = b);
-        profile = Profiles.getSelectedProfile();
-
-        EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).register(event -> {
-            if (event.getSource() == profile.getRepository())
-                loadVersions((HMCLGameRepository) event.getSource());
-        });
-        EventBus.EVENT_BUS.channel(RefreshingVersionsEvent.class).register(event -> {
-            if (event.getSource() == profile.getRepository())
-                // This will occupy 0.5s. Too slow!
-                JFXUtilities.runInFX(this::loadingVersions);
-        });
-        if (profile.getRepository().isLoaded())
-            loadVersions(profile.getRepository());
-        else
-            profile.getRepository().refreshVersionsAsync().start();
-    }
-
-    private String modifyVersion(String gameVersion, String version) {
-        return removeSuffix(removePrefix(removeSuffix(removePrefix(version.replace(gameVersion, "").trim(), "-"), "-"), "_"), "_");
-    }
-
-    private Node buildNode(HMCLGameRepository repository, Version version, Callable<String> gameCallable) {
-        Profile profile = repository.getProfile();
-        String id = version.getId();
-        VersionItem item = new VersionItem();
-        item.setUpdate(repository.isModpack(id));
-        Task.ofResult("game", gameCallable).subscribe(Schedulers.javafx(), vars -> {
-            String game = vars.get("game");
-            item.setGameVersion(game);
-
-            StringBuilder libraries = new StringBuilder();
-            LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(version);
-            analyzer.getForge().ifPresent(library -> libraries.append(i18n("install.installer.forge")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)forge", ""))).append("\n"));
-            analyzer.getLiteLoader().ifPresent(library -> libraries.append(i18n("install.installer.liteloader")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)liteloader", ""))).append("\n"));
-            analyzer.getOptiFine().ifPresent(library -> libraries.append(i18n("install.installer.optifine")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)optifine", ""))).append("\n"));
-
-            item.setLibraries(libraries.toString());
-        });
-        item.setVersionName(id);
-        item.setOnLaunchButtonClicked(e -> Versions.launch(profile, id));
-        item.setOnScriptButtonClicked(e -> Versions.generateLaunchScript(profile, id));
-        item.setOnSettingsButtonClicked(e -> {
-            Controllers.getVersionPage().load(id, profile);
-            Controllers.navigate(Controllers.getVersionPage());
-        });
-        item.setOnUpdateButtonClicked(event -> {
-            FileChooser chooser = new FileChooser();
-            chooser.setTitle(i18n("modpack.choose"));
-            chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("modpack"), "*.zip"));
-            File selectedFile = chooser.showOpenDialog(Controllers.getStage());
-            if (selectedFile != null) {
-                AtomicReference<Region> region = new AtomicReference<>();
-                try {
-                    TaskExecutor executor = ModpackHelper.getUpdateTask(profile, selectedFile, id, ModpackHelper.readModpackConfiguration(repository.getModpackConfiguration(id)))
-                            .then(Task.of(Schedulers.javafx(), () -> region.get().fireEvent(new DialogCloseEvent()))).executor();
-                    region.set(Controllers.taskDialog(executor, i18n("modpack.update"), ""));
-                    executor.start();
-                } catch (UnsupportedModpackException e) {
-                    region.get().fireEvent(new DialogCloseEvent());
-                    Controllers.dialog(i18n("modpack.unsupported"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
-                } catch (MismatchedModpackTypeException e) {
-                    region.get().fireEvent(new DialogCloseEvent());
-                    Controllers.dialog(i18n("modpack.mismatched_type"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
-                } catch (IOException e) {
-                    region.get().fireEvent(new DialogCloseEvent());
-                    Controllers.dialog(i18n("modpack.invalid"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
-                }
-            }
-        });
-        item.setOnMouseClicked(event -> {
-            if (event.getButton() == MouseButton.SECONDARY) {
-                JFXListView<String> versionList = new JFXListView<>();
-                JFXPopup versionPopup = new JFXPopup(versionList);
-                versionList.getStyleClass().add("option-list-view");
-                FXUtils.setLimitWidth(versionList, 150);
-                versionList.getItems().setAll(Lang.immutableListOf(
-                        i18n("version.manage.rename"),
-                        i18n("version.manage.remove"),
-                        i18n("modpack.export"),
-                        i18n("folder.game")
-                ));
-                versionList.setOnMouseClicked(e -> {
-                    versionPopup.hide();
-                    switch (versionList.getSelectionModel().getSelectedIndex()) {
-                        case 0:
-                            Versions.renameVersion(profile, id);
-                            break;
-                        case 1:
-                            Versions.deleteVersion(profile, id);
-                            break;
-                        case 2:
-                            Versions.exportVersion(profile, id);
-                            break;
-                        case 3:
-                            FXUtils.openFolder(repository.getRunDirectory(id));
-                            break;
-                        default:
-                            break;
-                    }
-                });
-                versionPopup.show(item, JFXPopup.PopupVPosition.TOP, JFXPopup.PopupHPosition.LEFT, event.getX(), event.getY());
-            } else if (event.getButton() == MouseButton.PRIMARY && event.getClickCount() == 2) {
-                Versions.launch(profile, id);
-            }
-        });
-        File iconFile = repository.getVersionIcon(id);
-        if (iconFile.exists())
-            item.setImage(new Image("file:" + iconFile.getAbsolutePath()));
-        return item;
-    }
-
-    private void loadingVersions() {
-        getChildren().setAll(spinner);
-        masonryPane.getChildren().clear();
-    }
-
-    private void loadVersions(HMCLGameRepository repository) {
-        List<Node> children = repository.getVersions().parallelStream()
-                .filter(version -> !version.isHidden())
-                .sorted((a, b) -> VersionNumber.COMPARATOR.compare(VersionNumber.asVersion(a.getId()), VersionNumber.asVersion(b.getId())))
-                .map(version -> buildNode(repository, version, () -> GameVersion.minecraftVersion(repository.getVersionJar(version.getId())).orElse("Unknown")))
-                .collect(Collectors.toList());
-        JFXUtilities.runInFX(() -> {
-            if (profile == repository.getProfile()) {
-                masonryPane.getChildren().setAll(children);
-                getChildren().setAll(contentPane);
-            }
-        });
-    }
-}

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,14 +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;
 
+import com.jfoenix.controls.JFXButton;
 import com.jfoenix.effects.JFXDepthManager;
-import javafx.fxml.FXML;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
 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;
+import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
+import org.jackhuang.hmcl.util.i18n.I18n;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.function.Consumer;
 
@@ -30,26 +39,74 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
  * @author huangyuhui
  */
 public class InstallerItem extends BorderPane {
-    private final Consumer<InstallerItem> deleteCallback;
 
-    @FXML
-    private Label lblInstallerArtifact;
-
-    @FXML
-    private Label lblInstallerVersion;
-
-    public InstallerItem(String artifact, String version, Consumer<InstallerItem> deleteCallback) {
-        this.deleteCallback = deleteCallback;
-        FXUtils.loadFXML(this, "/assets/fxml/version/installer-item.fxml");
-
-        setStyle("-fx-background-radius: 2; -fx-background-color: white; -fx-padding: 8;");
+    public InstallerItem(String libraryId, String libraryVersion, @Nullable Runnable upgrade, @Nullable Consumer<InstallerItem> deleteCallback) {
+        getStyleClass().addAll("two-line-list-item", "card");
         JFXDepthManager.setDepth(this, 1);
-        lblInstallerArtifact.setText(artifact);
-        lblInstallerVersion.setText(i18n("archive.version") + ": " + version);
+
+        String[] urls = new String[]{"/assets/img/grass.png", "/assets/img/fabric.png", "/assets/img/forge.png", "/assets/img/chicken.png", "/assets/img/command.png"};
+        String[] libraryIds = new String[]{"game", "fabric", "forge", "liteloader", "optifine"};
+
+        boolean regularLibrary = false;
+        for (int i = 0; i < 5; ++i) {
+            if (libraryIds[i].equals(libraryId)) {
+                setLeft(FXUtils.limitingSize(new ImageView(new Image(urls[i], 32, 32, true, true)), 32, 32));
+                Label label = new Label();
+                BorderPane.setAlignment(label, Pos.CENTER_LEFT);
+                BorderPane.setMargin(label, new Insets(0, 0, 0, 8));
+                if (libraryVersion == null) {
+                    label.setText(i18n("install.installer.not_installed", i18n("install.installer." + libraryId)));
+                } else {
+                    label.setText(i18n("install.installer.version", i18n("install.installer." + libraryId), libraryVersion));
+                }
+                setCenter(label);
+                regularLibrary = true;
+                break;
+            }
+        }
+
+        if (!regularLibrary) {
+            String title = I18n.hasKey("install.installer." + libraryId) ? i18n("install.installer." + libraryId) : libraryId;
+            if (libraryVersion != null) {
+                TwoLineListItem item = new TwoLineListItem();
+                item.setTitle(title);
+                item.setSubtitle(i18n("archive.version") + ": " + libraryVersion);
+                setCenter(item);
+            } else {
+                Label label = new Label();
+                label.setStyle("-fx-font-size: 15px;");
+                BorderPane.setAlignment(label, Pos.CENTER_LEFT);
+                setCenter(label);
+            }
+        }
+
+        {
+            HBox hBox = new HBox();
+
+            if (upgrade != null) {
+                JFXButton upgradeButton = new JFXButton();
+                if (libraryVersion == null) {
+                    upgradeButton.setGraphic(SVG.arrowRight(Theme.blackFillBinding(), -1, -1));
+                } else {
+                    upgradeButton.setGraphic(SVG.update(Theme.blackFillBinding(), -1, -1));
+                }
+                upgradeButton.getStyleClass().add("toggle-icon4");
+                FXUtils.installFastTooltip(upgradeButton, i18n("install.change_version"));
+                upgradeButton.setOnMouseClicked(e -> upgrade.run());
+                hBox.getChildren().add(upgradeButton);
+            }
+
+            if (deleteCallback != null) {
+                JFXButton deleteButton = new JFXButton();
+                deleteButton.setGraphic(SVG.close(Theme.blackFillBinding(), -1, -1));
+                deleteButton.getStyleClass().add("toggle-icon4");
+                deleteButton.setOnMouseClicked(e -> deleteCallback.accept(this));
+                hBox.getChildren().add(deleteButton);
+            }
+
+            hBox.setAlignment(Pos.CENTER_RIGHT);
+            setRight(hBox);
+        }
     }
 
-    @FXML
-    private void onDelete() {
-        deleteCallback.accept(this);
-    }
 }

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

@@ -1,138 +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 com.jfoenix.concurrency.JFXUtilities;
-import javafx.application.Platform;
-import javafx.beans.binding.When;
-import javafx.scene.layout.Region;
-import javafx.scene.paint.Color;
-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.Profiles;
-import org.jackhuang.hmcl.setting.Theme;
-import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.task.TaskExecutor;
-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.DialogCloseEvent;
-import org.jackhuang.hmcl.ui.construct.IconedItem;
-import org.jackhuang.hmcl.ui.profile.ProfileAdvancedListItem;
-import org.jackhuang.hmcl.ui.versions.GameAdvancedListItem;
-import org.jackhuang.hmcl.upgrade.UpdateChecker;
-
-import java.io.File;
-import java.util.concurrent.atomic.AtomicReference;
-
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
-public final class LeftPaneController extends AdvancedListBox {
-
-    public LeftPaneController() {
-
-        AccountAdvancedListItem accountListItem = new AccountAdvancedListItem();
-        accountListItem.setOnAction(e -> Controllers.navigate(Controllers.getAccountListPage()));
-        accountListItem.accountProperty().bind(Accounts.selectedAccountProperty());
-        GameAdvancedListItem gameListItem = new GameAdvancedListItem();
-        gameListItem.setOnAction(e -> Controllers.navigate(Controllers.getGameListPage()));
-        ProfileAdvancedListItem profileListItem = new ProfileAdvancedListItem();
-        profileListItem.setOnAction(e -> Controllers.navigate(Controllers.getProfileListPage()));
-        profileListItem.profileProperty().bind(Profiles.selectedProfileProperty());
-
-        IconedItem launcherSettingsItem = new IconedItem(SVG.gear(Theme.blackFillBinding(), 20, 20), "iconed-item");
-
-        launcherSettingsItem.getLabel().textProperty().bind(
-                new When(UpdateChecker.outdatedProperty())
-                        .then(i18n("update.found"))
-                        .otherwise(i18n("settings.launcher")));
-
-        launcherSettingsItem.getLabel().textFillProperty().bind(
-                new When(UpdateChecker.outdatedProperty())
-                        .then(Color.RED)
-                        .otherwise(Color.BLACK));
-
-        launcherSettingsItem.setOnMouseClicked(e -> Controllers.navigate(Controllers.getSettingsPage()));
-
-        this
-                .startCategory(i18n("account").toUpperCase())
-                .add(accountListItem)
-                .startCategory(i18n("version").toUpperCase())
-                .add(gameListItem)
-                .startCategory(i18n("profile.title").toUpperCase())
-                .add(profileListItem)
-                .startCategory(i18n("launcher").toUpperCase())
-                .add(launcherSettingsItem);
-
-        EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).register(event -> onRefreshedVersions((HMCLGameRepository) event.getSource()));
-        if (Profiles.selectedProfileProperty().get().getRepository().isLoaded())
-            onRefreshedVersions(Profiles.selectedProfileProperty().get().getRepository());
-    }
-
-    // ==== Accounts ====
-    public void checkAccount() {
-        if (Accounts.getAccounts().isEmpty())
-            Platform.runLater(this::addNewAccount);
-    }
-
-    private void addNewAccount() {
-        Controllers.dialog(new AddAccountPane());
-    }
-    // ====
-
-    private boolean checkedModpack = false;
-    private static boolean showNewAccount = true;
-
-    private void onRefreshedVersions(HMCLGameRepository repository) {
-        JFXUtilities.runInFX(() -> {
-            if (!checkedModpack) {
-                checkedModpack = true;
-
-                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) {
-                        }
-                    }
-                }
-            }
-
-            if (showNewAccount) {
-                showNewAccount = false;
-                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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,35 +13,37 @@
  * 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 javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleListProperty;
-import javafx.collections.FXCollections;
 import javafx.scene.Node;
-import javafx.scene.control.Control;
 import javafx.scene.control.Skin;
 
-public abstract class ListPage<T extends Node> extends Control {
-    private final ListProperty<T> items = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final BooleanProperty loading = new SimpleBooleanProperty(false);
+public abstract class ListPage<T extends Node> extends ListPageBase<T> {
+    private final BooleanProperty refreshable = new SimpleBooleanProperty(this, "refreshable", false);
 
     public abstract void add();
 
-    public ListProperty<T> itemsProperty() {
-        return items;
-    }
-
-    public BooleanProperty loadingProperty() {
-        return loading;
+    public void refresh() {
     }
 
     @Override
     protected Skin<?> createDefaultSkin() {
         return new ListPageSkin(this);
     }
+
+    public boolean isRefreshable() {
+        return refreshable.get();
+    }
+
+    public BooleanProperty refreshableProperty() {
+        return refreshable;
+    }
+
+    public void setRefreshable(boolean refreshable) {
+        this.refreshable.set(refreshable);
+    }
 }

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

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

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,32 +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;
 
 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();
+        VBox list = new VBox();
 
         StackPane contentPane = new StackPane();
         {
@@ -46,17 +47,18 @@ public class ListPageSkin extends SkinBase<ListPage> {
             {
                 scrollPane.setFitToWidth(true);
 
-                VBox accountList = new VBox();
-                accountList.maxWidthProperty().bind(scrollPane.widthProperty());
-                accountList.setSpacing(10);
-                accountList.setStyle("-fx-padding: 10 10 10 10;");
+                list.maxWidthProperty().bind(scrollPane.widthProperty());
+                list.setSpacing(10);
 
-                Bindings.bindContent(accountList.getChildren(), skinnable.itemsProperty());
+                VBox content = new VBox();
+                content.getChildren().setAll(list, placeholder);
 
-                scrollPane.setContent(accountList);
+                Bindings.bindContent(list.getChildren(), skinnable.itemsProperty());
+
+                scrollPane.setContent(content);
                 JFXScrollPane.smoothScrolling(scrollPane);
             }
-
+            
             VBox vBox = new VBox();
             {
                 vBox.setAlignment(Pos.BOTTOM_RIGHT);
@@ -67,24 +69,45 @@ 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) {
+                                list.setPadding(new Insets(10, 10, 15 + 40 + 15 + 40 + 15, 10));
+                                vBox.getChildren().setAll(btnRefresh, btnAdd);
+                            } else {
+                                list.setPadding(new Insets(10, 10, 15 + 40 + 15, 10));
+                                vBox.getChildren().setAll(btnAdd);
+                            }
+                        });
             }
 
-            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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,38 +13,51 @@
  * 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.JFXCheckBox;
+import com.jfoenix.controls.JFXComboBox;
+import com.jfoenix.controls.JFXListView;
+import javafx.application.Platform;
+import javafx.beans.InvalidationListener;
 import javafx.beans.binding.Bindings;
-import javafx.beans.property.ReadOnlyIntegerProperty;
-import javafx.beans.property.ReadOnlyIntegerWrapper;
-import javafx.concurrent.Worker;
-import javafx.fxml.FXML;
+import javafx.beans.property.*;
+import javafx.beans.value.WeakChangeListener;
+import javafx.css.PseudoClass;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
 import javafx.scene.Scene;
-import javafx.scene.control.ComboBox;
-import javafx.scene.control.ToggleButton;
-import javafx.scene.image.Image;
-import javafx.scene.layout.StackPane;
-import javafx.scene.web.WebEngine;
-import javafx.scene.web.WebView;
+import javafx.scene.control.*;
+import javafx.scene.control.Label;
+import javafx.scene.layout.*;
 import javafx.stage.Stage;
-import org.jackhuang.hmcl.event.Event;
-import org.jackhuang.hmcl.event.EventManager;
 import org.jackhuang.hmcl.game.LauncherHelper;
-import org.jackhuang.hmcl.setting.Settings;
-import org.jackhuang.hmcl.util.IOUtils;
-import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.Log4jLevel;
-import org.jackhuang.hmcl.util.StringUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
 
-import java.util.concurrent.CountDownLatch;
+import javax.swing.*;
+import java.awt.*;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayDeque;
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.ui.FXUtils.newImage;
+import static org.jackhuang.hmcl.util.Lang.thread;
+import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.StringUtils.parseEscapeSequence;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 /**
@@ -53,193 +66,267 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
  */
 public final class LogWindow extends Stage {
 
-    private final ReadOnlyIntegerWrapper fatal = new ReadOnlyIntegerWrapper(0);
-    private final ReadOnlyIntegerWrapper error = new ReadOnlyIntegerWrapper(0);
-    private final ReadOnlyIntegerWrapper warn = new ReadOnlyIntegerWrapper(0);
-    private final ReadOnlyIntegerWrapper info = new ReadOnlyIntegerWrapper(0);
-    private final ReadOnlyIntegerWrapper debug = new ReadOnlyIntegerWrapper(0);
+    private final ArrayDeque<Log> logs = new ArrayDeque<>();
+    private final Map<Log4jLevel, SimpleIntegerProperty> levelCountMap = new EnumMap<Log4jLevel, SimpleIntegerProperty>(Log4jLevel.class) {
+        {
+            for (Log4jLevel level : Log4jLevel.values()) put(level, new SimpleIntegerProperty());
+        }
+    };
+    private final Map<Log4jLevel, SimpleBooleanProperty> levelShownMap = new EnumMap<Log4jLevel, SimpleBooleanProperty>(Log4jLevel.class) {
+        {
+            for (Log4jLevel level : Log4jLevel.values()) {
+                SimpleBooleanProperty property = new SimpleBooleanProperty(true);
+                put(level, property);
+            }
+        }
+    };
     private final LogWindowImpl impl = new LogWindowImpl();
-    private final CountDownLatch latch = new CountDownLatch(1);
-    public final EventManager<Event> onDone = new EventManager<>();
+    private final WeakChangeListener<Number> logLinesListener = FXUtils.onWeakChange(config().logLinesProperty(), logLines -> checkLogCount());
+
+    private boolean stopCheckLogCount = false;
 
     public LogWindow() {
         setScene(new Scene(impl, 800, 480));
         getScene().getStylesheets().addAll(config().getTheme().getStylesheets());
         setTitle(i18n("logwindow.title"));
-        getIcons().add(new Image("/assets/img/icon.png"));
-    }
+        getIcons().add(newImage("/assets/img/icon.png"));
 
-    public LogWindow(String text) {
-        this();
-
-        onDone.register(() -> logLine(text, Log4jLevel.INFO));
-    }
-
-    public ReadOnlyIntegerProperty fatalProperty() {
-        return fatal.getReadOnlyProperty();
-    }
-
-    public int getFatal() {
-        return fatal.get();
-    }
-
-    public ReadOnlyIntegerProperty errorProperty() {
-        return error.getReadOnlyProperty();
-    }
-
-    public int getError() {
-        return error.get();
-    }
-
-    public ReadOnlyIntegerProperty warnProperty() {
-        return warn.getReadOnlyProperty();
-    }
-
-    public int getWarn() {
-        return warn.get();
-    }
-
-    public ReadOnlyIntegerProperty infoProperty() {
-        return info.getReadOnlyProperty();
-    }
-
-    public int getInfo() {
-        return info.get();
-    }
-
-    public ReadOnlyIntegerProperty debugProperty() {
-        return debug.getReadOnlyProperty();
-    }
-
-    public int getDebug() {
-        return debug.get();
+        levelShownMap.values().forEach(property -> property.addListener((a, b, newValue) -> shakeLogs()));
     }
 
     public void logLine(String line, Log4jLevel level) {
-        Element div = impl.document.createElement("div");
-        // a <pre> element to prevent multiple spaces and tabs being removed.
-        Element pre = impl.document.createElement("pre");
-        pre.setTextContent(line);
-        div.appendChild(pre);
-        impl.body.appendChild(div);
-        impl.engine.executeScript("checkNewLog(\"" + level.name().toLowerCase() + "\");scrollToBottom();");
+        Log log = new Log(parseEscapeSequence(line), level);
+        logs.add(log);
+        if (levelShownMap.get(level).get())
+            impl.listView.getItems().add(log);
 
-        switch (level) {
-            case FATAL:
-                fatal.set(fatal.get() + 1);
-                break;
-            case ERROR:
-                error.set(error.get() + 1);
-                break;
-            case WARN:
-                warn.set(warn.get() + 1);
-                break;
-            case INFO:
-                info.set(info.get() + 1);
-                break;
-            case DEBUG:
-                debug.set(debug.get() + 1);
-                break;
-            default:
-                // ignore
+        levelCountMap.get(level).setValue(levelCountMap.get(level).getValue() + 1);
+        if (!stopCheckLogCount) checkLogCount();
+    }
+
+    public void showGameCrashReport() {
+        stopCheckLogCount = true;
+        for (Log log : impl.listView.getItems()) {
+            if (log.log.contains("Minecraft Crash Report")) {
+                Platform.runLater(() -> {
+                    impl.listView.scrollTo(log);
+                });
                 break;
+            }
+        }
+        show();
+    }
+
+    private void shakeLogs() {
+        impl.listView.getItems().setAll(logs.stream().filter(log -> levelShownMap.get(log.level).get()).collect(Collectors.toList()));
+    }
+
+    private void checkLogCount() {
+        while (logs.size() > config().getLogLines()) {
+            Log removedLog = logs.removeFirst();
+            if (!impl.listView.getItems().isEmpty() && impl.listView.getItems().get(0) == removedLog) {
+                // TODO: fix O(n)
+                impl.listView.getItems().remove(0);
+            }
         }
     }
 
-    public void waitForLoaded() throws InterruptedException {
-        latch.await();
+    private static class Log {
+        private final String log;
+        private final Log4jLevel level;
+
+        public Log(String log, Log4jLevel level) {
+            this.log = log;
+            this.level = level;
+        }
     }
 
-    public class LogWindowImpl extends StackPane {
+    public class LogWindowImpl extends Control {
 
-        @FXML
-        private WebView webView;
-        @FXML
-        private ToggleButton btnFatals;
-        @FXML
-        private ToggleButton btnErrors;
-        @FXML
-        private ToggleButton btnWarns;
-        @FXML
-        private ToggleButton btnInfos;
-        @FXML
-        private ToggleButton btnDebugs;
-        @FXML
-        private ComboBox<String> cboLines;
-
-        final WebEngine engine;
-        Node body;
-        Document document;
+        private ListView<Log> listView = new JFXListView<>();
+        private BooleanProperty autoScroll = new SimpleBooleanProperty();
+        private List<StringProperty> buttonText = IntStream.range(0, 5).mapToObj(x -> new SimpleStringProperty()).collect(Collectors.toList());
+        private List<BooleanProperty> showLevel = IntStream.range(0, 5).mapToObj(x -> new SimpleBooleanProperty(true)).collect(Collectors.toList());
+        private JFXComboBox<String> cboLines = new JFXComboBox<>();
 
         LogWindowImpl() {
-            FXUtils.loadFXML(this, "/assets/fxml/log.fxml");
-
-            engine = webView.getEngine();
-            engine.loadContent(Lang.ignoringException(() -> IOUtils.readFullyAsString(getClass().getResourceAsStream("/assets/log-window-content.html")))
-                    .replace("${FONT}", Settings.instance().getFont().getSize() + "px \"" + Settings.instance().getFont().getFamily() + "\""));
-            engine.getLoadWorker().stateProperty().addListener((a, b, newValue) -> {
-                if (newValue == Worker.State.SUCCEEDED) {
-                    document = engine.getDocument();
-                    body = document.getElementsByTagName("body").item(0);
-                    engine.executeScript("limitedLogs=" + Settings.instance().getLogLines());
-                    latch.countDown();
-                    onDone.fireEvent(new Event(LogWindow.this));
-                }
-            });
-
             boolean flag = false;
+            cboLines.getItems().setAll("500", "2000", "5000");
             for (String i : cboLines.getItems())
-                if (Integer.toString(Settings.instance().getLogLines()).equals(i)) {
+                if (Integer.toString(config().getLogLines()).equals(i)) {
                     cboLines.getSelectionModel().select(i);
                     flag = true;
                 }
 
             cboLines.getSelectionModel().selectedItemProperty().addListener((a, b, newValue) -> {
-                Settings.instance().setLogLines(newValue == null ? 100 : Integer.parseInt(newValue));
-                engine.executeScript("limitedLogs=" + Settings.instance().getLogLines());
+                config().setLogLines(newValue == null ? 100 : Integer.parseInt(newValue));
             });
 
             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.selectedProperty().addListener(o -> specificChanged());
-            btnErrors.selectedProperty().addListener(o -> specificChanged());
-            btnWarns.selectedProperty().addListener(o -> specificChanged());
-            btnInfos.selectedProperty().addListener(o -> specificChanged());
-            btnDebugs.selectedProperty().addListener(o -> specificChanged());
+            Log4jLevel[] levels = new Log4jLevel[]{Log4jLevel.FATAL, Log4jLevel.ERROR, Log4jLevel.WARN, Log4jLevel.INFO, Log4jLevel.DEBUG};
+            String[] suffix = new String[]{"fatals", "errors", "warns", "infos", "debugs"};
+            for (int i = 0; i < 5; ++i) {
+                buttonText.get(i).bind(Bindings.concat(levelCountMap.get(levels[i]), " " + suffix[i]));
+                levelShownMap.get(levels[i]).bind(showLevel.get(i));
+            }
         }
 
-        private void specificChanged() {
-            String res = "";
-            if (btnFatals.isSelected())
-                res += "\"fatal\", ";
-            if (btnErrors.isSelected())
-                res += "\"error\", ";
-            if (btnWarns.isSelected())
-                res += "\"warn\", ";
-            if (btnInfos.isSelected())
-                res += "\"info\", ";
-            if (btnDebugs.isSelected())
-                res += "\"debug\", ";
-            if (StringUtils.isNotBlank(res))
-                res = StringUtils.substringBeforeLast(res, ", ");
-            engine.executeScript("specific([" + res + "])");
-        }
-
-        @FXML
         private void onTerminateGame() {
             LauncherHelper.stopManagedProcesses();
         }
 
-        @FXML
         private void onClear() {
-            engine.executeScript("clear()");
+            logs.clear();
+        }
+
+        private void onExportLogs() {
+            thread(() -> {
+                Path logFile = Paths.get("minecraft-exported-logs-" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH-mm-ss")) + ".log").toAbsolutePath();
+                try {
+                    Files.write(logFile, logs.stream().map(x -> x.log).collect(Collectors.toList()));
+                } catch (IOException e) {
+                    LOG.log(Level.WARNING, "Failed to export logs", e);
+                    return;
+                }
+
+                JOptionPane.showMessageDialog(null, i18n("settings.launcher.launcher_log.export.success", logFile), i18n("settings.launcher.launcher_log.export"), JOptionPane.INFORMATION_MESSAGE);
+                if (Desktop.isDesktopSupported()) {
+                    try {
+                        Desktop.getDesktop().open(logFile.toFile());
+                    } catch (IOException ignored) {
+                    }
+                }
+            });
+        }
+
+        @Override
+        protected Skin<?> createDefaultSkin() {
+            return new LogWindowSkin(this);
+        }
+    }
+
+    private static class LogWindowSkin extends SkinBase<LogWindowImpl> {
+        private static PseudoClass EMPTY = PseudoClass.getPseudoClass("empty");
+        private static PseudoClass FATAL = PseudoClass.getPseudoClass("fatal");
+        private static PseudoClass ERROR = PseudoClass.getPseudoClass("error");
+        private static PseudoClass WARN = PseudoClass.getPseudoClass("warn");
+        private static PseudoClass INFO = PseudoClass.getPseudoClass("info");
+        private static PseudoClass DEBUG = PseudoClass.getPseudoClass("debug");
+        private static PseudoClass TRACE = PseudoClass.getPseudoClass("trace");
+
+        private static ToggleButton createToggleButton(String backgroundColor, StringProperty buttonText, BooleanProperty showLevel) {
+            ToggleButton button = new ToggleButton();
+            button.setStyle("-fx-background-color: " + backgroundColor + ";");
+            button.getStyleClass().add("log-toggle");
+            button.textProperty().bind(buttonText);
+            button.setSelected(true);
+            showLevel.bind(button.selectedProperty());
+            return button;
+        }
+
+        protected LogWindowSkin(LogWindowImpl control) {
+            super(control);
+
+            VBox vbox = new VBox(3);
+            vbox.setPadding(new Insets(3, 0, 3, 0));
+            vbox.setStyle("-fx-background-color: white");
+            getChildren().setAll(vbox);
+
+            {
+                BorderPane borderPane = new BorderPane();
+                borderPane.setPadding(new Insets(0, 3, 0, 3));
+
+                {
+                    HBox hBox = new HBox(3);
+                    hBox.setPadding(new Insets(0, 0, 0, 4));
+                    hBox.setAlignment(Pos.CENTER_LEFT);
+
+                    Label label = new Label(i18n("logwindow.show_lines"));
+                    hBox.getChildren().setAll(label, control.cboLines);
+
+                    borderPane.setLeft(hBox);
+                }
+
+                {
+                    HBox hBox = new HBox(3);
+                    hBox.getChildren().setAll(
+                            createToggleButton("#F7A699", control.buttonText.get(0), control.showLevel.get(0)),
+                            createToggleButton("#FFCCBB", control.buttonText.get(1), control.showLevel.get(1)),
+                            createToggleButton("#FFEECC", control.buttonText.get(2), control.showLevel.get(2)),
+                            createToggleButton("#FBFBFB", control.buttonText.get(3), control.showLevel.get(3)),
+                            createToggleButton("#EEE9E0", control.buttonText.get(4), control.showLevel.get(4))
+                    );
+                    borderPane.setRight(hBox);
+                }
+
+                vbox.getChildren().add(borderPane);
+            }
+
+            {
+                ListView<Log> listView = control.listView;
+                listView.getItems().addListener((InvalidationListener) observable -> {
+                    if (!listView.getItems().isEmpty() && control.autoScroll.get())
+                        listView.scrollTo(listView.getItems().size() - 1);
+                });
+                listView.setStyle("-fx-font-family: " + config().getFontFamily() + "; -fx-font-size: " + config().getFontSize() + "px;");
+                listView.setCellFactory(x -> new ListCell<Log>() {
+                    {
+                        Region clippedContainer = (Region)listView.lookup(".clipped-container");
+                        if (clippedContainer != null) {
+                            maxWidthProperty().bind(clippedContainer.widthProperty());
+                            prefWidthProperty().bind(clippedContainer.widthProperty());
+                        }
+                        setPadding(new Insets(2));
+                        getStyleClass().add("log");
+                        setWrapText(true);
+                        setGraphic(null);
+                    }
+
+                    @Override
+                    protected void updateItem(Log item, boolean empty) {
+                        super.updateItem(item, empty);
+                        pseudoClassStateChanged(EMPTY, empty);
+                        pseudoClassStateChanged(FATAL, !empty && item.level == Log4jLevel.FATAL);
+                        pseudoClassStateChanged(ERROR, !empty && item.level == Log4jLevel.ERROR);
+                        pseudoClassStateChanged(WARN, !empty && item.level == Log4jLevel.WARN);
+                        pseudoClassStateChanged(INFO, !empty && item.level == Log4jLevel.INFO);
+                        pseudoClassStateChanged(DEBUG, !empty && item.level == Log4jLevel.DEBUG);
+                        pseudoClassStateChanged(TRACE, !empty && item.level == Log4jLevel.TRACE);
+                        if (empty) {
+                            setText(null);
+                        } else {
+                            setText(item.log);
+                        }
+                    }
+                });
+
+                VBox.setVgrow(listView, Priority.ALWAYS);
+                vbox.getChildren().add(listView);
+            }
+
+            {
+                HBox hBox = new HBox(3);
+                hBox.setAlignment(Pos.CENTER_RIGHT);
+                hBox.setPadding(new Insets(0, 3, 0, 3));
+
+                JFXCheckBox autoScrollCheckBox = new JFXCheckBox(i18n("logwindow.autoscroll"));
+                autoScrollCheckBox.setSelected(true);
+                control.autoScroll.bind(autoScrollCheckBox.selectedProperty());
+
+                JFXButton terminateButton = new JFXButton(i18n("logwindow.terminate_game"));
+                terminateButton.setOnMouseClicked(e -> getSkinnable().onTerminateGame());
+
+                JFXButton exportLogsButton = new JFXButton(i18n("button.export"));
+                exportLogsButton.setOnMouseClicked(e -> getSkinnable().onExportLogs());
+
+                JFXButton clearButton = new JFXButton(i18n("button.clear"));
+                clearButton.setOnMouseClicked(e -> getSkinnable().onClear());
+                hBox.getChildren().setAll(autoScrollCheckBox, exportLogsButton, terminateButton, clearButton);
+
+                vbox.getChildren().add(hBox);
+            }
         }
     }
 }

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

@@ -1,68 +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.beans.property.ReadOnlyStringProperty;
-import javafx.beans.property.ReadOnlyStringWrapper;
-import javafx.fxml.FXML;
-import javafx.scene.layout.StackPane;
-import org.jackhuang.hmcl.setting.ConfigHolder;
-import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.setting.Profiles;
-import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
-import org.jackhuang.hmcl.ui.versions.Versions;
-
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
-public final class MainPage extends StackPane implements DecoratorPage {
-
-    private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper(this, "title", i18n("main_page"));
-
-    @FXML
-    private StackPane main;
-
-    {
-        FXUtils.loadFXML(this, "/assets/fxml/main.fxml");
-
-        FXUtils.onChangeAndOperate(ConfigHolder.config().enableMainPageGameListProperty(), newValue -> {
-            if (newValue)
-                getChildren().setAll(new GameVersionListPage());
-            else
-                getChildren().setAll(main);
-        });
-    }
-
-    @FXML
-    private void launch() {
-        Profile profile = Profiles.getSelectedProfile();
-        Versions.launch(profile, profile.getSelectedVersion());
-    }
-
-    public String getTitle() {
-        return title.get();
-    }
-
-    @Override
-    public ReadOnlyStringProperty titleProperty() {
-        return title.getReadOnlyProperty();
-    }
-
-    public void setTitle(String title) {
-        this.title.set(title);
-    }
-}

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

@@ -1,71 +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 com.jfoenix.concurrency.JFXUtilities;
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXCheckBox;
-import com.jfoenix.effects.JFXDepthManager;
-import javafx.geometry.Pos;
-import javafx.scene.layout.BorderPane;
-import org.jackhuang.hmcl.mod.ModInfo;
-import org.jackhuang.hmcl.setting.Theme;
-import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
-import org.jackhuang.hmcl.util.StringUtils;
-
-import java.util.function.Consumer;
-
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
-public final class ModItem extends BorderPane {
-
-    public ModItem(ModInfo info, Consumer<ModItem> deleteCallback) {
-        JFXCheckBox chkEnabled = new JFXCheckBox();
-        BorderPane.setAlignment(chkEnabled, Pos.CENTER);
-        setLeft(chkEnabled);
-
-        TwoLineListItem modItem = new TwoLineListItem();
-        BorderPane.setAlignment(modItem, Pos.CENTER);
-        setCenter(modItem);
-
-        JFXButton btnRemove = new JFXButton();
-        JFXUtilities.runInFX(() -> {
-            FXUtils.installTooltip(btnRemove, i18n("mods.remove"));
-        });
-        btnRemove.setOnMouseClicked(e -> deleteCallback.accept(this));
-        btnRemove.getStyleClass().add("toggle-icon4");
-        BorderPane.setAlignment(btnRemove, Pos.CENTER);
-        btnRemove.setGraphic(SVG.close(Theme.blackFillBinding(), 15, 15));
-        setRight(btnRemove);
-
-        setStyle("-fx-background-radius: 2; -fx-background-color: white; -fx-padding: 8;");
-        JFXDepthManager.setDepth(this, 1);
-        modItem.setTitle(info.getFileName());
-        StringBuilder message = new StringBuilder(info.getName());
-        if (StringUtils.isNotBlank(info.getVersion()))
-            message.append(", ").append(i18n("archive.version")).append(": ").append(info.getVersion());
-        if (StringUtils.isNotBlank(info.getGameVersion()))
-            message.append(", ").append(i18n("archive.game_version")).append(": ").append(info.getGameVersion());
-        if (StringUtils.isNotBlank(info.getAuthors()))
-            message.append(", ").append(i18n("archive.author")).append(": ").append(info.getAuthors());
-        modItem.setSubtitle(message.toString());
-        chkEnabled.setSelected(info.isActive());
-        chkEnabled.selectedProperty().addListener((a, b, newValue) ->
-                info.activeProperty().set(newValue));
-    }
-}

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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;
 
@@ -29,11 +29,15 @@ public final class SVG {
     private SVG() {
     }
 
+    public interface SVGIcon {
+        Node createIcon(ObjectBinding<? extends Paint> fill, double width, double height);
+    }
+
     private static Node createSVGPath(String d, ObjectBinding<? extends Paint> fill, double width, double height) {
         SVGPath path = new SVGPath();
         path.getStyleClass().add("svg");
         path.setContent(d);
-        path.fillProperty().bind(fill);
+        if (fill != null) path.fillProperty().bind(fill);
 
         if (width < 0 || height < 0) {
             StackPane pane = new StackPane(path);
@@ -63,10 +67,18 @@ public final class SVG {
         return createSVGPath("M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z", fill, width, height);
     }
 
+    public static Node copy(ObjectBinding<? extends Paint> fill, double width, double height) {
+        return createSVGPath("M19,21H8V7H19M19,5H8A2,2 0 0,0 6,7V21A2,2 0 0,0 8,23H19A2,2 0 0,0 21,21V7A2,2 0 0,0 19,5M16,1H4A2,2 0 0,0 2,3V17H4V3H16V1Z", fill, width, height);
+    }
+
     public static Node dotsVertical(ObjectBinding<? extends Paint> fill, double width, double height) {
         return createSVGPath("M12,16A2,2 0 0,1 14,18A2,2 0 0,1 12,20A2,2 0 0,1 10,18A2,2 0 0,1 12,16M12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12A2,2 0 0,1 12,10M12,4A2,2 0 0,1 14,6A2,2 0 0,1 12,8A2,2 0 0,1 10,6A2,2 0 0,1 12,4Z", fill, width, height);
     }
 
+    public static Node dotsHorizontal(ObjectBinding<? extends Paint> fill, double width, double height) {
+        return createSVGPath("M16,12A2,2 0 0,1 18,10A2,2 0 0,1 20,12A2,2 0 0,1 18,14A2,2 0 0,1 16,12M10,12A2,2 0 0,1 12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12M4,12A2,2 0 0,1 6,10A2,2 0 0,1 8,12A2,2 0 0,1 6,14A2,2 0 0,1 4,12Z", fill, width, height);
+    }
+
     public static Node delete(ObjectBinding<? extends Paint> fill, double width, double height) {
         return createSVGPath("M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z", fill, width, height);
     }
@@ -146,4 +158,32 @@ public final class SVG {
     public static Node export(ObjectBinding<? extends Paint> fill, double width, double height) {
         return createSVGPath("M23,12L19,8V11H10V13H19V16M1,18V6C1,4.89 1.9,4 3,4H15A2,2 0 0,1 17,6V9H15V6H3V18H15V15H17V18A2,2 0 0,1 15,20H3A2,2 0 0,1 1,18Z", fill, width, height);
     }
+
+    public static Node openInNew(ObjectBinding<? extends Paint> fill, double width, double height) {
+        return createSVGPath("M14,3V5H17.59L7.76,14.83L9.17,16.24L19,6.41V10H21V3M19,19H5V5H12V3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V12H19V19Z", fill, width, height);
+    }
+
+    public static Node triangle(ObjectBinding<? extends Paint> fill, double width, double height) {
+        return createSVGPath("M1,21H23L12,2", fill, width, height);
+    }
+
+    public static Node home(ObjectBinding<? extends Paint> fill, double width, double height) {
+        return createSVGPath("M10,20V14H14V20H19V12H22L12,3L2,12H5V20H10Z", fill, width, height);
+    }
+
+    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);
+    }
+
+    public static Node arrowRight(ObjectBinding<? extends Paint> fill, double width, double height) {
+        return createSVGPath("M4,11V13H16L10.5,18.5L11.92,19.92L19.84,12L11.92,4.08L10.5,5.5L16,11H4Z", fill, width, height);
+    }
+
+    public static Node wrench(ObjectBinding<? extends Paint> fill, double width, double height) {
+        return createSVGPath("M22.7,19L13.6,9.9C14.5,7.6 14,4.9 12.1,3C10.1,1 7.1,0.6 4.7,1.7L9,6L6,9L1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1C4.8,14 7.5,14.5 9.8,13.6L18.9,22.7C19.3,23.1 19.9,23.1 20.3,22.7L22.6,20.4C23.1,20 23.1,19.3 22.7,19Z", 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/ToolbarListPageSkin.java

@@ -0,0 +1,97 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui;
+
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXScrollPane;
+import com.jfoenix.effects.JFXDepthManager;
+import javafx.beans.binding.Bindings;
+import javafx.geometry.Insets;
+import javafx.scene.Node;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.SkinBase;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.ui.construct.SpinnerPane;
+
+import java.util.List;
+
+public abstract class ToolbarListPageSkin<T extends ListPageBase<? extends Node>> extends SkinBase<T> {
+
+    public ToolbarListPageSkin(T skinnable) {
+        super(skinnable);
+
+        SpinnerPane spinnerPane = new SpinnerPane();
+        spinnerPane.getStyleClass().add("large-spinner-pane");
+
+        BorderPane root = new BorderPane();
+
+        List<Node> toolbarButtons = initializeToolbar(skinnable);
+        if (!toolbarButtons.isEmpty()) {
+            HBox toolbar = new HBox();
+            toolbar.getStyleClass().add("jfx-tool-bar-second");
+            JFXDepthManager.setDepth(toolbar, 1);
+            toolbar.setPickOnBounds(false);
+            toolbar.getChildren().setAll(toolbarButtons);
+            root.setTop(toolbar);
+        }
+
+        {
+            ScrollPane scrollPane = new ScrollPane();
+            scrollPane.setFitToWidth(true);
+
+            VBox content = new VBox();
+            content.setSpacing(10);
+            content.setPadding(new Insets(10));
+
+            Bindings.bindContent(content.getChildren(), skinnable.itemsProperty());
+
+            scrollPane.setContent(content);
+            JFXScrollPane.smoothScrolling(scrollPane);
+
+            root.setCenter(scrollPane);
+        }
+
+        spinnerPane.loadingProperty().bind(skinnable.loadingProperty());
+        spinnerPane.setContent(root);
+
+        getChildren().setAll(spinnerPane);
+    }
+
+    public static Node wrap(Node node) {
+        StackPane stackPane = new StackPane();
+        stackPane.setPadding(new Insets(0, 5, 0, 2));
+        stackPane.getChildren().setAll(node);
+        return stackPane;
+    }
+
+    public static JFXButton createToolbarButton(String text, SVG.SVGIcon creator, Runnable onClick) {
+        JFXButton ret = new JFXButton();
+        ret.getStyleClass().add("jfx-tool-bar-button");
+        ret.textFillProperty().bind(Theme.foregroundFillBinding());
+        ret.setGraphic(wrap(creator.createIcon(Theme.foregroundFillBinding(), -1, -1)));
+        ret.setText(text);
+        ret.setOnMouseClicked(e -> onClick.run());
+        return ret;
+    }
+
+    protected abstract List<Node> initializeToolbar(T skinnable);
+}

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

@@ -0,0 +1,65 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui;
+
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXDialogLayout;
+import javafx.scene.control.Label;
+import javafx.scene.web.WebEngine;
+import javafx.scene.web.WebView;
+import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
+
+import static org.jackhuang.hmcl.Metadata.CHANGELOG_URL;
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+public class UpgradeDialog extends JFXDialogLayout {
+    private final WebView webView = new WebView();
+
+    public UpgradeDialog(Runnable updateRunnable) {
+        {
+            setHeading(new Label(i18n("update.changelog")));
+        }
+
+        {
+            WebView webView = new WebView();
+            WebEngine engine = webView.getEngine();
+            engine.load(CHANGELOG_URL + config().getUpdateChannel().channelName);
+            engine.getLoadWorker().stateProperty().addListener((observable, oldValue, newValue) -> {
+                String url = engine.getLoadWorker().getMessage().trim();
+                if (!url.startsWith(CHANGELOG_URL)) {
+                    engine.getLoadWorker().cancel();
+                    FXUtils.openLink(url);
+                }
+            });
+            setBody(webView);
+        }
+
+        {
+            JFXButton updateButton = new JFXButton(i18n("update.accept"));
+            updateButton.getStyleClass().add("dialog-accept");
+            updateButton.setOnMouseClicked(e -> updateRunnable.run());
+
+            JFXButton cancelButton = new JFXButton(i18n("button.cancel"));
+            cancelButton.getStyleClass().add("dialog-cancel");
+            cancelButton.setOnMouseClicked(e -> fireEvent(new DialogCloseEvent()));
+
+            setActions(updateButton, cancelButton);
+        }
+    }
+}

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

@@ -1,231 +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 com.jfoenix.concurrency.JFXUtilities;
-import com.jfoenix.controls.JFXButton;
-import javafx.beans.binding.Bindings;
-import javafx.event.EventHandler;
-import javafx.fxml.FXML;
-import javafx.geometry.Insets;
-import javafx.geometry.Pos;
-import javafx.scene.control.Label;
-import javafx.scene.effect.BlurType;
-import javafx.scene.effect.DropShadow;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import javafx.scene.input.MouseButton;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.*;
-import javafx.scene.paint.Color;
-import javafx.scene.text.TextAlignment;
-import org.jackhuang.hmcl.setting.Theme;
-
-import java.util.Optional;
-
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
-public final class VersionItem extends StackPane {
-    @FXML
-    private Pane icon;
-    @FXML
-    private VBox content;
-    @FXML
-    private StackPane header;
-    @FXML
-    private StackPane body;
-    @FXML
-    private JFXButton btnSettings;
-    @FXML
-    private JFXButton btnUpdate;
-    @FXML
-    private JFXButton btnLaunch;
-    @FXML
-    private JFXButton btnScript;
-    @FXML
-    private Label lblVersionName;
-    @FXML
-    private Label lblGameVersion;
-    @FXML
-    private Label lblLibraries;
-    @FXML
-    private ImageView iconView;
-
-    private EventHandler<? super MouseEvent> launchClickedHandler = null;
-
-    private void initializeComponents() {
-        setPickOnBounds(false);
-        FXUtils.setLimitWidth(this, 160);
-        FXUtils.setLimitHeight(this, 149);
-
-        content = new VBox();
-        {
-            header = new StackPane();
-            VBox.setVgrow(header, Priority.ALWAYS);
-            header.setPickOnBounds(false);
-            header.setPadding(new Insets(8));
-            header.setStyle("-fx-background-radius: 2 2 0 0; -fx-background-color: rgb(255,255,255,0.87);");
-            {
-                VBox headerContent = new VBox();
-                headerContent.setPadding(new Insets(8, 8, 0, 8));
-                {
-                    lblVersionName = new Label();
-                    lblVersionName.setStyle("-fx-font-size: 15;");
-                    lblVersionName.setTextAlignment(TextAlignment.JUSTIFY);
-                    lblVersionName.setWrapText(true);
-                    headerContent.getChildren().add(lblVersionName);
-
-                    lblGameVersion = new Label();
-                    lblGameVersion.setStyle("-fx-font-size: 11;");
-                    lblGameVersion.setTextAlignment(TextAlignment.JUSTIFY);
-                    lblGameVersion.setWrapText(true);
-                    headerContent.getChildren().add(lblGameVersion);
-
-                    lblLibraries = new Label();
-                    lblLibraries.setStyle("-fx-font-size: 10; -fx-text-fill: gray;");
-                    lblLibraries.setTextAlignment(TextAlignment.JUSTIFY);
-                    lblLibraries.setWrapText(true);
-                    headerContent.getChildren().add(lblLibraries);
-                }
-                header.getChildren().add(headerContent);
-            }
-            content.getChildren().add(header);
-
-            body = new StackPane();
-            body.setStyle("-fx-background-radius: 0 0 2 2; -fx-background-color: rgb(255,255,255,0.87); -fx-padding: 8;");
-            body.setMinHeight(40);
-            body.setPickOnBounds(false);
-            {
-                BorderPane bodyContent = new BorderPane();
-                {
-                    HBox hbox = new HBox();
-                    hbox.setSpacing(8);
-                    {
-                        btnSettings = new JFXButton();
-                        btnSettings.getStyleClass().add("toggle-icon4");
-                        FXUtils.setLimitWidth(btnSettings, 30);
-                        FXUtils.setLimitHeight(btnSettings, 30);
-                        hbox.getChildren().add(btnSettings);
-
-                        btnUpdate = new JFXButton();
-                        btnUpdate.getStyleClass().add("toggle-icon4");
-                        FXUtils.setLimitWidth(btnUpdate, 30);
-                        FXUtils.setLimitHeight(btnUpdate, 30);
-                        hbox.getChildren().add(btnUpdate);
-                    }
-                    bodyContent.setLeft(hbox);
-                }
-                {
-                    HBox hbox = new HBox();
-                    hbox.setSpacing(8);
-                    {
-                        btnScript = new JFXButton();
-                        btnScript.getStyleClass().add("toggle-icon4");
-                        FXUtils.setLimitWidth(btnScript, 30);
-                        FXUtils.setLimitHeight(btnScript, 30);
-                        hbox.getChildren().add(btnScript);
-
-                        btnLaunch = new JFXButton();
-                        btnLaunch.getStyleClass().add("toggle-icon4");
-                        FXUtils.setLimitWidth(btnLaunch, 30);
-                        FXUtils.setLimitHeight(btnLaunch, 30);
-                        hbox.getChildren().add(btnLaunch);
-                    }
-                    bodyContent.setRight(hbox);
-                }
-                body.getChildren().setAll(bodyContent);
-            }
-            content.getChildren().add(body);
-        }
-        getChildren().add(content);
-
-        icon = new StackPane();
-        StackPane.setAlignment(icon, Pos.TOP_RIGHT);
-        icon.setPickOnBounds(false);
-        {
-            iconView = new ImageView();
-            StackPane.setAlignment(iconView, Pos.CENTER_RIGHT);
-            StackPane.setMargin(iconView, new Insets(0, 12, 0, 0));
-            iconView.setImage(new Image("/assets/img/icon.png"));
-            icon.getChildren().add(iconView);
-        }
-        getChildren().add(icon);
-    }
-
-    public VersionItem() {
-        initializeComponents();
-        setEffect(new DropShadow(BlurType.GAUSSIAN, Color.rgb(0, 0, 0, 0.26), 5.0, 0.12, -1.0, 1.0));
-        btnSettings.setGraphic(SVG.gear(Theme.blackFillBinding(), 15, 15));
-        btnUpdate.setGraphic(SVG.update(Theme.blackFillBinding(), 15, 15));
-        btnLaunch.setGraphic(SVG.launch(Theme.blackFillBinding(), 15, 15));
-        btnScript.setGraphic(SVG.script(Theme.blackFillBinding(), 15, 15));
-
-        JFXUtilities.runInFX(() -> {
-            FXUtils.installTooltip(btnSettings, i18n("version.settings"));
-            FXUtils.installTooltip(btnUpdate, i18n("version.update"));
-            FXUtils.installTooltip(btnLaunch, i18n("version.launch"));
-            FXUtils.installTooltip(btnScript, i18n("version.launch_script"));
-        });
-
-        icon.translateYProperty().bind(Bindings.createDoubleBinding(() -> header.getBoundsInParent().getHeight() - icon.getHeight() / 2 - 16, header.boundsInParentProperty(), icon.heightProperty()));
-        FXUtils.limitSize(iconView, 32, 32);
-
-        setOnMouseClicked(e -> {
-            if (e.getButton() == MouseButton.PRIMARY)
-                if (e.getClickCount() == 2)
-                    Optional.ofNullable(launchClickedHandler).ifPresent(h -> h.handle(e));
-        });
-    }
-
-    public void setUpdate(boolean update) {
-        btnUpdate.setVisible(update);
-    }
-
-    public void setVersionName(String versionName) {
-        lblVersionName.setText(versionName);
-    }
-
-    public void setGameVersion(String gameVersion) {
-        lblGameVersion.setText(gameVersion);
-    }
-
-    public void setLibraries(String libraries) {
-        lblLibraries.setText(libraries);
-    }
-
-    public void setImage(Image image) {
-        iconView.setImage(image);
-    }
-
-    public void setOnSettingsButtonClicked(EventHandler<? super MouseEvent> handler) {
-        btnSettings.setOnMouseClicked(handler);
-    }
-
-    public void setOnScriptButtonClicked(EventHandler<? super MouseEvent> handler) {
-        btnScript.setOnMouseClicked(handler);
-    }
-
-    public void setOnLaunchButtonClicked(EventHandler<? super MouseEvent> handler) {
-        launchClickedHandler = handler;
-        btnLaunch.setOnMouseClicked(handler);
-    }
-
-    public void setOnUpdateButtonClicked(EventHandler<? super MouseEvent> handler) {
-        btnUpdate.setOnMouseClicked(handler);
-    }
-}

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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;
 
@@ -27,10 +27,10 @@ import javafx.collections.WeakListChangeListener;
 import java.util.LinkedList;
 import java.util.List;
 
-public class WeakListenerHelper {
-    List<Object> refs = new LinkedList<>();
+public class WeakListenerHolder {
+    private List<Object> refs = new LinkedList<>();
 
-    public WeakListenerHelper() {
+    public WeakListenerHolder() {
     }
 
     public WeakInvalidationListener weak(InvalidationListener listener) {

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,16 +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.ui;
 
 import javafx.scene.Scene;
-import javafx.scene.image.Image;
 import javafx.scene.web.WebView;
 import javafx.stage.Stage;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.ui.FXUtils.newImage;
 
 public class WebStage extends Stage {
     private final WebView webView = new WebView();
@@ -30,7 +30,7 @@ public class WebStage extends Stage {
     public WebStage() {
         setScene(new Scene(webView, 800, 480));
         getScene().getStylesheets().addAll(config().getTheme().getStylesheets());
-        getIcons().add(new Image("/assets/img/icon.png"));
+        getIcons().add(newImage("/assets/img/icon.png"));
     }
 
     public WebView getWebView() {

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,51 +13,69 @@
  * 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 javafx.collections.ObservableList;
+import javafx.scene.control.Tooltip;
 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.task.Schedulers;
+import org.jackhuang.hmcl.game.TexturesLoader;
+import org.jackhuang.hmcl.setting.Accounts;
+import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.construct.AdvancedListItem;
 
+import static org.jackhuang.hmcl.ui.FXUtils.newImage;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public class AccountAdvancedListItem extends AdvancedListItem {
+    private final Tooltip tooltip;
+
     private ObjectProperty<Account> account = new SimpleObjectProperty<Account>() {
 
         @Override
         protected void invalidated() {
             Account account = get();
             if (account == null) {
-                titleProperty().set(i18n("account.missing"));
-                subtitleProperty().set(i18n("account.missing.add"));
-                imageProperty().set(new Image("/assets/img/craft_table.png"));
-                viewportProperty().set(null);
+                titleProperty().unbind();
+                setTitle(i18n("account.missing"));
+                setSubtitle(i18n("account.missing.add"));
+                imageProperty().unbind();
+                setImage(newImage("/assets/img/craft_table.png"));
+                tooltip.setText("");
             } else {
-                titleProperty().set(account.getCharacter());
-                subtitleProperty().set(accountSubtitle(account));
-
-                imageProperty().set(AccountHelper.getDefaultSkin(account.getUUID(), 4));
-                viewportProperty().set(AccountHelper.getViewport(4));
-
-                if (account instanceof YggdrasilAccount) {
-                    AccountHelper.loadSkinAsync((YggdrasilAccount) account).subscribe(Schedulers.javafx(), () -> {
-                        Image image = AccountHelper.getSkin((YggdrasilAccount) account, 4);
-                        imageProperty().set(image);
-                    });
-                }
+                titleProperty().bind(Bindings.createStringBinding(account::getCharacter, account));
+                setSubtitle(accountSubtitle(account));
+                imageProperty().bind(TexturesLoader.fxAvatarBinding(account, 32));
+                tooltip.setText(account.getCharacter() + " " + accountSubtitle(account));
             }
         }
     };
 
     public AccountAdvancedListItem() {
+        setRightGraphic(SVG.viewList(Theme.blackFillBinding(), -1, -1));
+        tooltip = new Tooltip();
+        FXUtils.installFastTooltip(this, tooltip);
+
+        setOnScroll(event -> {
+            Account current = account.get();
+            if (current == null) return;
+            ObservableList<Account> accounts = Accounts.getAccounts();
+            int currentIndex = accounts.indexOf(account.get());
+            if (event.getDeltaY() > 0) { // up
+                currentIndex--;
+            } else { // down
+                currentIndex++;
+            }
+            Accounts.setSelectedAccount(accounts.get((currentIndex + accounts.size()) % accounts.size()));
+        });
     }
 
     public ObjectProperty<Account> accountProperty() {

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,54 +13,29 @@
  * 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.property.*;
 import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.scene.control.ToggleGroup;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.ListPage;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
-import org.jackhuang.hmcl.util.MappedObservableList;
+import org.jackhuang.hmcl.util.javafx.MappedObservableList;
 
-import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import static org.jackhuang.hmcl.util.javafx.ExtendedProperties.createSelectedItemPropertyFor;
 
 public class AccountList extends ListPage<AccountListItem> implements DecoratorPage {
-    private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper(i18n("account.manage"));
-    private ObjectProperty<Account> selectedAccount = new SimpleObjectProperty<Account>() {
-        {
-            itemsProperty().addListener(onInvalidating(this::invalidated));
-        }
-
-        @Override
-        protected void invalidated() {
-            Account selected = get();
-            itemsProperty().forEach(item -> item.selectedProperty().set(item.getAccount() == selected));
-        }
-    };
-    private final ListProperty<Account> accounts = new SimpleListProperty<>(FXCollections.observableArrayList());
-
-    private ToggleGroup toggleGroup;
-    private final ObservableList<AccountListItem> accountItems;
+    private final ReadOnlyObjectWrapper<State> state = new ReadOnlyObjectWrapper<>(State.fromTitle(i18n("account.manage")));
+    private final ListProperty<Account> accounts = new SimpleListProperty<>(this, "accounts", FXCollections.observableArrayList());
+    private final ObjectProperty<Account> selectedAccount;
 
     public AccountList() {
-        toggleGroup = new ToggleGroup();
-
-        accountItems = MappedObservableList.create(
-                accountsProperty(),
-                account -> new AccountListItem(toggleGroup, account));
-
-        itemsProperty().bindContent(accountItems);
-
-        toggleGroup.selectedToggleProperty().addListener((o, a, toggle) -> {
-            if (toggle == null || toggle.getUserData() == null) return;
-            selectedAccount.set(((AccountListItem) toggle.getUserData()).getAccount());
-        });
+        setItems(MappedObservableList.create(accounts, AccountListItem::new));
+        selectedAccount = createSelectedItemPropertyFor(getItems(), Account.class);
     }
 
     public ObjectProperty<Account> selectedAccountProperty() {
@@ -77,7 +52,7 @@ public class AccountList extends ListPage<AccountListItem> implements DecoratorP
     }
 
     @Override
-    public ReadOnlyStringProperty titleProperty() {
-        return title.getReadOnlyProperty();
+    public ReadOnlyObjectProperty<State> stateProperty() {
+        return state.getReadOnlyProperty();
     }
 }

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,60 +13,63 @@
  * 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.geometry.Rectangle2D;
-import javafx.scene.control.Control;
+import javafx.scene.control.RadioButton;
 import javafx.scene.control.Skin;
-import javafx.scene.control.ToggleGroup;
 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;
 
-public class AccountListItem extends Control {
+import java.util.concurrent.CancellationException;
+import java.util.logging.Level;
+
+public class AccountListItem extends RadioButton {
+
     private final Account account;
-    private final ToggleGroup toggleGroup;
     private final StringProperty title = new SimpleStringProperty();
     private final StringProperty subtitle = new SimpleStringProperty();
-    private final BooleanProperty selected = new SimpleBooleanProperty();
     private final ObjectProperty<Image> image = new SimpleObjectProperty<>();
-    private final ObjectProperty<Rectangle2D> viewport = new SimpleObjectProperty<>();
 
-    public AccountListItem(ToggleGroup toggleGroup, Account account) {
+    public AccountListItem(Account account) {
         this.account = account;
-        this.toggleGroup = toggleGroup;
+        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());
-        }
-
-        if (account instanceof OfflineAccount)
-            title.set(account.getCharacter());
-        else
-            title.set(account.getUsername() + " - " + account.getCharacter());
-        subtitle.set(subtitleString.toString());
-        selected.set(Accounts.selectedAccountProperty().get() == account);
-
-        viewport.set(AccountHelper.getViewport(4));
-        if (account instanceof YggdrasilAccount) {
-            Image image = AccountHelper.getSkin((YggdrasilAccount) account, 4);
-            this.image.set(image);
+            subtitle.bind(Bindings.concat(
+                    loginTypeName, ", ", i18n("account.injector.server"), ": ",
+                    Bindings.createStringBinding(server::getName, server)));
         } else {
-            this.image.set(AccountHelper.getDefaultSkin(account.getUUID(), 4));
+            subtitle.set(loginTypeName);
         }
+
+        StringBinding characterName = Bindings.createStringBinding(account::getCharacter, account);
+        if (account instanceof OfflineAccount) {
+            title.bind(characterName);
+        } else {
+            title.bind(Bindings.concat(account.getUsername(), " - ", characterName));
+        }
+
+        image.bind(TexturesLoader.fxAvatarBinding(account, 32));
     }
 
     @Override
@@ -74,50 +77,66 @@ public class AccountListItem extends Control {
         return new AccountListItemSkin(this);
     }
 
-    public ToggleGroup getToggleGroup() {
-        return toggleGroup;
+    public void refresh() {
+        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() {
+        Accounts.getAccounts().remove(account);
     }
 
     public Account getAccount() {
         return account;
     }
 
+    public String getTitle() {
+        return title.get();
+    }
+
+    public void setTitle(String title) {
+        this.title.set(title);
+    }
+
     public StringProperty titleProperty() {
         return title;
     }
 
+    public String getSubtitle() {
+        return subtitle.get();
+    }
+
+    public void setSubtitle(String subtitle) {
+        this.subtitle.set(subtitle);
+    }
+
     public StringProperty subtitleProperty() {
         return subtitle;
     }
 
-    public BooleanProperty selectedProperty() {
-        return selected;
+    public Image getImage() {
+        return image.get();
+    }
+
+    public void setImage(Image image) {
+        this.image.set(image);
     }
 
     public ObjectProperty<Image> imageProperty() {
         return image;
     }
-
-    public ObjectProperty<Rectangle2D> viewportProperty() {
-        return viewport;
-    }
-
-    public void refresh() {
-        if (account instanceof YggdrasilAccount) {
-            // progressBar.setVisible(true);
-            AccountHelper.refreshSkinAsync((YggdrasilAccount) account)
-                    .finalized(Schedulers.javafx(), (variables, isDependentsSucceeded) -> {
-                        // progressBar.setVisible(false);
-
-                        if (isDependentsSucceeded) {
-                            Image image = AccountHelper.getSkin((YggdrasilAccount) account, 4);
-                            this.image.set(image);
-                        }
-                    }).start();
-        }
-    }
-
-    public void remove() {
-        Accounts.getAccounts().remove(account);
-    }
 }

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,25 +13,30 @@
  * 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.controls.JFXButton;
 import com.jfoenix.controls.JFXRadioButton;
 import com.jfoenix.effects.JFXDepthManager;
+import javafx.geometry.Insets;
 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.StackPane;
+import javafx.scene.layout.VBox;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
-import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
+import org.jackhuang.hmcl.util.javafx.BindingMapping;
 
+import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public class AccountListItemSkin extends SkinBase<AccountListItem> {
@@ -41,29 +46,40 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {
 
         BorderPane root = new BorderPane();
 
-        JFXRadioButton chkSelected = new JFXRadioButton();
+        JFXRadioButton chkSelected = new JFXRadioButton() {
+            @Override
+            public void fire() {
+                skinnable.fire();
+            }
+        };
         BorderPane.setAlignment(chkSelected, Pos.CENTER);
-        chkSelected.setUserData(skinnable);
-        chkSelected.selectedProperty().bindBidirectional(skinnable.selectedProperty());
-        chkSelected.setToggleGroup(skinnable.getToggleGroup());
+        chkSelected.selectedProperty().bind(skinnable.selectedProperty());
         root.setLeft(chkSelected);
 
         HBox center = new HBox();
         center.setSpacing(8);
         center.setAlignment(Pos.CENTER_LEFT);
 
-        StackPane imageViewContainer = new StackPane();
-        FXUtils.setLimitWidth(imageViewContainer, 32);
-        FXUtils.setLimitHeight(imageViewContainer, 32);
-
         ImageView imageView = new ImageView();
         FXUtils.limitSize(imageView, 32, 32);
         imageView.imageProperty().bind(skinnable.imageProperty());
-        imageView.viewportProperty().bind(skinnable.viewportProperty());
-        imageViewContainer.getChildren().setAll(imageView);
 
-        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);
 
@@ -73,7 +89,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")));
+        runInFX(() -> FXUtils.installFastTooltip(btnRefresh, i18n("button.refresh")));
         right.getChildren().add(btnRefresh);
 
         JFXButton btnRemove = new JFXButton();
@@ -81,14 +97,13 @@ 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")));
+        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.getStyleClass().add("card");
+        root.setStyle("-fx-padding: 8 8 8 0;");
         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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,42 +13,50 @@
  * 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.controls.*;
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXComboBox;
+import com.jfoenix.controls.JFXPasswordField;
+import com.jfoenix.controls.JFXTextField;
+import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
+import javafx.beans.property.ListProperty;
 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;
 import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.auth.*;
+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.Constants;
-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,10 +71,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");
@@ -77,21 +88,31 @@ 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());
 
         cboServers.getItems().addListener(onInvalidating(this::checkIfNoServer));
         checkIfNoServer();
 
         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());
 
         cboServers.visibleProperty().bind(loginType.isEqualTo(Accounts.FACTORY_AUTHLIB_INJECTOR));
         lblInjectorServer.visibleProperty().bind(cboServers.visibleProperty());
-        linkManageInjectorServers.visibleProperty().bind(cboServers.visibleProperty());
 
         txtUsername.getValidators().add(new Validator(i18n("input.email"), str -> !txtPassword.isVisible() || str.contains("@")));
 
@@ -105,6 +126,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);
     }
 
     /**
@@ -148,10 +197,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);
@@ -189,14 +236,20 @@ public class AddAccountPane extends StackPane {
         Controllers.navigate(Controllers.getServersPage());
     }
 
+    @FXML
+    private void onAddInjecterServer() {
+        Controllers.dialog(new AddAuthlibInjectorServerPane());
+    }
+
     private class Selector extends BorderPane implements CharacterSelector {
+
         private final AdvancedListBox listBox = new AdvancedListBox();
         private final JFXButton cancel = new JFXButton();
 
         private final CountDownLatch latch = new CountDownLatch(1);
         private GameProfile selectedProfile = null;
 
-        {
+        public Selector() {
             setStyle("-fx-padding: 8px;");
 
             cancel.setText(i18n("button.cancel"));
@@ -214,50 +267,35 @@ 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;
-                try {
-                    image = AccountHelper.getSkinImmediately(yggdrasilAccount, profile, 4);
-                } catch (Exception e) {
-                    Logging.LOG.log(Level.WARNING, "Failed to get skin for " + profile.getName(), e);
-                    image = null;
+                    IconedItem accountItem = new IconedItem(portraitView, profile.getName());
+                    accountItem.setOnMouseClicked(e -> {
+                        selectedProfile = profile;
+                        latch.countDown();
+                    });
+                    listBox.add(accountItem);
                 }
-                ImageView portraitView = new ImageView();
-                portraitView.setSmooth(false);
-                if (image == null) {
-                    portraitView.setImage(Constants.DEFAULT_ICON.get());
-                } else {
-                    portraitView.setImage(image);
-                    portraitView.setViewport(AccountHelper.getViewport(4));
-                }
-                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()));
+                runInFX(() -> Selector.this.fireEvent(new DialogCloseEvent()));
             }
         }
     }
@@ -281,6 +319,12 @@ public class AddAccountPane extends StackPane {
                     return i18n("account.failed.invalid_password");
             }
             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 {
             return exception.getClass().getName() + ": " + exception.getLocalizedMessage();
         }

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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.ui.account;
 
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXDialogLayout;
 import com.jfoenix.controls.JFXTextField;
-import javafx.beans.binding.Bindings;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.layout.StackPane;
@@ -28,20 +27,23 @@ import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
-import org.jackhuang.hmcl.ui.animation.TransitionHandler;
+import org.jackhuang.hmcl.ui.animation.TransitionPane;
+import org.jackhuang.hmcl.ui.construct.DialogAware;
 import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 import org.jackhuang.hmcl.ui.construct.SpinnerPane;
-import org.jackhuang.hmcl.util.NetworkUtils;
+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 {
+public class AddAuthlibInjectorServerPane extends StackPane implements DialogAware {
 
-    @FXML private StackPane addServerContainer;
+    @FXML private TransitionPane root;
     @FXML private Label lblServerUrl;
     @FXML private Label lblServerName;
     @FXML private Label lblCreationWarning;
@@ -52,8 +54,6 @@ public class AddAuthlibInjectorServerPane extends StackPane {
     @FXML private SpinnerPane nextPane;
     @FXML private JFXButton btnAddNext;
 
-    private TransitionHandler transitionHandler;
-
     private AuthlibInjectorServer serverBeingAdded;
 
     public AddAuthlibInjectorServerPane(String url) {
@@ -64,19 +64,15 @@ public class AddAuthlibInjectorServerPane extends StackPane {
 
     public AddAuthlibInjectorServerPane() {
         loadFXML(this, "/assets/fxml/authlib-injector-server-add.fxml");
-        transitionHandler = new TransitionHandler(addServerContainer);
-        transitionHandler.setContent(addServerPane, ContainerAnimations.NONE.getAnimationProducer());
+        root.setContent(addServerPane, ContainerAnimations.NONE.getAnimationProducer());
 
-        btnAddNext.disableProperty().bind(
-                Bindings.createBooleanBinding(txtServerUrl::validate, txtServerUrl.textProperty()).not());
+        btnAddNext.disableProperty().bind(txtServerUrl.textProperty().isEmpty());
         nextPane.hideSpinner();
     }
 
-    private String fixInputUrl(String url) {
-        if (!url.endsWith("/")) {
-            url += "/";
-        }
-        return url;
+    @Override
+    public void onDialogShown() {
+        txtServerUrl.requestFocus();
     }
 
     private String resolveFetchExceptionMessage(Throwable exception) {
@@ -99,26 +95,27 @@ public class AddAuthlibInjectorServerPane extends StackPane {
 
         lblCreationWarning.setText("");
 
-        String url = fixInputUrl(txtServerUrl.getText());
+        String url = txtServerUrl.getText();
 
         nextPane.showSpinner();
         addServerPane.setDisable(true);
 
-        Task.of(() -> {
-            serverBeingAdded = AuthlibInjectorServer.fetchServerInfo(url);
-        }).finalized(Schedulers.javafx(), (variables, isDependentsSucceeded) -> {
+        Task.runAsync(() -> {
+            serverBeingAdded = AuthlibInjectorServer.locateServer(url);
+        }).whenComplete(Schedulers.javafx(), exception -> {
             addServerPane.setDisable(false);
             nextPane.hideSpinner();
 
-            if (isDependentsSucceeded) {
+            if (exception == null) {
                 lblServerName.setText(serverBeingAdded.getName());
                 lblServerUrl.setText(serverBeingAdded.getUrl());
 
                 lblServerWarning.setVisible("http".equals(NetworkUtils.toURL(serverBeingAdded.getUrl()).getProtocol()));
 
-                transitionHandler.setContent(confirmServerPane, ContainerAnimations.SWIPE_LEFT.getAnimationProducer());
+                root.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();
 
@@ -126,7 +123,7 @@ public class AddAuthlibInjectorServerPane extends StackPane {
 
     @FXML
     private void onAddPrev() {
-        transitionHandler.setContent(addServerPane, ContainerAnimations.SWIPE_RIGHT.getAnimationProducer());
+        root.setContent(addServerPane, ContainerAnimations.SWIPE_RIGHT.getAnimationProducer());
     }
 
     @FXML

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,43 +13,30 @@
  * 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.ReadOnlyStringProperty;
-import javafx.beans.property.ReadOnlyStringWrapper;
+import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.collections.ObservableList;
-import javafx.fxml.FXML;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.ListPage;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
-import org.jackhuang.hmcl.util.MappedObservableList;
+import org.jackhuang.hmcl.util.javafx.MappedObservableList;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
-import static org.jackhuang.hmcl.ui.FXUtils.loadFXML;
-import static org.jackhuang.hmcl.ui.FXUtils.smoothScrolling;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
-public class AuthlibInjectorServersPage extends StackPane implements DecoratorPage {
-    private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper(this, "title", i18n("account.injector.manage.title"));
+public class AuthlibInjectorServersPage extends ListPage<AuthlibInjectorServerItem> implements DecoratorPage {
+    private final ReadOnlyObjectWrapper<State> state = new ReadOnlyObjectWrapper<>(State.fromTitle(i18n("account.injector.manage.title")));
 
-    @FXML private ScrollPane scrollPane;
-    @FXML private VBox listPane;
-    @FXML private StackPane contentPane;
-
-    private ObservableList<AuthlibInjectorServerItem> serverItems;
+    private final ObservableList<AuthlibInjectorServerItem> serverItems;
 
     public AuthlibInjectorServersPage() {
-        loadFXML(this, "/assets/fxml/authlib-injector-servers.fxml");
-        smoothScrolling(scrollPane);
-
         serverItems = MappedObservableList.create(config().getAuthlibInjectorServers(), this::createServerItem);
-        Bindings.bindContent(listPane.getChildren(), serverItems);
+        Bindings.bindContent(itemsProperty(), serverItems);
     }
 
     private AuthlibInjectorServerItem createServerItem(AuthlibInjectorServer server) {
@@ -57,21 +44,13 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
                 item -> config().getAuthlibInjectorServers().remove(item.getServer()));
     }
 
-    @FXML
-    private void onAdd() {
+    @Override
+    public void add() {
         Controllers.dialog(new AddAuthlibInjectorServerPane());
     }
 
-    public String getTitle() {
-        return title.get();
-    }
-
     @Override
-    public ReadOnlyStringProperty titleProperty() {
-        return title.getReadOnlyProperty();
-    }
-
-    public void setTitle(String title) {
-        this.title.set(title);
+    public ReadOnlyObjectWrapper<State> stateProperty() {
+        return state;
     }
 }

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -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.animation;
 
 import javafx.animation.KeyFrame;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
@@ -25,4 +26,6 @@ public interface AnimationProducer {
     void init(AnimationHandler handler);
 
     List<KeyFrame> animate(AnimationHandler handler);
+
+    @Nullable AnimationProducer opposite();
 }

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -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;
 
@@ -21,6 +21,8 @@ import javafx.animation.Interpolator;
 import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
 import javafx.util.Duration;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -41,6 +43,7 @@ public enum ContainerAnimations {
         c.getCurrentNode().setScaleY(1);
         c.getCurrentNode().setOpacity(1);
     }, c -> Collections.emptyList()),
+
     /**
      * A fade between the old and new view
      */
@@ -62,6 +65,36 @@ public enum ContainerAnimations {
                     new KeyFrame(c.getDuration(),
                             new KeyValue(c.getPreviousNode().opacityProperty(), 0, Interpolator.EASE_BOTH),
                             new KeyValue(c.getCurrentNode().opacityProperty(), 1, Interpolator.EASE_BOTH)))),
+
+    /**
+     * A fade between the old and new view
+     */
+    FADE_IN(c -> {
+        c.getCurrentNode().setTranslateX(0);
+        c.getCurrentNode().setTranslateY(0);
+        c.getCurrentNode().setScaleX(1);
+        c.getCurrentNode().setScaleY(1);
+        c.getCurrentNode().setOpacity(0);
+    }, c ->
+            Arrays.asList(new KeyFrame(Duration.ZERO,
+                            new KeyValue(c.getCurrentNode().opacityProperty(), 0, FXUtils.SINE)),
+                    new KeyFrame(c.getDuration(),
+                            new KeyValue(c.getCurrentNode().opacityProperty(), 1, FXUtils.SINE)))),
+
+    /**
+     * A fade between the old and new view
+     */
+    FADE_OUT(c -> {
+        c.getCurrentNode().setTranslateX(0);
+        c.getCurrentNode().setTranslateY(0);
+        c.getCurrentNode().setScaleX(1);
+        c.getCurrentNode().setScaleY(1);
+        c.getCurrentNode().setOpacity(1);
+    }, c ->
+            Arrays.asList(new KeyFrame(Duration.ZERO,
+                            new KeyValue(c.getCurrentNode().opacityProperty(), 1, FXUtils.SINE)),
+                    new KeyFrame(c.getDuration(),
+                            new KeyValue(c.getCurrentNode().opacityProperty(), 0, FXUtils.SINE)))),
     /**
      * A zoom effect
      */
@@ -143,6 +176,7 @@ public enum ContainerAnimations {
                             new KeyValue(c.getPreviousNode().translateXProperty(), c.getCurrentRoot().getWidth(), Interpolator.EASE_BOTH))));
 
     private final AnimationProducer animationProducer;
+    private ContainerAnimations opposite;
 
     ContainerAnimations(Consumer<AnimationHandler> init, Function<AnimationHandler, List<KeyFrame>> animationProducer) {
         this.animationProducer = new AnimationProducer() {
@@ -155,10 +189,30 @@ public enum ContainerAnimations {
             public List<KeyFrame> animate(AnimationHandler handler) {
                 return animationProducer.apply(handler);
             }
+
+            @Override
+            public @Nullable AnimationProducer opposite() {
+                return opposite != null ? opposite.getAnimationProducer() : null;
+            }
         };
     }
 
     public AnimationProducer getAnimationProducer() {
         return animationProducer;
     }
+
+    public ContainerAnimations getOpposite() {
+        return opposite;
+    }
+
+    static {
+        NONE.opposite = NONE;
+        FADE.opposite = FADE;
+        SWIPE_LEFT.opposite = SWIPE_RIGHT;
+        SWIPE_RIGHT.opposite = SWIPE_LEFT;
+        FADE_IN.opposite = FADE_OUT;
+        FADE_OUT.opposite = FADE_IN;
+        ZOOM_IN.opposite = ZOOM_OUT;
+        ZOOM_OUT.opposite = ZOOM_IN;
+    }
 }

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -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;
 
@@ -21,29 +21,17 @@ import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
 import javafx.application.Platform;
 import javafx.scene.Node;
-import javafx.scene.Parent;
 import javafx.scene.layout.StackPane;
-import javafx.scene.shape.Rectangle;
 import javafx.util.Duration;
+import org.jackhuang.hmcl.ui.FXUtils;
 
-public final class TransitionHandler implements AnimationHandler {
-    private final StackPane view;
-    private Timeline animation;
+public class TransitionPane extends StackPane implements AnimationHandler {
     private Duration duration;
     private Node previousNode, currentNode;
 
-    /**
-     * @param view A stack pane that contains another control that is {@link Parent}
-     */
-    public TransitionHandler(StackPane view) {
-        this.view = view;
-        currentNode = view.getChildren().stream().findFirst().orElse(null);
-
-        // prevent content overflow
-        Rectangle clip = new Rectangle();
-        clip.widthProperty().bind(view.widthProperty());
-        clip.heightProperty().bind(view.heightProperty());
-        view.setClip(clip);
+    {
+        currentNode = getChildren().stream().findFirst().orElse(null);
+        FXUtils.setOverflowHidden(this);
     }
 
     @Override
@@ -58,7 +46,7 @@ public final class TransitionHandler implements AnimationHandler {
 
     @Override
     public StackPane getCurrentRoot() {
-        return view;
+        return this;
     }
 
     @Override
@@ -67,35 +55,30 @@ public final class TransitionHandler implements AnimationHandler {
     }
 
     public void setContent(Node newView, AnimationProducer transition) {
-        setContent(newView, transition, Duration.millis(320));
+        setContent(newView, transition, Duration.millis(160));
     }
 
     public void setContent(Node newView, AnimationProducer transition, Duration duration) {
         this.duration = duration;
 
-        Timeline prev = animation;
-        if (prev != null)
-            prev.stop();
-
         updateContent(newView);
 
         transition.init(this);
 
         // runLater or "init" will not work
         Platform.runLater(() -> {
-            Timeline nowAnimation = new Timeline();
-            nowAnimation.getKeyFrames().addAll(transition.animate(this));
-            nowAnimation.getKeyFrames().add(new KeyFrame(duration, e -> {
-                view.setMouseTransparent(false);
-                view.getChildren().remove(previousNode);
+            Timeline newAnimation = new Timeline();
+            newAnimation.getKeyFrames().addAll(transition.animate(this));
+            newAnimation.getKeyFrames().add(new KeyFrame(duration, e -> {
+                setMouseTransparent(false);
+                getChildren().remove(previousNode);
             }));
-            nowAnimation.play();
-            animation = nowAnimation;
+            FXUtils.playAnimation(this, "transition_pane", newAnimation);
         });
     }
 
     private void updateContent(Node newView) {
-        if (view.getWidth() > 0 && view.getHeight() > 0) {
+        if (getWidth() > 0 && getHeight() > 0) {
             previousNode = currentNode;
             if (previousNode == null)
                 previousNode = EMPTY_PANE;
@@ -105,11 +88,11 @@ public final class TransitionHandler implements AnimationHandler {
         if (previousNode == newView)
             previousNode = EMPTY_PANE;
 
-        view.setMouseTransparent(true);
+        setMouseTransparent(true);
 
         currentNode = newView;
 
-        view.getChildren().setAll(previousNode, currentNode);
+        getChildren().setAll(previousNode, currentNode);
     }
 
     private final StackPane EMPTY_PANE = new StackPane();

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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;
 
@@ -53,22 +53,37 @@ public class AdvancedListBox extends ScrollPane {
         return this;
     }
 
-    public AdvancedListBox remove(Node child) {
-        if (child instanceof Pane)
-            container.getChildren().remove(child);
+    public AdvancedListBox add(int index, Node child) {
+        if (child instanceof Pane || child instanceof AdvancedListItem)
+            container.getChildren().add(index, child);
         else {
-            StackPane pane = null;
-            for (Node node : container.getChildren())
+            StackPane pane = new StackPane();
+            pane.getStyleClass().add("advanced-list-box-item");
+            pane.getChildren().setAll(child);
+            container.getChildren().add(index, pane);
+        }
+        return this;
+    }
+
+    public AdvancedListBox remove(Node child) {
+        container.getChildren().remove(indexOf(child));
+        return this;
+    }
+
+    public int indexOf(Node child) {
+        if (child instanceof Pane) {
+            return container.getChildren().indexOf(child);
+        } else {
+            for (int i = 0; i < container.getChildren().size(); ++i) {
+                Node node = container.getChildren().get(i);
                 if (node instanceof StackPane) {
                     ObservableList<Node> list = ((StackPane) node).getChildren();
                     if (list.size() == 1 && list.get(0) == child)
-                        pane = (StackPane) node;
+                        return i;
                 }
-            if (pane == null)
-                throw new Error();
-            container.getChildren().remove(pane);
+            }
+            return -1;
         }
-        return this;
     }
 
     public AdvancedListBox startCategory(String category) {

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,43 +13,104 @@
  * 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.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
+import javafx.beans.property.*;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
-import javafx.geometry.Rectangle2D;
+import javafx.scene.Node;
 import javafx.scene.control.Control;
 import javafx.scene.control.Skin;
 import javafx.scene.image.Image;
+import javafx.scene.input.MouseEvent;
 
 public class AdvancedListItem extends Control {
-    private final ObjectProperty<Image> image = new SimpleObjectProperty<>();
-    private final ObjectProperty<Rectangle2D> viewport = new SimpleObjectProperty<>();
-    private final StringProperty title = new SimpleStringProperty();
-    private final StringProperty subtitle = new SimpleStringProperty();
+    private final ObjectProperty<Image> image = new SimpleObjectProperty<>(this, "image");
+    private final ObjectProperty<Node> rightGraphic = new SimpleObjectProperty<>(this, "rightGraphic");
+    private final StringProperty title = new SimpleStringProperty(this, "title");
+    private final BooleanProperty active = new SimpleBooleanProperty(this, "active");
+    private final StringProperty subtitle = new SimpleStringProperty(this, "subtitle");
+    private final BooleanProperty actionButtonVisible = new SimpleBooleanProperty(this, "actionButtonVisible", true);
+
+    public AdvancedListItem() {
+        getStyleClass().add("advanced-list-item");
+        addEventHandler(MouseEvent.MOUSE_CLICKED, e -> fireEvent(new ActionEvent()));
+    }
+
+    public Image getImage() {
+        return image.get();
+    }
 
     public ObjectProperty<Image> imageProperty() {
         return image;
     }
 
-    public ObjectProperty<Rectangle2D> viewportProperty() {
-        return viewport;
+    public void setImage(Image image) {
+        this.image.set(image);
+    }
+
+    public Node getRightGraphic() {
+        return rightGraphic.get();
+    }
+
+    public ObjectProperty<Node> rightGraphicProperty() {
+        return rightGraphic;
+    }
+
+    public void setRightGraphic(Node rightGraphic) {
+        this.rightGraphic.set(rightGraphic);
+    }
+
+    public String getTitle() {
+        return title.get();
     }
 
     public StringProperty titleProperty() {
         return title;
     }
 
+    public void setTitle(String title) {
+        this.title.set(title);
+    }
+
+    public boolean isActive() {
+        return active.get();
+    }
+
+    public BooleanProperty activeProperty() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active.set(active);
+    }
+
+    public String getSubtitle() {
+        return subtitle.get();
+    }
+
     public StringProperty subtitleProperty() {
         return subtitle;
     }
 
+    public void setSubtitle(String subtitle) {
+        this.subtitle.set(subtitle);
+    }
+
+    public boolean isActionButtonVisible() {
+        return actionButtonVisible.get();
+    }
+
+    public BooleanProperty actionButtonVisibleProperty() {
+        return actionButtonVisible;
+    }
+
+    public void setActionButtonVisible(boolean actionButtonVisible) {
+        this.actionButtonVisible.set(actionButtonVisible);
+    }
+
     public final ObjectProperty<EventHandler<ActionEvent>> onActionProperty() {
         return onAction;
     }

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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.construct;
 
-import com.jfoenix.controls.JFXButton;
+import javafx.css.PseudoClass;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.Label;
@@ -28,16 +28,21 @@ import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.TextAlignment;
-import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.FXUtils;
-import org.jackhuang.hmcl.ui.SVG;
 
 public class AdvancedListItemSkin extends SkinBase<AdvancedListItem> {
+    private final PseudoClass SELECTED = PseudoClass.getPseudoClass("selected");
 
     public AdvancedListItemSkin(AdvancedListItem skinnable) {
         super(skinnable);
 
         StackPane stackPane = new StackPane();
+        stackPane.getStyleClass().add("container");
+        RipplerContainer container = new RipplerContainer(stackPane);
+
+        FXUtils.onChangeAndOperate(skinnable.activeProperty(), active -> {
+            skinnable.pseudoClassStateChanged(SELECTED, active);
+        });
 
         BorderPane root = new BorderPane();
         root.setPickOnBounds(false);
@@ -54,7 +59,6 @@ public class AdvancedListItemSkin extends SkinBase<AdvancedListItem> {
         FXUtils.limitSize(imageView, 32, 32);
         imageView.setPreserveRatio(true);
         imageView.imageProperty().bind(skinnable.imageProperty());
-        imageView.viewportProperty().bind(skinnable.viewportProperty());
         imageViewContainer.getChildren().setAll(imageView);
 
         VBox vbox = new VBox();
@@ -85,20 +89,27 @@ public class AdvancedListItemSkin extends SkinBase<AdvancedListItem> {
 
         HBox right = new HBox();
         right.setAlignment(Pos.CENTER);
-        right.setPickOnBounds(false);
-
-        JFXButton settings = new JFXButton();
-        FXUtils.setLimitWidth(settings, 40);
-        settings.getStyleClass().setAll("toggle-icon4");
-        settings.setGraphic(SVG.dotsVertical(Theme.blackFillBinding(), -1, -1));
-        right.getChildren().setAll(settings);
+        right.setMouseTransparent(true);
+        right.getStyleClass().add("toggle-icon4");
+        FXUtils.setLimitWidth(right, 40);
+        FXUtils.onChangeAndOperate(skinnable.rightGraphicProperty(),
+                newGraphic -> {
+                    if (newGraphic == null) {
+                        right.getChildren().clear();
+                    } else {
+                        right.getChildren().setAll(newGraphic);
+                    }
+                });
         root.setRight(right);
 
+        FXUtils.onChangeAndOperate(skinnable.actionButtonVisibleProperty(),
+                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);
 
-        getChildren().setAll(stackPane);
+        getChildren().setAll(container);
     }
 }

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -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,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,26 +13,28 @@
  * 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 org.jackhuang.hmcl.util.javafx.MappedObservableList;
+
 import javafx.beans.DefaultProperty;
 import javafx.beans.binding.Bindings;
+import javafx.beans.binding.ObjectBinding;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
-import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
+import javafx.css.PseudoClass;
 import javafx.scene.Node;
 import javafx.scene.control.Control;
-import javafx.scene.control.Skin;
 import javafx.scene.control.SkinBase;
-import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.util.MappedObservableList;
+
+import java.util.function.Consumer;
 
 @DefaultProperty("content")
 public class ComponentList extends Control {
@@ -41,6 +43,8 @@ public class ComponentList extends Control {
     private final IntegerProperty depth = new SimpleIntegerProperty(this, "depth", 0);
     private boolean hasSubtitle = false;
     public final ObservableList<Node> content = FXCollections.observableArrayList();
+    private boolean expanded = false;
+    private Consumer<ComponentList> lazyInitializer;
 
     public ComponentList() {
         getStyleClass().add("options-list");
@@ -94,27 +98,63 @@ public class ComponentList extends Control {
         return content;
     }
 
+    public void setLazyInitializer(Consumer<ComponentList> lazyInitializer) {
+        this.lazyInitializer = lazyInitializer;
+    }
+
+    public void onExpand() {
+        if (!expanded && lazyInitializer != null) {
+            lazyInitializer.accept(this);
+        }
+
+        expanded = true;
+    }
+
     @Override
     protected javafx.scene.control.Skin<?> createDefaultSkin() {
         return new Skin(this);
     }
 
     protected static class Skin extends SkinBase<ComponentList> {
+        private static final PseudoClass PSEUDO_CLASS_FIRST = PseudoClass.getPseudoClass("first");
+        private static final PseudoClass PSEUDO_CLASS_LAST = PseudoClass.getPseudoClass("last");
+
+        private final ObservableList<Node> list;
+        private final ObjectBinding<Node> firstItem;
+        private final ObjectBinding<Node> lastItem;
 
         protected Skin(ComponentList control) {
             super(control);
 
-            VBox vbox = new VBox();
-            Bindings.bindContent(vbox.getChildren(),
-                    MappedObservableList.create(control.getContent(), this::mapper));
-            getChildren().setAll(vbox);
-        }
+            list = MappedObservableList.create(control.getContent(), node -> {
+                ComponentListCell cell = new ComponentListCell(node);
+                cell.getStyleClass().add("options-list-item");
+                return cell;
+            });
 
-        private Node mapper(Node node) {
-            StackPane child = new StackPane();
-            child.getChildren().add(new ComponentListCell(node));
-            child.getStyleClass().add("options-list-item");
-            return child;
+            firstItem = Bindings.valueAt(list, 0);
+            firstItem.addListener((observable, oldValue, newValue) -> {
+                if (newValue != null)
+                    newValue.pseudoClassStateChanged(PSEUDO_CLASS_FIRST, true);
+                if (oldValue != null)
+                    oldValue.pseudoClassStateChanged(PSEUDO_CLASS_FIRST, false);
+            });
+            if (!list.isEmpty())
+                list.get(0).pseudoClassStateChanged(PSEUDO_CLASS_FIRST, true);
+
+            lastItem = Bindings.valueAt(list, Bindings.subtract(Bindings.size(list), 1));
+            lastItem.addListener((observable, oldValue, newValue) -> {
+                if (newValue != null)
+                    newValue.pseudoClassStateChanged(PSEUDO_CLASS_LAST, true);
+                if (oldValue != null)
+                    oldValue.pseudoClassStateChanged(PSEUDO_CLASS_LAST, false);
+            });
+            if (!list.isEmpty())
+                list.get(list.size() - 1).pseudoClassStateChanged(PSEUDO_CLASS_LAST, true);
+
+            VBox vbox = new VBox();
+            Bindings.bindContent(vbox.getChildren(), list);
+            getChildren().setAll(vbox);
         }
     }
 }

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -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,6 +24,7 @@ import javafx.animation.KeyValue;
 import javafx.animation.Timeline;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
+import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
@@ -78,7 +79,6 @@ class ComponentListCell extends StackPane {
             content.getStyleClass().add("options-sublist");
 
             BorderPane groupNode = new BorderPane();
-            groupNode.getStyleClass().add("options-list-item-header");
 
             Node expandIcon = SVG.expand(Theme.blackFillBinding(), 10, 10);
             JFXButton expandButton = new JFXButton();
@@ -86,21 +86,25 @@ class ComponentListCell extends StackPane {
             expandButton.getStyleClass().add("options-list-item-expand-button");
 
             VBox labelVBox = new VBox();
+            labelVBox.setAlignment(Pos.CENTER_LEFT);
 
+            boolean overrideHeaderLeft = false;
             if (list instanceof ComponentSublist) {
                 Node leftNode = ((ComponentSublist) list).getHeaderLeft();
-                if (leftNode != null)
+                if (leftNode != null) {
                     labelVBox.getChildren().setAll(leftNode);
-            } else {
+                    overrideHeaderLeft = true;
+                }
+            }
+
+            if (!overrideHeaderLeft) {
                 Label label = new Label();
                 label.textProperty().bind(list.titleProperty());
-                label.setMouseTransparent(true);
                 labelVBox.getChildren().add(label);
 
                 if (list.isHasSubtitle()) {
                     Label subtitleLabel = new Label();
                     subtitleLabel.textProperty().bind(list.subtitleProperty());
-                    subtitleLabel.setMouseTransparent(true);
                     subtitleLabel.getStyleClass().add("subtitle-label");
                     labelVBox.getChildren().add(subtitleLabel);
                 }
@@ -109,6 +113,8 @@ class ComponentListCell extends StackPane {
             groupNode.setLeft(labelVBox);
 
             HBox right = new HBox();
+            right.setSpacing(16);
+            right.setAlignment(Pos.CENTER_RIGHT);
             if (list instanceof ComponentSublist) {
                 Node rightNode = ((ComponentSublist) list).getHeaderRight();
                 if (rightNode != null)
@@ -116,21 +122,13 @@ class ComponentListCell extends StackPane {
             }
             right.getChildren().add(expandButton);
             groupNode.setRight(right);
-            labelVBox.setAlignment(Pos.CENTER_LEFT);
-            right.setAlignment(Pos.CENTER_RIGHT);
 
             VBox container = new VBox();
-            container.setStyle("-fx-padding: 8 0 0 0;");
+            container.setPadding(new Insets(8, 0, 0, 0));
             FXUtils.setLimitHeight(container, 0);
-            Rectangle clipRect = new Rectangle();
-            clipRect.widthProperty().bind(container.widthProperty());
-            clipRect.heightProperty().bind(container.heightProperty());
-            container.setClip(clipRect);
+            FXUtils.setOverflowHidden(container);
             container.getChildren().setAll(content);
-
-            VBox holder = new VBox();
-            holder.getChildren().setAll(groupNode, container);
-            holder.getStyleClass().add("options-list-item-container");
+            groupNode.setBottom(container);
 
             expandButton.setOnMouseClicked(e -> {
                 if (expandAnimation != null && expandAnimation.getStatus() == Animation.Status.RUNNING) {
@@ -145,6 +143,7 @@ class ComponentListCell extends StackPane {
 
                 if (isExpanded()) {
                     updateClip(newHeight);
+                    list.onExpand();
                 }
 
                 expandAnimation = new Timeline(new KeyFrame(new Duration(320.0),
@@ -162,9 +161,10 @@ class ComponentListCell extends StackPane {
             expandedProperty().addListener((a, b, newValue) ->
                     expandIcon.setRotate(newValue ? 180 : 0));
 
-            getChildren().setAll(holder);
-        } else
+            getChildren().setAll(groupNode);
+        } else {
             getChildren().setAll(content);
+        }
     }
 
     public boolean isExpanded() {

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

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

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,16 +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.task;
+package org.jackhuang.hmcl.ui.construct;
+
+import org.jackhuang.hmcl.ui.Controllers;
 
 /**
- * If a task throws {@link SilentException},
- * the task will be marked as failure but do not log the stacktrace.
- *
- * @author huangyuhui
+ * @author yushijinhun
+ * @see Controllers#dialog(javafx.scene.layout.Region)
  */
-public final class SilentException extends Exception {
+public interface DialogAware {
+
+    default void onDialogShown() {
+    }
 
 }

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -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/FloatListCell.java

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

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

@@ -0,0 +1,195 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.construct;
+
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.NumberBinding;
+import javafx.geometry.Orientation;
+import javafx.geometry.Point2D;
+import javafx.scene.Node;
+import javafx.scene.control.ScrollBar;
+import javafx.scene.control.Skin;
+import javafx.scene.layout.Region;
+import javafx.scene.shape.Rectangle;
+import org.jackhuang.hmcl.util.Lang;
+
+public class FloatScrollBarSkin implements Skin<ScrollBar> {
+    private ScrollBar scrollBar;
+    private Region group;
+    private Rectangle track = new Rectangle();
+    private Rectangle thumb = new Rectangle();
+
+    public FloatScrollBarSkin(final ScrollBar scrollBar) {
+        this.scrollBar = scrollBar;
+        scrollBar.setPrefHeight(1e-18);
+        scrollBar.setPrefWidth(1e-18);
+
+        this.group = new Region() {
+            Point2D dragStart;
+            double preDragThumbPos;
+
+            NumberBinding range = Bindings.subtract(scrollBar.maxProperty(), scrollBar.minProperty());
+            NumberBinding position = Bindings.divide(Bindings.subtract(scrollBar.valueProperty(), scrollBar.minProperty()), range);
+
+            {
+                // Children are added unmanaged because for some reason the height of the bar keeps changing
+                // if they're managed in certain situations... not sure about the cause.
+                getChildren().addAll(track, thumb);
+
+                track.setManaged(false);
+                track.getStyleClass().add("track");
+
+                thumb.setManaged(false);
+                thumb.getStyleClass().add("thumb");
+
+                scrollBar.orientationProperty().addListener(obs -> setup());
+
+                setup();
+
+
+                thumb.setOnMousePressed(me -> {
+                    if (me.isSynthesized()) {
+                        // touch-screen events handled by Scroll handler
+                        me.consume();
+                        return;
+                    }
+                    /*
+                     ** if max isn't greater than min then there is nothing to do here
+                     */
+                    if (getSkinnable().getMax() > getSkinnable().getMin()) {
+                        dragStart = thumb.localToParent(me.getX(), me.getY());
+                        double clampedValue = Lang.clamp(getSkinnable().getMin(), getSkinnable().getValue(), getSkinnable().getMax());
+                        preDragThumbPos = (clampedValue - getSkinnable().getMin()) / (getSkinnable().getMax() - getSkinnable().getMin());
+                        me.consume();
+                    }
+                });
+
+
+                thumb.setOnMouseDragged(me -> {
+                    if (me.isSynthesized()) {
+                        // touch-screen events handled by Scroll handler
+                        me.consume();
+                        return;
+                    }
+                    /*
+                     ** if max isn't greater than min then there is nothing to do here
+                     */
+                    if (getSkinnable().getMax() > getSkinnable().getMin()) {
+                        /*
+                         ** if the tracklength isn't greater then do nothing....
+                         */
+                        if (trackLength() > thumbLength()) {
+                            Point2D cur = thumb.localToParent(me.getX(), me.getY());
+                            if (dragStart == null) {
+                                // we're getting dragged without getting a mouse press
+                                dragStart = thumb.localToParent(me.getX(), me.getY());
+                            }
+                            double dragPos = getSkinnable().getOrientation() == Orientation.VERTICAL ? cur.getY() - dragStart.getY(): cur.getX() - dragStart.getX();
+                            double position = preDragThumbPos + dragPos / (trackLength() - thumbLength());
+                            if (!getSkinnable().isFocused() && getSkinnable().isFocusTraversable()) getSkinnable().requestFocus();
+                            double newValue = (position * (getSkinnable().getMax() - getSkinnable().getMin())) + getSkinnable().getMin();
+                            if (!Double.isNaN(newValue)) {
+                                getSkinnable().setValue(Lang.clamp(getSkinnable().getMin(), newValue, getSkinnable().getMax()));
+                            }
+                        }
+
+                        me.consume();
+                    }
+                });
+            }
+
+            private double trackLength() {
+                return getSkinnable().getOrientation() == Orientation.VERTICAL ? track.getHeight() : track.getWidth();
+            }
+
+            private double thumbLength() {
+                return getSkinnable().getOrientation() == Orientation.VERTICAL ? thumb.getHeight() : thumb.getWidth();
+            }
+
+            private double boundedSize(double min, double value, double max) {
+                return Math.min(Math.max(value, min), Math.max(min, max));
+            }
+
+            private void setup() {
+                track.widthProperty().unbind();
+                track.heightProperty().unbind();
+
+                if (scrollBar.getOrientation() == Orientation.HORIZONTAL) {
+                    track.relocate(0, -5);
+                    track.widthProperty().bind(scrollBar.widthProperty());
+                    track.setHeight(5);
+                } else {
+                    track.relocate(-5, 0);
+                    track.setWidth(5);
+                    track.heightProperty().bind(scrollBar.heightProperty());
+                }
+
+                thumb.xProperty().unbind();
+                thumb.yProperty().unbind();
+                thumb.widthProperty().unbind();
+                thumb.heightProperty().unbind();
+
+                if (scrollBar.getOrientation() == Orientation.HORIZONTAL) {
+                    thumb.relocate(0, -5);
+                    thumb.widthProperty().bind(Bindings.max(5, scrollBar.visibleAmountProperty().divide(range).multiply(scrollBar.widthProperty())));
+                    thumb.setHeight(5);
+                    thumb.xProperty().bind(Bindings.subtract(scrollBar.widthProperty(), thumb.widthProperty()).multiply(position));
+                } else {
+                    thumb.relocate(-5, 0);
+                    thumb.setWidth(5);
+                    thumb.heightProperty().bind(Bindings.max(5, scrollBar.visibleAmountProperty().divide(range).multiply(scrollBar.heightProperty())));
+                    thumb.yProperty().bind(Bindings.subtract(scrollBar.heightProperty(), thumb.heightProperty()).multiply(position));
+                }
+            }
+
+            @Override
+            protected double computeMaxWidth(double height) {
+                if (scrollBar.getOrientation() == Orientation.HORIZONTAL) {
+                    return Double.MAX_VALUE;
+                }
+
+                return 5;
+            }
+
+            @Override
+            protected double computeMaxHeight(double width) {
+                if (scrollBar.getOrientation() == Orientation.VERTICAL) {
+                    return Double.MAX_VALUE;
+                }
+
+                return 5;
+            }
+        };
+    }
+
+    @Override
+    public void dispose() {
+        scrollBar = null;
+        group = null;
+    }
+
+    @Override
+    public Node getNode() {
+        return group;
+    }
+
+    @Override
+    public ScrollBar getSkinnable() {
+        return scrollBar;
+    }
+}

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,45 +13,51 @@
  * 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 static javafx.collections.FXCollections.emptyObservableList;
+import static javafx.collections.FXCollections.observableList;
+import static javafx.collections.FXCollections.singletonObservableList;
+
+import org.jackhuang.hmcl.util.javafx.BindingMapping;
+
 import com.jfoenix.controls.JFXComboBox;
+import com.jfoenix.controls.JFXListCell;
+
 import javafx.beans.NamedArg;
-import javafx.scene.control.ListCell;
+import javafx.beans.binding.Bindings;
 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) {
-        valueProperty().addListener((a, b, newValue) -> {
-            if (enableStyle)
-                setStyle("-fx-font-family: \"" + newValue + "\";");
-        });
+    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(BindingMapping.of(valueProperty())
+                        .map(value -> value == null ? emptyObservableList() : singletonObservableList(value)));
+
         setOnMouseClicked(e -> {
-            if (loaded) return;
-            getItems().setAll(Font.getFamilies());
+            if (loaded)
+                return;
+            itemsProperty().unbind();
+            setItems(observableList(Font.getFamilies()));
             loaded = true;
         });
     }
-
-    public void initValue(Font font) {
-        getItems().setAll(font.getFamily());
-        getSelectionModel().select(font.getFamily());
-    }
 }

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -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;
@@ -39,12 +38,17 @@ public class IconedItem extends RipplerContainer {
 
     private static HBox createHBox(Node icon) {
         HBox hBox = new HBox();
-        hBox.getStyleClass().setAll("iconed-item-container");
-        icon.setMouseTransparent(true);
+
+        if (icon != null) {
+            icon.setMouseTransparent(true);
+            hBox.getChildren().add(icon);
+        }
+
+        hBox.getStyleClass().add("iconed-item-container");
         Label textLabel = new Label();
         textLabel.setId("label");
         textLabel.setMouseTransparent(true);
-        hBox.getChildren().addAll(icon, textLabel);
+        hBox.getChildren().addAll(textLabel);
         return hBox;
     }
 

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package org.jackhuang.hmcl.ui.construct;
 
 import com.jfoenix.controls.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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,51 +13,59 @@
  * 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.JFXButton;
 import com.jfoenix.controls.JFXTextField;
-import javafx.beans.binding.Bindings;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.util.FutureCallback;
 
+import java.util.concurrent.CompletableFuture;
+
 public class InputDialogPane extends StackPane {
+    private final CompletableFuture<String> future = new CompletableFuture<>();
 
     @FXML
     private JFXButton acceptButton;
     @FXML
     private JFXButton cancelButton;
     @FXML
-    private JFXTextField textField;
+    private Label title;
     @FXML
-    private Label content;
+    private VBox vbox;
     @FXML
     private Label lblCreationWarning;
+    @FXML
+    private SpinnerPane acceptPane;
 
-    public InputDialogPane(String text, FutureCallback<String> onResult) {
+    public InputDialogPane(String text, String initialValue, FutureCallback<String> onResult) {
         FXUtils.loadFXML(this, "/assets/fxml/input-dialog.fxml");
-        content.setText(text);
+        title.setText(text);
+        JFXTextField textField = new JFXTextField();
+        textField.setText(initialValue);
+        vbox.getChildren().setAll(textField);
         cancelButton.setOnMouseClicked(e -> fireEvent(new DialogCloseEvent()));
         acceptButton.setOnMouseClicked(e -> {
+            acceptPane.showSpinner();
+
             onResult.call(textField.getText(), () -> {
+                acceptPane.hideSpinner();
+                future.complete(textField.getText());
                 fireEvent(new DialogCloseEvent());
             }, msg -> {
+                acceptPane.hideSpinner();
                 lblCreationWarning.setText(msg);
             });
         });
-
-        acceptButton.disableProperty().bind(Bindings.createBooleanBinding(
-                () -> !textField.validate(),
-                textField.textProperty()
-        ));
     }
 
-    public void setInitialText(String text) {
-        textField.setText(text);
+    public CompletableFuture<String> getCompletableFuture() {
+        return future;
     }
 }

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

@@ -0,0 +1,36 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.construct;
+
+import javafx.geometry.Insets;
+import javafx.scene.layout.StackPane;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Rectangle;
+
+public class MenuSeparator extends StackPane {
+
+    public MenuSeparator() {
+        Rectangle rect = new Rectangle();
+        rect.widthProperty().bind(widthProperty().add(-14));
+        rect.setHeight(1);
+        rect.setFill(Color.GRAY);
+        maxHeightProperty().set(10);
+        setPadding(new Insets(3));
+        getChildren().setAll(rect);
+    }
+}

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

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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,6 +24,7 @@ import javafx.beans.NamedArg;
 import javafx.beans.property.*;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
@@ -46,7 +47,7 @@ import java.util.function.Consumer;
 
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
-public class MultiFileItem<T> extends ComponentList {
+public class MultiFileItem<T> extends ComponentSublist {
     private final StringProperty customTitle = new SimpleStringProperty(this, "customTitle", i18n("selector.custom"));
     private final StringProperty chooserTitle = new SimpleStringProperty(this, "chooserTitle", i18n("selector.choose_file"));
     private final BooleanProperty directory = new SimpleBooleanProperty(this, "directory", false);
@@ -138,7 +139,7 @@ public class MultiFileItem<T> extends ComponentList {
 
     public Node createChildren(String title, String subtitle, T userData) {
         BorderPane pane = new BorderPane();
-        pane.setStyle("-fx-padding: 3;");
+        pane.setPadding(new Insets(3));
         FXUtils.setLimitHeight(pane, 20);
 
         JFXRadioButton left = new JFXRadioButton(title);

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,49 +13,70 @@
  * 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.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyBooleanWrapper;
+import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.event.Event;
 import javafx.event.EventHandler;
 import javafx.event.EventType;
 import javafx.scene.Node;
 import javafx.scene.layout.Region;
-import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.animation.AnimationProducer;
 import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
-import org.jackhuang.hmcl.ui.animation.TransitionHandler;
+import org.jackhuang.hmcl.ui.animation.TransitionPane;
+import org.jackhuang.hmcl.util.Logging;
 
 import java.util.Optional;
 import java.util.Stack;
+import java.util.logging.Level;
 
-public class Navigator extends StackPane {
+public class Navigator extends TransitionPane {
     private static final String PROPERTY_DIALOG_CLOSE_HANDLER = Navigator.class.getName() + ".closeListener";
 
+    private final BooleanProperty backable = new SimpleBooleanProperty(this, "backable");
     private final Stack<Node> stack = new Stack<>();
-    private final TransitionHandler animationHandler = new TransitionHandler(this);
-    private final ReadOnlyBooleanWrapper canGoBack = new ReadOnlyBooleanWrapper();
+    private boolean initialized = false;
 
-    public Navigator(Node init) {
+    public void init(Node init) {
         stack.push(init);
+        backable.set(canGoBack());
         getChildren().setAll(init);
+
+        fireEvent(new NavigationEvent(this, init, NavigationEvent.NAVIGATED));
+
+        initialized = true;
     }
 
-    public void navigate(Node node) {
+    public void navigate(Node node, AnimationProducer animationProducer) {
         FXUtils.checkFxUserThread();
 
+        if (!initialized)
+            throw new IllegalStateException("Navigator must have a root page");
+
         Node from = stack.peek();
         if (from == node)
             return;
 
+        Logging.LOG.info("Navigate to " + node);
+
         stack.push(node);
-        fireEvent(new NavigationEvent(this, from, NavigationEvent.NAVIGATING));
-        setContent(node);
-        fireEvent(new NavigationEvent(this, node, NavigationEvent.NAVIGATED));
+        backable.set(canGoBack());
+
+        NavigationEvent navigating = new NavigationEvent(this, from, NavigationEvent.NAVIGATING);
+        fireEvent(navigating);
+        node.fireEvent(navigating);
+
+        node.getProperties().put("hmcl.navigator.animation", animationProducer);
+        setContent(node, animationProducer);
+
+        NavigationEvent navigated = new NavigationEvent(this, node, NavigationEvent.NAVIGATED);
+        node.fireEvent(navigated);
 
         EventHandler<PageCloseEvent> handler = event -> close(node);
         node.getProperties().put(PROPERTY_DIALOG_CLOSE_HANDLER, handler);
@@ -66,15 +87,43 @@ public class Navigator extends StackPane {
         close(stack.peek());
     }
 
+    public void clear() {
+        while (stack.size() > 1)
+            close(stack.peek());
+    }
+
     @SuppressWarnings("unchecked")
     public void close(Node from) {
         FXUtils.checkFxUserThread();
 
-        stack.remove(from);
+        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);
+
+        stack.pop();
+        backable.set(canGoBack());
         Node node = stack.peek();
-        fireEvent(new NavigationEvent(this, from, NavigationEvent.NAVIGATING));
-        setContent(node);
-        fireEvent(new NavigationEvent(this, node, NavigationEvent.NAVIGATED));
+
+        NavigationEvent navigating = new NavigationEvent(this, from, NavigationEvent.NAVIGATING);
+        fireEvent(navigating);
+        node.fireEvent(navigating);
+
+        Object obj = from.getProperties().get("hmcl.navigator.animation");
+        if (obj instanceof AnimationProducer) {
+            setContent(node, (AnimationProducer) obj);
+        } else {
+            setContent(node, ContainerAnimations.NONE.getAnimationProducer());
+        }
+
+        NavigationEvent navigated = new NavigationEvent(this, node, NavigationEvent.NAVIGATED);
+        node.fireEvent(navigated);
 
         Optional.ofNullable(from.getProperties().get(PROPERTY_DIALOG_CLOSE_HANDLER))
                 .ifPresent(handler -> from.removeEventHandler(PageCloseEvent.CLOSE, (EventHandler<PageCloseEvent>) handler));
@@ -88,12 +137,28 @@ public class Navigator extends StackPane {
         return stack.size() > 1;
     }
 
-    private void setContent(Node content) {
-        animationHandler.setContent(content, ContainerAnimations.FADE.getAnimationProducer());
+    public boolean isBackable() {
+        return backable.get();
+    }
+
+    public BooleanProperty backableProperty() {
+        return backable;
+    }
+
+    public void setBackable(boolean backable) {
+        this.backable.set(backable);
+    }
+
+    public int size() {
+        return stack.size();
+    }
+
+    public void setContent(Node content, AnimationProducer animationProducer) {
+        super.setContent(content, animationProducer);
 
         if (content instanceof Region) {
             ((Region) content).setMinSize(0, 0);
-            FXUtils.setOverflowHidden((Region) content, true);
+            FXUtils.setOverflowHidden((Region) content);
         }
     }
 
@@ -139,14 +204,21 @@ public class Navigator extends StackPane {
         public static final EventType<NavigationEvent> NAVIGATED = new EventType<>("NAVIGATED");
         public static final EventType<NavigationEvent> NAVIGATING = new EventType<>("NAVIGATING");
 
+        private final Navigator source;
         private final Node node;
 
-        public NavigationEvent(Object source, Node target, EventType<? extends Event> eventType) {
+        public NavigationEvent(Navigator source, Node target, EventType<? extends Event> eventType) {
             super(source, target, eventType);
 
+            this.source = source;
             this.node = target;
         }
 
+        @Override
+        public Navigator getSource() {
+            return source;
+        }
+
         public Node getNode() {
             return node;
         }

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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

@@ -0,0 +1,94 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.construct;
+
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.When;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.scene.Node;
+import javafx.scene.control.Control;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.Skin;
+import javafx.scene.control.SkinBase;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+import org.jackhuang.hmcl.ui.FXUtils;
+
+public class PopupMenu extends Control {
+
+    private final ObservableList<Node> content = FXCollections.observableArrayList();
+    private final BooleanProperty alwaysShowingVBar = new SimpleBooleanProperty();
+
+    public PopupMenu() {
+    }
+
+    public ObservableList<Node> getContent() {
+        return content;
+    }
+
+    public boolean isAlwaysShowingVBar() {
+        return alwaysShowingVBar.get();
+    }
+
+    public BooleanProperty alwaysShowingVBarProperty() {
+        return alwaysShowingVBar;
+    }
+
+    public void setAlwaysShowingVBar(boolean alwaysShowingVBar) {
+        this.alwaysShowingVBar.set(alwaysShowingVBar);
+    }
+
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new PopupMenuSkin();
+    }
+
+    public static Node wrapPopupMenuItem(Node node) {
+        StackPane pane = new StackPane();
+        pane.getChildren().setAll(node);
+        pane.getStyleClass().add("menu-container");
+        node.setMouseTransparent(true);
+        return new RipplerContainer(pane);
+    }
+
+    private class PopupMenuSkin extends SkinBase<PopupMenu> {
+
+        protected PopupMenuSkin() {
+            super(PopupMenu.this);
+
+            ScrollPane scrollPane = new ScrollPane();
+            scrollPane.setFitToHeight(true);
+            scrollPane.setFitToWidth(true);
+            scrollPane.vbarPolicyProperty().bind(new When(alwaysShowingVBar)
+                    .then(ScrollPane.ScrollBarPolicy.ALWAYS)
+                    .otherwise(ScrollPane.ScrollBarPolicy.AS_NEEDED));
+
+            VBox content = new VBox();
+            content.getStyleClass().add("menu");
+            Bindings.bindContent(content.getChildren(), PopupMenu.this.getContent());
+            scrollPane.setContent(content);
+
+            FXUtils.smoothScrolling(scrollPane);
+
+            getChildren().setAll(scrollPane);
+        }
+    }
+}

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

@@ -0,0 +1,157 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.construct;
+
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXCheckBox;
+import com.jfoenix.controls.JFXTextField;
+import com.jfoenix.validation.base.ValidatorBase;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.fxml.FXML;
+import javafx.geometry.Insets;
+import javafx.scene.control.Label;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.util.FutureCallback;
+import org.jackhuang.hmcl.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+public class PromptDialogPane extends StackPane {
+    private final CompletableFuture<List<Builder.Question<?>>> future = new CompletableFuture<>();
+
+    @FXML
+    private JFXButton acceptButton;
+    @FXML
+    private JFXButton cancelButton;
+    @FXML
+    private VBox vbox;
+    @FXML
+    private Label title;
+    @FXML
+    private Label lblCreationWarning;
+    @FXML
+    private SpinnerPane acceptPane;
+
+    public PromptDialogPane(Builder builder) {
+        FXUtils.loadFXML(this, "/assets/fxml/input-dialog.fxml");
+        this.title.setText(builder.title);
+
+        List<BooleanBinding> bindings = new ArrayList<>();
+        for (Builder.Question<?> question : builder.questions) {
+            if (question instanceof Builder.StringQuestion) {
+                JFXTextField textField = new JFXTextField();
+                textField.textProperty().addListener((a, b, newValue) -> ((Builder.StringQuestion) question).value = textField.getText());
+                textField.setText(((Builder.StringQuestion) question).value);
+                textField.setValidators(((Builder.StringQuestion) question).validators.toArray(new ValidatorBase[0]));
+                bindings.add(Bindings.createBooleanBinding(textField::validate, textField.textProperty()));
+
+                if (StringUtils.isNotBlank(question.question)) {
+                    vbox.getChildren().add(new Label(question.question));
+                }
+                VBox.setMargin(textField, new Insets(0, 0, 20, 0));
+                vbox.getChildren().add(textField);
+            } else if (question instanceof Builder.BooleanQuestion) {
+                HBox hBox = new HBox();
+                JFXCheckBox checkBox = new JFXCheckBox();
+                hBox.getChildren().setAll(checkBox);
+                HBox.setMargin(checkBox, new Insets(0, 0, 0, -10));
+                checkBox.setSelected(((Builder.BooleanQuestion) question).value);
+                checkBox.selectedProperty().addListener((a, b, newValue) -> ((Builder.BooleanQuestion) question).value = newValue);
+                checkBox.setText(question.question);
+                vbox.getChildren().add(hBox);
+            }
+        }
+
+        cancelButton.setOnMouseClicked(e -> fireEvent(new DialogCloseEvent()));
+        acceptButton.disableProperty().bind(Bindings.createBooleanBinding(
+                () -> bindings.stream().map(BooleanBinding::get).anyMatch(x -> !x),
+                bindings.toArray(new BooleanBinding[0])
+        ));
+
+        acceptButton.setOnMouseClicked(e -> {
+            acceptPane.showSpinner();
+
+            builder.callback.call(builder.questions, () -> {
+                acceptPane.hideSpinner();
+                future.complete(builder.questions);
+                fireEvent(new DialogCloseEvent());
+            }, msg -> {
+                acceptPane.hideSpinner();
+                lblCreationWarning.setText(msg);
+            });
+        });
+    }
+
+    public CompletableFuture<List<Builder.Question<?>>> getCompletableFuture() {
+        return future;
+    }
+
+    public static class Builder {
+        private final List<Question<?>> questions = new ArrayList<>();
+        private final String title;
+        private final FutureCallback<List<Question<?>>> callback;
+
+        public Builder(String title, FutureCallback<List<Question<?>>> callback) {
+            this.title = title;
+            this.callback = callback;
+        }
+
+        public <T> Builder addQuestion(Question<T> question) {
+            questions.add(question);
+            return this;
+        }
+
+        public static class Question<T> {
+            public final String question;
+            protected T value;
+
+            public Question(String question) {
+                this.question = question;
+            }
+
+            public T getValue() {
+                return value;
+            }
+        }
+
+        public static class StringQuestion extends Question<String> {
+            protected final List<ValidatorBase> validators;
+
+            public StringQuestion(String question, String defaultValue, ValidatorBase... validators) {
+                super(question);
+                this.value = defaultValue;
+                this.validators = Arrays.asList(validators);
+            }
+        }
+
+        public static class BooleanQuestion extends Question<Boolean> {
+
+            public BooleanQuestion(String question, boolean defaultValue) {
+                super(question);
+                this.value = defaultValue;
+            }
+        }
+    }
+}

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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,39 +63,16 @@ 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);
+        buttonRippler.setPosition(JFXRippler.RipplerPos.BACK);
         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())
@@ -106,23 +85,7 @@ public class RipplerContainer extends StackPane {
         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 +113,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 +155,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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,38 +13,40 @@
  * 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.animation.KeyFrame;
+import javafx.animation.Timeline;
 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.control.Control;
+import javafx.scene.control.SkinBase;
+import javafx.scene.layout.Pane;
 import javafx.scene.layout.StackPane;
+import javafx.util.Duration;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.animation.AnimationHandler;
+import org.jackhuang.hmcl.ui.animation.AnimationProducer;
 import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
-import org.jackhuang.hmcl.ui.animation.TransitionHandler;
 
 @DefaultProperty("content")
-public class SpinnerPane extends StackPane {
-    private final TransitionHandler transitionHandler = new TransitionHandler(this);
-    private final JFXSpinner spinner = new JFXSpinner();
-    private final StackPane contentPane = new StackPane();
+public class SpinnerPane extends Control {
     private final ObjectProperty<Node> content = new SimpleObjectProperty<>(this, "content");
-
-    public SpinnerPane() {
-        getChildren().setAll(contentPane);
-
-        content.addListener((a, b, newValue) -> contentPane.getChildren().setAll(newValue));
-    }
+    private final BooleanProperty loading = new SimpleBooleanProperty(this, "loading");
 
     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 +60,84 @@ 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);
+    }
+
+    @Override
+    protected Skin createDefaultSkin() {
+        return new Skin(this);
+    }
+
+    private static class Skin extends SkinBase<SpinnerPane> {
+        private final JFXSpinner spinner = new JFXSpinner();
+        private final StackPane contentPane = new StackPane();
+        private final StackPane topPane = new StackPane();
+        private final StackPane root = new StackPane();
+        private Timeline animation;
+
+        protected Skin(SpinnerPane control) {
+            super(control);
+
+            root.getStyleClass().add("spinner-pane");
+            topPane.getChildren().setAll(spinner);
+            root.getChildren().setAll(contentPane, topPane);
+            FXUtils.onChangeAndOperate(getSkinnable().content, newValue -> contentPane.getChildren().setAll(newValue));
+            getChildren().setAll(root);
+
+            FXUtils.onChangeAndOperate(getSkinnable().loadingProperty(), newValue -> {
+                Timeline prev = animation;
+                if (prev != null) prev.stop();
+
+                AnimationProducer transition;
+                topPane.setMouseTransparent(true);
+                topPane.setVisible(true);
+                topPane.getStyleClass().add("gray-background");
+                if (newValue)
+                    transition = ContainerAnimations.FADE_IN.getAnimationProducer();
+                else
+                    transition = ContainerAnimations.FADE_OUT.getAnimationProducer();
+
+                AnimationHandler handler = new AnimationHandler() {
+                    @Override
+                    public Duration getDuration() {
+                        return Duration.millis(160);
+                    }
+
+                    @Override
+                    public Pane getCurrentRoot() {
+                        return root;
+                    }
+
+                    @Override
+                    public Node getPreviousNode() {
+                        return null;
+                    }
+
+                    @Override
+                    public Node getCurrentNode() {
+                        return topPane;
+                    }
+                };
+
+                Timeline now = new Timeline();
+                now.getKeyFrames().addAll(transition.animate(handler));
+                now.getKeyFrames().add(new KeyFrame(handler.getDuration(), e -> {
+                    topPane.setMouseTransparent(!newValue);
+                    topPane.setVisible(newValue);
+                }));
+                now.play();
+                animation = now;
+            });
+        }
+    }
 }

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) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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/TabControl.java

@@ -0,0 +1,249 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.construct;
+
+import javafx.beans.property.*;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.Node;
+import javafx.scene.control.SingleSelectionModel;
+
+import java.util.function.Supplier;
+
+public interface TabControl {
+    ObservableList<Tab> getTabs();
+
+    class TabControlSelectionModel extends SingleSelectionModel<Tab> {
+        private final TabControl tabHeader;
+
+        public TabControlSelectionModel(final TabControl t) {
+            if (t == null) {
+                throw new NullPointerException("TabPane can not be null");
+            }
+            this.tabHeader = t;
+
+            // watching for changes to the items list content
+            final ListChangeListener<Tab> itemsContentObserver = c -> {
+                while (c.next()) {
+                    for (Tab tab : c.getRemoved()) {
+                        if (tab != null && !tabHeader.getTabs().contains(tab)) {
+                            if (tab.isSelected()) {
+                                tab.setSelected(false);
+                                final int tabIndex = c.getFrom();
+
+                                // we always try to select the nearest, non-disabled
+                                // tab from the position of the closed tab.
+                                findNearestAvailableTab(tabIndex, true);
+                            }
+                        }
+                    }
+                    if (c.wasAdded() || c.wasRemoved()) {
+                        // The selected tab index can be out of sync with the list of tab if
+                        // we add or remove tabs before the selected tab.
+                        if (getSelectedIndex() != tabHeader.getTabs().indexOf(getSelectedItem())) {
+                            clearAndSelect(tabHeader.getTabs().indexOf(getSelectedItem()));
+                        }
+                    }
+                }
+                if (getSelectedIndex() == -1 && getSelectedItem() == null && tabHeader.getTabs().size() > 0) {
+                    // we go looking for the first non-disabled tab, as opposed to
+                    // just selecting the first tab (fix for RT-36908)
+                    findNearestAvailableTab(0, true);
+                } else if (tabHeader.getTabs().isEmpty()) {
+                    clearSelection();
+                }
+            };
+            if (this.tabHeader.getTabs() != null) {
+                this.tabHeader.getTabs().addListener(itemsContentObserver);
+            }
+        }
+
+        // API Implementation
+        @Override public void select(int index) {
+            if (index < 0 || (getItemCount() > 0 && index >= getItemCount()) ||
+                    (index == getSelectedIndex() && getModelItem(index).isSelected())) {
+                return;
+            }
+
+            // Unselect the old tab
+            if (getSelectedIndex() >= 0 && getSelectedIndex() < tabHeader.getTabs().size()) {
+                tabHeader.getTabs().get(getSelectedIndex()).setSelected(false);
+            }
+
+            setSelectedIndex(index);
+
+            Tab tab = getModelItem(index);
+            if (tab != null) {
+                setSelectedItem(tab);
+            }
+
+            // Select the new tab
+            if (getSelectedIndex() >= 0 && getSelectedIndex() < tabHeader.getTabs().size()) {
+                tabHeader.getTabs().get(getSelectedIndex()).setSelected(true);
+            }
+
+            /* Does this get all the change events */
+            ((Node) tabHeader).notifyAccessibleAttributeChanged(AccessibleAttribute.FOCUS_ITEM);
+        }
+
+        @Override public void select(Tab tab) {
+            final int itemCount = getItemCount();
+
+            for (int i = 0; i < itemCount; i++) {
+                final Tab value = getModelItem(i);
+                if (value != null && value.equals(tab)) {
+                    select(i);
+                    return;
+                }
+            }
+            if (tab != null) {
+                setSelectedItem(tab);
+            }
+        }
+
+        @Override protected Tab getModelItem(int index) {
+            final ObservableList<Tab> items = tabHeader.getTabs();
+            if (items == null) return null;
+            if (index < 0 || index >= items.size()) return null;
+            return items.get(index);
+        }
+
+        @Override protected int getItemCount() {
+            final ObservableList<Tab> items = tabHeader.getTabs();
+            return items == null ? 0 : items.size();
+        }
+
+        private Tab findNearestAvailableTab(int tabIndex, boolean doSelect) {
+            // we always try to select the nearest, non-disabled
+            // tab from the position of the closed tab.
+            final int tabCount = getItemCount();
+            int i = 1;
+            Tab bestTab = null;
+            while (true) {
+                // look leftwards
+                int downPos = tabIndex - i;
+                if (downPos >= 0) {
+                    Tab _tab = getModelItem(downPos);
+                    if (_tab != null) {
+                        bestTab = _tab;
+                        break;
+                    }
+                }
+
+                // look rightwards. We subtract one as we need
+                // to take into account that a tab has been removed
+                // and if we don't do this we'll miss the tab
+                // to the right of the tab (as it has moved into
+                // the removed tabs position).
+                int upPos = tabIndex + i - 1;
+                if (upPos < tabCount) {
+                    Tab _tab = getModelItem(upPos);
+                    if (_tab != null) {
+                        bestTab = _tab;
+                        break;
+                    }
+                }
+
+                if (downPos < 0 && upPos >= tabCount) {
+                    break;
+                }
+                i++;
+            }
+
+            if (doSelect && bestTab != null) {
+                select(bestTab);
+            }
+
+            return bestTab;
+        }
+    }
+
+    public static class Tab {
+        private final StringProperty id = new SimpleStringProperty(this, "id");
+        private final StringProperty text = new SimpleStringProperty(this, "text");
+        private final ReadOnlyBooleanWrapper selected = new ReadOnlyBooleanWrapper(this, "selected");
+        private final ObjectProperty<Node> node = new SimpleObjectProperty<>(this, "node");
+        private Supplier<Node> nodeSupplier;
+
+        public Tab(String id) {
+            setId(id);
+        }
+
+        public Tab(String id, String text) {
+            setId(id);
+            setText(text);
+        }
+
+        public Supplier<Node> getNodeSupplier() {
+            return nodeSupplier;
+        }
+
+        public void setNodeSupplier(Supplier<Node> nodeSupplier) {
+            this.nodeSupplier = nodeSupplier;
+        }
+
+        public String getId() {
+            return id.get();
+        }
+
+        public StringProperty idProperty() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id.set(id);
+        }
+
+        public String getText() {
+            return text.get();
+        }
+
+        public StringProperty textProperty() {
+            return text;
+        }
+
+        public void setText(String text) {
+            this.text.set(text);
+        }
+
+        public boolean isSelected() {
+            return selected.get();
+        }
+
+        public ReadOnlyBooleanProperty selectedProperty() {
+            return selected.getReadOnlyProperty();
+        }
+
+        private void setSelected(boolean selected) {
+            this.selected.set(selected);
+        }
+
+        public Node getNode() {
+            return node.get();
+        }
+
+        public ObjectProperty<Node> nodeProperty() {
+            return node;
+        }
+
+        public void setNode(Node node) {
+            this.node.set(node);
+        }
+    }
+}