Add some task test

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

.github/ISSUE_TEMPLATE.md

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

.gitignore

@@ -4,7 +4,6 @@
 hs_err_pid*
 
 .gradle
-.idea
 
 *.lck
 *.1
@@ -19,7 +18,19 @@ NVIDIA
 /HMCL/build/
 /HMCLCore/build/
 
-# idea output
+# idea
+.idea
 /out/
 /HMCL/out/
-/HMCLCore/out/
+/HMCLCore/out/
+
+# eclipse
+/bin/
+/HMCL/bin/
+/HMCLCore/bin/
+.classpath
+.project
+.settings
+
+# netbeans
+.nb-gradle

HMCL/build.gradle

@@ -1,121 +1,160 @@
-import org.apache.tools.ant.filters.ReplaceTokens
-
-import java.security.MessageDigest
-import java.util.jar.JarFile
-import java.util.jar.Pack200
-import java.util.zip.GZIPOutputStream
-
-if (!hasProperty('mainClass')) {
-    ext.mainClass = 'org.jackhuang.hmcl.Main'
+plugins {
+    id 'com.github.johnrengelman.shadow' version '4.0.0'
+    id 'application'
 }
 
-def buildnumber = System.getenv("TRAVIS_BUILD_NUMBER")
-if (buildnumber == null)
-    buildnumber = System.getenv("BUILD_NUMBER")
-if (buildnumber == null)
-    buildnumber = "SNAPSHOT"
+import java.nio.file.FileSystems
+import java.security.KeyFactory
+import java.security.MessageDigest
+import java.security.Signature
+import java.security.spec.PKCS8EncodedKeySpec
+import java.util.jar.JarFile
+import java.util.jar.JarOutputStream
+import java.util.jar.Pack200
+import java.util.zip.GZIPOutputStream
+import java.util.zip.ZipFile
+import java.nio.file.Files
 
-def versionroot = System.getenv("VERSION_ROOT")
-if (versionroot == null)
-    versionroot = "3.1"
+import org.tukaani.xz.LZMA2Options
+import org.tukaani.xz.XZOutputStream
 
-String mavenVersion = versionroot + '.' + buildnumber
-version = mavenVersion
+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.2"
+version = versionroot + '.' + buildnumber
+
+mainClassName = 'org.jackhuang.hmcl.Main'
 
 dependencies {
     compile project(":HMCLCore")
     compile rootProject.files("lib/JFoenix.jar")
 }
 
-task generateSources(type: Sync) {
-    from 'src/main/java'
-    into "$buildDir/generated-src"
-    filter(ReplaceTokens, tokens: [
-            'HELLO_MINECRAFT_LAUNCHER_VERSION_FOR_GRADLE_REPLACING': mavenVersion
-    ])
+def digest(String algorithm, byte[] bytes) {
+    return MessageDigest.getInstance(algorithm).digest(bytes)
 }
 
-compileJava.setSource "$buildDir/generated-src"
-compileJava.dependsOn generateSources
+def createChecksum(File file) {
+    def algorithm = "SHA-1"
+    def suffix = "sha1"
+    new File(file.parentFile, file.name + "." + suffix).text = digest(algorithm, file.bytes).encodeHex().toString() + "\n"
+}
 
-configurations {
-    coreCompile.extendsFrom compile
-    coreRuntime.extendsFrom runtime
+def attachSignature(File jar) {
+    def keyLocation = System.getenv("HMCL_SIGNATURE_KEY");
+    if (keyLocation == null)
+        return
+    def privatekey = KeyFactory.getInstance("RSA").generatePrivate(new PKCS8EncodedKeySpec(new File(keyLocation).bytes))
+
+    def signer = Signature.getInstance("SHA512withRSA")
+    signer.initSign(privatekey)
+    new ZipFile(jar).withCloseable { zip ->
+        zip.stream()
+                .sorted(Comparator.comparing { it.name })
+                .filter { it.name != "META-INF/hmcl_signature" }
+                .forEach {
+                    signer.update(digest("SHA-512", it.name.getBytes("UTF-8")))
+                    signer.update(digest("SHA-512", zip.getInputStream(it).bytes))
+                }
+    }
+    def signature = signer.sign()
+
+    FileSystems.newFileSystem(URI.create("jar:" + jar.toURI()), [:]).withCloseable { zipfs ->
+        Files.newOutputStream(zipfs.getPath("META-INF/hmcl_signature")).withCloseable { it << signature }
+    }
+}
+
+ext.packer = Pack200.newPacker()
+packer.properties()["pack.effort"] = "9"
+ext.unpacker = Pack200.newUnpacker()
+
+def repack(File file) {
+    def packed = new ByteArrayOutputStream()
+    new JarFile(file).withCloseable { packer.pack(it, packed) }
+    new JarOutputStream(file.newOutputStream()).withCloseable { unpacker.unpack(new ByteArrayInputStream(packed.toByteArray()), it) }
 }
 
 jar {
-    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
-
     manifest {
-        attributes 'Created-By'        : 'Copyright(c) 2013-2018 huangyuhui.',
-                'Main-Class'        : mainClass,
-                'Multi-Release': "true"
+        attributes 'Created-By': 'Copyright(c) 2013-2018 huangyuhui.',
+                'Main-Class': mainClassName,
+                'Multi-Release': 'true',
+                'Implementation-Version': version
+    }
+    finalizedBy shadowJar
+}
+
+shadowJar {
+    classifier = null
+
+    exclude 'META-INF/maven/**'
+    exclude 'META-INF/NOTICE.txt'
+    exclude 'META-INF/LICENSE.txt'
+
+    dependencies {
+        exclude(dependency('org.jetbrains:annotations'))
     }
 
     doLast {
-        def messageDigest = MessageDigest.getInstance("SHA1")
-        archivePath.eachByte 1024 * 1024, { byte[] buf, int bytesRead ->
-            messageDigest.update(buf, 0, bytesRead)
-        }
-        def sha1Hex = new BigInteger(1, messageDigest.digest()).toString(16).padLeft(40, '0')
-        def fileEx = new File(project.buildDir, "libs/" + archivePath.getName() + ".sha1")
-        if (!fileEx.exists()) fileEx.createNewFile()
-        fileEx.append sha1Hex
+        repack(jar.archivePath)
+        attachSignature(jar.archivePath)
+        createChecksum(jar.archivePath)
     }
 }
 
+def createExecutable(String suffix, String header) {
+    def output = new File(jar.archivePath.parentFile, jar.archivePath.name[0..-4] + suffix)
+    output.bytes = new File(project.projectDir, header).bytes
+    output << jar.archivePath.bytes
+    createChecksum(output)
+}
+
 processResources {
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'icon.icns'
+    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 {
+        outputPath.newOutputStream().withCloseable { out ->
+            new JarFile(jar.archivePath).withCloseable { jarFile -> packer.pack(jarFile, out) }
+        }
+        createChecksum(outputPath)
     }
 }
 
-task makePackGZ(dependsOn: jar) doLast {
-    ext {
-        jar.classifier = ''
-        makeExecutableinjar = jar.archivePath
-        jar.classifier = ''
-        makeExecutableoutjar = jar.archivePath
-        jar.classifier = ''
-    }
-    def loc = new File(project.buildDir, "libs/" + makeExecutableoutjar.getName().substring(0, makeExecutableoutjar.getName().length()-4)+".pack.gz")
-    def os = new GZIPOutputStream(new FileOutputStream(loc))
-    Pack200.newPacker().pack new JarFile(makeExecutableinjar), os
-    os.close()
-
-    def messageDigest = MessageDigest.getInstance("SHA1")
-    loc.eachByte 1024 * 1024, { byte[] buf, int bytesRead ->
-        messageDigest.update(buf, 0, bytesRead)
-    }
-    def sha1Hex = new BigInteger(1, messageDigest.digest()).toString(16).padLeft(40, '0')
-    def fileEx = new File(project.buildDir, "libs/" + makeExecutableoutjar.getName().substring(0, makeExecutableoutjar.getName().length()-4)+".pack.gz.sha1")
-    if (!fileEx.exists()) fileEx.createNewFile()
-    fileEx.append sha1Hex
+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 }
+    createChecksum(packXz)
 }
 
-task makeExecutable(dependsOn: jar) doLast {
-    ext {
-        jar.classifier = ''
-        makeExecutableinjar = jar.archivePath
-        jar.classifier = ''
-        makeExecutableoutjar = jar.archivePath
-        jar.classifier = ''
-    }
-    def loc = new File(project.buildDir, "libs/" + makeExecutableoutjar.getName().substring(0, makeExecutableoutjar.getName().length() - 4) + ".exe")
-    def fos = new FileOutputStream(loc)
-    def is = new FileInputStream(new File(project.buildDir, '../HMCLauncher.exe'))
-    int read
-    def bytes = new byte[8192]
-    while((read = is.read(bytes)) != -1)
-        fos.write(bytes, 0, read)
-    is.close()
-    is = new FileInputStream(makeExecutableoutjar)
-    while((read = is.read(bytes)) != -1)
-        fos.write(bytes, 0, read)
-    is.close()
-    fos.close()
-
+task makePackGz(dependsOn: makePack) doLast {
+    def packGz = new File(makePack.outputPath.parentFile, makePack.outputPath.name + ".gz")
+    new GZIPOutputStream(packGz.newOutputStream()).withCloseable { it << makePack.outputPath.bytes }
+    createChecksum(packGz)
 }
 
-build.dependsOn makePackGZ
-build.dependsOn makeExecutable
+
+task makeExecutables(dependsOn: jar) doLast {
+    createExecutable("exe", "src/main/resources/assets/HMCLauncher.exe")
+}
+
+build.dependsOn makePackXz
+build.dependsOn makePackGz
+build.dependsOn makeExecutables

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,32 +13,35 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl;
 
-import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.utils.JFXUtilities;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.stage.Stage;
-
+import org.jackhuang.hmcl.setting.ConfigHolder;
 import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.Controllers;
-import org.jackhuang.hmcl.upgrade.AppDataUpgrader;
-import org.jackhuang.hmcl.upgrade.IUpgrader;
 import org.jackhuang.hmcl.upgrade.UpdateChecker;
 import org.jackhuang.hmcl.util.*;
+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;
 import java.net.URLClassLoader;
-import java.util.Arrays;
+import java.nio.file.Paths;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
 public final class Launcher extends Application {
 
     @Override
@@ -46,21 +49,25 @@ 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()));
+            }
 
-            UPDATE_CHECKER.process(false)
-                    .then(Task.of(Schedulers.javafx(), () -> {
-                        if (UPDATE_CHECKER.isOutOfDate())
-                            Controllers.showUpdate();
-                    }))
-                    .start();
+            // runLater to ensure ConfigHolder.init() finished initialization
+            Platform.runLater(() -> {
+                // When launcher visibility is set to "hide and reopen" without Platform.implicitExit = false,
+                // Stage.show() cannot work again because JavaFX Toolkit have already shut down.
+                Platform.setImplicitExit(false);
+                Controllers.initialize(primaryStage);
+                primaryStage.setResizable(false);
+                primaryStage.setScene(Controllers.getScene());
 
-            primaryStage.show();
+                UpdateChecker.init();
+
+                primaryStage.show();
+            });
         } catch (Throwable e) {
             CRASH_REPORTER.uncaughtException(Thread.currentThread(), e);
         }
@@ -69,21 +76,17 @@ 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.");
-
         try {
-            Logging.start(LOG_DIRECTORY);
-
-            // NetworkUtils.setUserAgentSupplier(() -> "Hello Minecraft! Launcher");
-            Constants.UI_THREAD_SCHEDULER = Constants.JAVAFX_UI_THREAD_SCHEDULER;
-            UPGRADER.parseArguments(VersionNumber.asVersion(VERSION), Arrays.asList(args));
-
-            Logging.LOG.info("*** " + TITLE + " ***");
-            Logging.LOG.info("Operating System: " + System.getProperty("os.name") + ' ' + OperatingSystem.SYSTEM_VERSION);
-            Logging.LOG.info("Java Version: " + System.getProperty("java.version") + ", " + System.getProperty("java.vendor"));
-            Logging.LOG.info("Java VM Version: " + System.getProperty("java.vm.name") + " (" + System.getProperty("java.vm.info") + "), " + System.getProperty("java.vm.vendor"));
-            Logging.LOG.info("Java Home: " + System.getProperty("java.home"));
+            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: " + 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"));
 
             launch(args);
         } catch (Throwable e) { // Fucking JavaFX will suppress the exception and will break our crash reporter.
@@ -92,7 +95,7 @@ public final class Launcher extends Application {
     }
 
     public static void stopApplication() {
-        Logging.LOG.info("Stopping application.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
+        LOG.info("Stopping application.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
 
         JFXUtilities.runInFX(() -> {
             if (Controllers.getStage() == null)
@@ -106,7 +109,7 @@ public final class Launcher extends Application {
     }
 
     public static void stopWithoutPlatform() {
-        Logging.LOG.info("Stopping application without JavaFX Toolkit.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
+        LOG.info("Stopping application without JavaFX Toolkit.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
 
         JFXUtilities.runInFX(() -> {
             if (Controllers.getStage() == null)
@@ -137,18 +140,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 String VERSION = System.getProperty("hmcl.version.override", "@HELLO_MINECRAFT_LAUNCHER_VERSION_FOR_GRADLE_REPLACING@");
-    public static final String NAME = "HMCL";
-    public static final String TITLE = NAME + " " + VERSION;
-    public static final UpdateChecker UPDATE_CHECKER = new UpdateChecker(VersionNumber.asVersion(VERSION));
-    public static final IUpgrader UPGRADER = new AppDataUpgrader();
     public static final CrashReporter CRASH_REPORTER = new CrashReporter();
-
-    public static final String UPDATE_SERVER = "https://www.huangyuhui.net";
-    public static final String CONTACT = UPDATE_SERVER + "/hmcl.php";
-    public static final String PUBLISH = "http://www.mcbbs.net/thread-142335-1-1.html";
 }

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,13 +13,17 @@
  * 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 static org.jackhuang.hmcl.util.Logging.LOG;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+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.swing.*;
 import java.io.File;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
@@ -27,17 +31,29 @@ import java.security.NoSuchAlgorithmException;
 import java.security.cert.X509Certificate;
 import java.util.logging.Level;
 
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.X509TrustManager;
-import javax.swing.JOptionPane;
+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 final class Main {
 
     public static void main(String[] args) {
+        System.setProperty("java.net.useSystemProxies", "true");
+        System.setProperty("http.agent", "HMCL/" + Metadata.VERSION);
+        System.setProperty("javafx.autoproxy.disable", "true");
+
         checkJavaFX();
         checkDirectoryPath();
-        checkDSTRootCAX3();
+
+        // This environment check will take ~300ms
+        thread(() -> checkDSTRootCAX3(), "CA Certificate Check", true);
+
+        Logging.start(Metadata.HMCL_DIRECTORY.resolve("logs"));
+
+        if (UpdateHandler.processArguments(args)) {
+            return;
+        }
+
         Launcher.main(args);
     }
 
@@ -83,7 +99,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);
@@ -93,7 +109,7 @@ 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);

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

@@ -0,0 +1,42 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl;
+
+import java.nio.file.Path;
+
+import org.jackhuang.hmcl.util.io.JarUtils;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;
+
+/**
+ * Stores metadata about this application.
+ */
+public final class Metadata {
+    private Metadata() {}
+
+    public static final String VERSION = System.getProperty("hmcl.version.override", JarUtils.thisJar().flatMap(JarUtils::getImplementationVersion).orElse("@develop@"));
+    public static final String NAME = "HMCL";
+    public static final String TITLE = NAME + " " + VERSION;
+    
+    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 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/event/OutOfDateEvent.java

@@ -1,53 +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.event;
-
-import org.jackhuang.hmcl.util.ToStringBuilder;
-import org.jackhuang.hmcl.util.VersionNumber;
-
-/**
- *
- * Result: Deny if do not upgrade HMCL.
- *
- * @author huangyuhui
- */
-public final class OutOfDateEvent extends Event {
-    private final VersionNumber version;
-
-    public OutOfDateEvent(Object source, VersionNumber version) {
-        super(source);
-        this.version = version;
-    }
-
-    public VersionNumber getVersion() {
-        return version;
-    }
-
-    @Override
-    public boolean hasResult() {
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this)
-                .append("source", getSource())
-                .append("version", getVersion())
-                .toString();
-    }
-}

HMCL/src/main/java/org/jackhuang/hmcl/event/ProfileChangedEvent.java

@@ -1,55 +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.event;
-
-import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.util.ToStringBuilder;
-
-/**
- * This event gets fired when the selected profile changed.
- * <br>
- * This event is fired on the {@link org.jackhuang.hmcl.event.EventBus#EVENT_BUS}
- * @author huangyuhui
- */
-public final class ProfileChangedEvent extends Event {
-    private final Profile profile;
-
-    /**
-     * Constructor.
-     *
-     * @param source {@link org.jackhuang.hmcl.setting.Settings}
-     * @param profile the new profile.
-     */
-    public ProfileChangedEvent(Object source, Profile profile) {
-        super(source);
-
-        this.profile = profile;
-    }
-
-    public Profile getProfile() {
-        return profile;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this)
-                .append("source", source)
-                .append("profile", profile)
-                .toString();
-    }
-}

HMCL/src/main/java/org/jackhuang/hmcl/event/ProfileLoadingEvent.java

@@ -1,60 +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.event;
-
-import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.util.ToStringBuilder;
-
-import java.util.Collection;
-import java.util.Collections;
-
-/**
- * This event gets fired when loading profiles.
- * <br>
- * This event is fired on the {@link org.jackhuang.hmcl.event.EventBus#EVENT_BUS}
- *
- * @author huangyuhui
- */
-public class ProfileLoadingEvent extends Event {
-
-    private final Collection<Profile> profiles;
-
-    /**
-     * Constructor.
-     *
-     * @param source {@link org.jackhuang.hmcl.setting.Settings}
-     */
-    public ProfileLoadingEvent(Object source, Collection<Profile> profiles) {
-        super(source);
-
-        this.profiles = Collections.unmodifiableCollection(profiles);
-    }
-
-    public Collection<Profile> getProfiles() {
-        return profiles;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this)
-                .append("source", source)
-                .append("profiles", profiles)
-                .toString();
-    }
-}
-

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

@@ -1,180 +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) {
-            this(account, false);
-        }
-
-        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

@@ -0,0 +1,47 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.game;
+
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import org.jackhuang.hmcl.download.DefaultCacheRepository;
+
+import java.nio.file.Paths;
+
+public class HMCLCacheRepository extends DefaultCacheRepository {
+
+    private final StringProperty directory = new SimpleStringProperty();
+
+    public HMCLCacheRepository() {
+        directory.addListener((a, b, t) -> changeDirectory(Paths.get(t)));
+    }
+
+    public String getDirectory() {
+        return directory.get();
+    }
+
+    public StringProperty directoryProperty() {
+        return directory;
+    }
+
+    public void setDirectory(String directory) {
+        this.directory.set(directory);
+    }
+
+    public static final HMCLCacheRepository REPOSITORY = new HMCLCacheRepository();
+}

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

@@ -1,41 +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 org.jackhuang.hmcl.download.DefaultDependencyManager;
-import org.jackhuang.hmcl.download.DownloadProvider;
-import org.jackhuang.hmcl.download.GameBuilder;
-import org.jackhuang.hmcl.setting.Profile;
-
-/**
- * @author huangyuhui
- */
-public class HMCLDependencyManager extends DefaultDependencyManager {
-    private final Profile profile;
-
-    public HMCLDependencyManager(Profile profile, DownloadProvider downloadProvider) {
-        super(profile.getRepository(), downloadProvider);
-
-        this.profile = profile;
-    }
-
-    @Override
-    public GameBuilder gameBuilder() {
-        return new HMCLGameBuilder(profile);
-    }
-}

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

@@ -1,40 +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 org.jackhuang.hmcl.download.DefaultGameBuilder;
-import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.task.Task;
-
-/**
- * @author huangyuhui
- */
-public class HMCLGameBuilder extends DefaultGameBuilder {
-    private final Profile profile;
-
-    public HMCLGameBuilder(Profile profile) {
-        super(profile.getDependency());
-
-        this.profile = profile;
-    }
-
-    @Override
-    protected Task downloadGameAsync(String gameVersion, Version version) {
-        return new HMCLGameDownloadTask(profile, gameVersion, version);
-    }
-}

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

@@ -1,84 +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 org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.setting.Settings;
-import org.jackhuang.hmcl.task.FileDownloadTask;
-import org.jackhuang.hmcl.task.FileDownloadTask.IntegrityCheck;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.util.FileUtils;
-import org.jackhuang.hmcl.util.Logging;
-import org.jackhuang.hmcl.util.NetworkUtils;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Optional;
-import java.util.logging.Level;
-
-import static org.jackhuang.hmcl.setting.ConfigHolder.CONFIG;
-
-/**
- * @author huangyuhui
- */
-public class HMCLGameDownloadTask extends Task {
-    private final Profile profile;
-    private final String gameVersion;
-    private final Version version;
-    private final List<Task> dependencies = new LinkedList<>();
-
-    public HMCLGameDownloadTask(Profile profile, String gameVersion, Version version) {
-        this.profile = profile;
-        this.gameVersion = gameVersion;
-        this.version = version;
-
-        setSignificance(TaskSignificance.MINOR);
-    }
-
-    @Override
-    public List<Task> getDependencies() {
-        return dependencies;
-    }
-
-    @Override
-    public void execute() {
-        File jar = profile.getRepository().getVersionJar(version);
-
-        // Force using common directory will not affect the behaviour that repository acts
-        // Since we always copy the downloaded jar to .minecraft/versions/<version>/
-        File cache = new File(Optional.ofNullable(Settings.INSTANCE.getCommonDirectory())
-                .orElse(Settings.getDefaultCommonDirectory()),
-                "jars/" + gameVersion + ".jar");
-        if (cache.exists())
-            try {
-                FileUtils.copyFile(cache, jar);
-                return;
-            } catch (IOException e) {
-                Logging.LOG.log(Level.SEVERE, "Unable to copy cached Minecraft jar from " + cache + " to " + jar, e);
-            }
-
-        dependencies.add(new FileDownloadTask(
-                NetworkUtils.toURL(profile.getDependency().getDownloadProvider().injectURL(version.getDownloadInfo().getUrl())),
-                cache,
-                new IntegrityCheck("SHA-1", version.getDownloadInfo().getSha1())
-        ).then(Task.of(v -> FileUtils.copyFile(cache, jar))));
-    }
-
-}

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,17 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.game;
 
-import org.jackhuang.hmcl.Launcher;
+import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.auth.AuthInfo;
 import org.jackhuang.hmcl.launch.DefaultLauncher;
 import org.jackhuang.hmcl.launch.ProcessListener;
-import org.jackhuang.hmcl.util.CommandBuilder;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -46,8 +44,8 @@ public final class HMCLGameLauncher extends DefaultLauncher {
     @Override
     protected Map<String, String> getConfigurations() {
         Map<String, String> res = super.getConfigurations();
-        res.put("${launcher_name}", Launcher.NAME);
-        res.put("${launcher_version}", Launcher.VERSION);
+        res.put("${launcher_name}", Metadata.NAME);
+        res.put("${launcher_version}", Metadata.VERSION);
         return res;
     }
 }

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,29 +13,24 @@
  * 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 javafx.scene.image.Image;
 import org.jackhuang.hmcl.setting.EnumGameDirectory;
 import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.setting.VersionSetting;
-import org.jackhuang.hmcl.util.FileUtils;
 import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.io.FileUtils;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
 import java.util.logging.Level;
 
-import static org.jackhuang.hmcl.setting.ConfigHolder.CONFIG;
-
 public class HMCLGameRepository extends DefaultGameRepository {
     private final Profile profile;
     private final Map<String, VersionSetting> versionSettings = new HashMap<>();
@@ -52,18 +47,6 @@ public class HMCLGameRepository extends DefaultGameRepository {
         return profile;
     }
 
-    private boolean useSelf(String assetId) {
-        return new File(getBaseDirectory(), "assets/indexes/" + assetId + ".json").exists();
-    }
-
-    @Override
-    public File getAssetDirectory(String version, String assetId) {
-        if (Settings.INSTANCE.isCommonDirectoryDisabled() || useSelf(assetId))
-            return super.getAssetDirectory(version, assetId);
-        else
-            return new File(Settings.INSTANCE.getCommonDirectory(), "assets");
-    }
-
     @Override
     public File getRunDirectory(String id) {
         if (beingModpackVersions.contains(id) || isModpack(id))
@@ -79,17 +62,6 @@ public class HMCLGameRepository extends DefaultGameRepository {
         }
     }
 
-    @Override
-    public File getLibraryFile(Version version, Library lib) {
-        VersionSetting vs = profile.getVersionSetting(version.getId());
-        File self = super.getLibraryFile(version, lib);
-        if (Settings.INSTANCE.isCommonDirectoryDisabled() || self.exists())
-            return self;
-        else
-            return new File(Settings.INSTANCE.getCommonDirectory(), "libraries/" + lib.getPath());
-    }
-
-
     @Override
     protected void refreshVersionsImpl() {
         versionSettings.clear();
@@ -105,18 +77,21 @@ 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 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));
+    }
+
     private File getVersionSettingFile(String id) {
         return new File(getVersionRoot(id), "hmclversion.cfg");
     }
@@ -169,10 +144,26 @@ public class HMCLGameRepository extends DefaultGameRepository {
         return setting;
     }
 
-    public File getVersionIcon(String id) {
+    public File getVersionIconFile(String id) {
         return new File(getVersionRoot(id), "icon.png");
     }
 
+    public Image getVersionIconImage(String id) {
+        if (id == null || !isLoaded())
+            return new Image("/assets/img/grass.png");
+
+        Version version = getVersion(id);
+        File iconFile = getVersionIconFile(id);
+        if (iconFile.exists())
+            return new Image("file:" + iconFile.getAbsolutePath());
+        else if ("net.minecraft.launchwrapper.Launch".equals(version.getMainClass()))
+            return new Image("/assets/img/furnace.png");
+        else if ("cpw.mods.modlauncher.Launcher".equals(version.getMainClass()))
+            return new Image("/assets/img/furnace.png");
+        else
+            return new Image("/assets/img/grass.png");
+    }
+
     public boolean saveVersionSetting(String id) {
         if (!versionSettings.containsKey(id))
             return false;
@@ -189,6 +180,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 = getVersionSetting(id);
+        if (vs == null)
+            vs = createVersionSetting(id);
+        if (vs == null)
+            return null;
+        vs.setUsesGlobal(false);
+        return vs;
+    }
+
+    public void globalizeVersionSetting(String id) {
+        VersionSetting vs = getVersionSetting(id);
+        if (vs != null)
+            vs.setUsesGlobal(true);
+    }
+
     public boolean forbidsVersion(String id) {
         return FORBIDDEN.contains(id);
     }
@@ -206,8 +218,8 @@ public class HMCLGameRepository extends DefaultGameRepository {
         beingModpackVersions.remove(id);
     }
 
-    private static final Gson GSON = new GsonBuilder().setPrettyPrinting()
-            .registerTypeAdapter(VersionSetting.class, VersionSetting.Serializer.INSTANCE)
+    private static final Gson GSON = new GsonBuilder()
+            .setPrettyPrinting()
             .create();
 
     private static final HashSet<String> FORBIDDEN = new HashSet<>(Arrays.asList("modpack", "minecraftinstance", "manifest"));

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,16 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.game;
 
-
 import org.jackhuang.hmcl.mod.Modpack;
-import org.jackhuang.hmcl.task.TaskResult;
-import org.jackhuang.hmcl.util.Constants;
+import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.util.Logging;
-import org.jackhuang.hmcl.util.ZipEngine;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
+import org.jackhuang.hmcl.util.io.Zipper;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -31,67 +30,53 @@ import java.util.List;
 /**
  * Export the game to a mod pack file.
  */
-public class HMCLModpackExportTask extends TaskResult<ZipEngine> {
+public class HMCLModpackExportTask extends Task<Void> {
     private final DefaultGameRepository repository;
     private final String version;
     private final List<String> whitelist;
     private final Modpack modpack;
     private final File output;
-    private final String id;
-
-    public HMCLModpackExportTask(DefaultGameRepository repository, String version, List<String> whitelist, Modpack modpack, File output) {
-        this(repository, version, whitelist, modpack, output, ID);
-    }
 
     /**
      * @param output  mod pack file.
      * @param version to locate version.json
      */
-    public HMCLModpackExportTask(DefaultGameRepository repository, String version, List<String> whitelist, Modpack modpack, File output, String id) {
+    public HMCLModpackExportTask(DefaultGameRepository repository, String version, List<String> whitelist, Modpack modpack, File output) {
         this.repository = repository;
         this.version = version;
         this.whitelist = whitelist;
         this.modpack = modpack;
         this.output = output;
-        this.id = id;
 
         onDone().register(event -> {
             if (event.isFailed()) output.delete();
         });
     }
 
-    @Override
-    public String getId() {
-        return id;
-    }
-
     @Override
     public void execute() throws Exception {
         ArrayList<String> blackList = new ArrayList<>(HMCLModpackManager.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 (ZipEngine zip = new ZipEngine(output)) {
-            zip.putDirectory(repository.getRunDirectory(version), (String pathName, Boolean isDirectory) -> {
+        try (Zipper zip = new Zipper(output.toPath())) {
+            zip.putDirectory(repository.getRunDirectory(version).toPath(), "minecraft", path -> {
+                if (path.isEmpty())
+                    return true;
                 for (String s : blackList)
-                    if (isDirectory) {
-                        if (pathName.startsWith(s + "/"))
-                            return null;
-                    } else if (pathName.equals(s))
-                        return null;
+                    if (path.equals(s))
+                        return false;
                 for (String s : whitelist)
-                    if (pathName.equals(s + (isDirectory ? "/" : "")))
-                        return "minecraft/" + pathName;
-                return null;
+                    if (path.equals(s))
+                        return true;
+                return false;
             });
 
             Version mv = repository.getResolvedVersion(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.
+            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.
         }
     }
-
-    public static final String ID = "zip_engine";
 }

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.game;
 
@@ -27,23 +27,22 @@ 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.Objects;
 
-public final class HMCLModpackInstallTask extends Task {
+public final class HMCLModpackInstallTask extends Task<Void> {
     private final File zipFile;
     private final String name;
     private final HMCLGameRepository repository;
     private final Modpack modpack;
-    private final List<Task> dependencies = new LinkedList<>();
-    private final List<Task> dependents = new LinkedList<>();
+    private final List<Task<?>> dependencies = new LinkedList<>();
+    private final List<Task<?>> dependents = new LinkedList<>();
 
     public HMCLModpackInstallTask(Profile profile, File zipFile, Modpack modpack, String name) {
         DependencyManager dependency = profile.getDependency();
@@ -66,7 +65,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()))
@@ -74,25 +73,25 @@ public final class HMCLModpackInstallTask extends Task {
             }
         } catch (JsonParseException | IOException ignore) {
         }
-        dependents.add(new ModpackInstallTask<>(zipFile, run, "minecraft/", it -> !Objects.equals(it, "minecraft/pack.json"), 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).setJar(null);
+        Version version = JsonUtils.GSON.fromJson(json, Version.class).setId(name).setJar(null);
         dependencies.add(new VersionJsonSaveTask(repository, version));
-        dependencies.add(new MinecraftInstanceTask<>(zipFile, "minecraft/", modpack, MODPACK_TYPE, repository.getModpackConfiguration(name)));
+        dependencies.add(new MinecraftInstanceTask<>(zipFile, modpack.getEncoding(), "/minecraft", modpack, MODPACK_TYPE, repository.getModpackConfiguration(name)));
     }
 
     public static final String MODPACK_TYPE = "HMCL";

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,19 +13,20 @@
  * 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.nio.charset.Charset;
+import java.nio.file.Path;
 import java.util.List;
 
 /**
@@ -36,10 +37,10 @@ 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
+            "pack.json", "launcher.jar", "hmclmc.log", "cache", // HMCL
             "manifest.json", "minecraftinstance.json", ".curseclient", // Curse
             "minetweaker.log", // Mods
-            "logs", "versions", "assets", "libraries", "crash-reports", "NVIDIA", "AMD", "screenshots", "natives", "native", "$native", "server-resource-packs", // Minecraft
+            "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
     );
@@ -75,14 +76,15 @@ public final class HMCLModpackManager {
      * Read the manifest in a HMCL modpack.
      *
      * @param file a HMCL modpack file.
+     * @param encoding encoding of modpack zip file.
      * @throws IOException if the file is not a valid zip file.
      * @throws JsonParseException if the manifest.json is missing or malformed.
      * @return the manifest of HMCL modpack.
      */
-    public static Modpack readHMCLModpackManifest(File file) throws IOException, JsonParseException {
-        String manifestJson = CompressingUtils.readTextZipEntry(file, "modpack.json");
-        Modpack manifest = JsonUtils.fromNonNullJson(manifestJson, Modpack.class);
-        String gameJson = CompressingUtils.readTextZipEntry(file, "minecraft/pack.json");
+    public static Modpack readHMCLModpackManifest(Path file, Charset encoding) throws IOException, JsonParseException {
+        String manifestJson = CompressingUtils.readTextZipEntry(file, "modpack.json", encoding);
+        Modpack manifest = JsonUtils.fromNonNullJson(manifestJson, Modpack.class).setEncoding(encoding);
+        String gameJson = CompressingUtils.readTextZipEntry(file, "minecraft/pack.json", encoding);
         Version game = JsonUtils.fromNonNullJson(gameJson, Version.class);
         if (game.getJar() == null)
             if (StringUtils.isBlank(manifest.getVersion()))

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.game;
 

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.game;
 
@@ -32,71 +32,104 @@ import org.jackhuang.hmcl.mod.CurseCompletionTask;
 import org.jackhuang.hmcl.mod.ModpackConfiguration;
 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.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.Log4jLevel;
+import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.Pair;
+import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.function.ExceptionalSupplier;
+import org.jackhuang.hmcl.util.gson.UUIDTypeAdapter;
+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.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();
+    }
+
     private final TaskExecutorDialogPane launchingStepsPane = new TaskExecutorDialogPane(it -> {});
 
-    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);
         Optional<String> gameVersion = GameVersion.minecraftVersion(repository.getVersionJar(version));
 
-        TaskExecutor executor = Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.DEPENDENCIES))
-                .then(variables -> {
+        TaskExecutor executor = Task.runAsync(Schedulers.javafx(), () -> emitStatus(LoadingState.DEPENDENCIES))
+                .thenCompose(() -> {
                     if (setting.isNotCheckGame())
                         return null;
                     else
                         return dependencyManager.checkGameCompletionAsync(version);
                 })
-                .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.MODS)))
-                .then(var -> {
+                .thenRun(Schedulers.javafx(), () -> emitStatus(LoadingState.MODS))
+                .thenCompose(() -> {
                     try {
                         ModpackConfiguration<?> configuration = ModpackHelper.readModpackConfiguration(repository.getModpackConfiguration(selectedVersion));
                         if ("Curse".equals(configuration.getType()))
@@ -107,66 +140,66 @@ public final class LauncherHelper {
                         return null;
                     }
                 })
-                .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.LOGGING_IN)))
-                .then(Task.of(i18n("account.methods"), variables -> {
+                .thenRun(Schedulers.javafx(), () -> emitStatus(LoadingState.LOGGING_IN))
+                .thenSupply(i18n("account.methods"), () -> {
                     try {
-                        variables.set("account", account.logIn());
+                        return account.logIn();
                     } catch (CredentialExpiredException e) {
-                        variables.set("account", DialogController.logIn(account));
+                        LOG.info("Credential has expired: " + e);
+                        return DialogController.logIn(account);
                     } catch (AuthenticationException e) {
-                        variables.set("account",
-                                account.playOffline().orElseThrow(() -> e));
+                        LOG.warning("Authentication failed, try playing offline: " + e);
+                        return account.playOffline().orElseThrow(() -> e);
                     }
-                }))
-                .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.LAUNCHING)))
-                .then(Task.of(variables -> {
-                    variables.set("launcher", new HMCLGameLauncher(
-                            repository,
-                            selectedVersion,
-                            variables.get("account"),
-                            setting.toLaunchOptions(profile.getGameDir()),
-                            setting.getLauncherVisibility() == LauncherVisibility.CLOSE
-                                    ? null // Unnecessary to start listening to game process output when close launcher immediately after game launched.
-                                    : new HMCLProcessListener(variables.get("account"), setting, gameVersion.isPresent())
-                    ));
-                }))
-                .then(variables -> {
-                    DefaultLauncher launcher = variables.get("launcher");
+                })
+                .thenApply(Schedulers.javafx(), authInfo -> {
+                    emitStatus(LoadingState.LAUNCHING);
+                    return authInfo;
+                })
+                .thenApply(authInfo -> new HMCLGameLauncher(
+                        repository,
+                        selectedVersion,
+                        authInfo,
+                        setting.toLaunchOptions(profile.getGameDir()),
+                        launcherVisibility == LauncherVisibility.CLOSE
+                                ? null // Unnecessary to start listening to game process output when close launcher immediately after game launched.
+                                : new HMCLProcessListener(authInfo, gameVersion.isPresent())
+                ))
+                .thenCompose(launcher -> { // launcher is prev task's result
                     if (scriptFile == null) {
                         return new LaunchTask<>(launcher::launch).setName(i18n("version.launch"));
                     } else {
-                        return new LaunchTask<>(() -> {
+                        return new LaunchTask<ManagedProcess>(() -> {
                             launcher.makeLaunchScript(scriptFile);
                             return null;
                         }).setName(i18n("version.launch_script"));
                     }
                 })
-                .then(Task.of(variables -> {
+                .thenAccept(process -> { // process is LaunchTask's result
                     if (scriptFile == null) {
-                        ManagedProcess process = variables.get(LaunchTask.LAUNCH_ID);
                         PROCESSES.add(process);
-                        if (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);
+        launchingStepsPane.setExecutor(executor, false);
         executor.addTaskListener(new TaskListener() {
             final AtomicInteger finished = new AtomicInteger(0);
 
             @Override
-            public void onFinished(Task task) {
+            public void onFinished(Task<?> task) {
                 finished.incrementAndGet();
                 int runningTasks = executor.getRunningTasks();
                 Platform.runLater(() -> launchingStepsPane.setProgress(1.0 * finished.get() / runningTasks));
@@ -180,11 +213,14 @@ public final class LauncherHelper {
                         // because onStop will be invoked if tasks fail when the executor service shut down.
                         if (!Controllers.isStopped()) {
                             launchingStepsPane.fireEvent(new DialogCloseEvent());
-                            Exception ex = executor.getLastException();
+                            Exception ex = executor.getException();
                             if (ex != null) {
                                 String message;
                                 if (ex instanceof CurseCompletionException) {
-                                    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) {
@@ -198,7 +234,7 @@ public final class LauncherHelper {
                                 }
                                 Controllers.dialog(message,
                                         scriptFile == null ? i18n("launch.failed") : i18n("version.launch_script.failed"),
-                                        MessageBox.ERROR_MESSAGE);
+                                        MessageType.ERROR);
                             }
                         }
                     });
@@ -211,65 +247,145 @@ 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;
 
         // Without onAccept called, the launching operation will be terminated.
 
         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.error"), 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();
             flag = true;
         }
 
-        if (!flag && java.getParsedVersion() < JavaVersion.JAVA_8) {
-            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);
+        // 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.getJavas().stream()
+                    .filter(javaVersion -> javaVersion.getParsedVersion() >= JavaVersion.JAVA_8)
+                    .max(Comparator.comparing(JavaVersion::getVersionNumber));
+            if (java8.isPresent()) {
+                newJavaRequired = true;
+                setting.setJavaVersion(java8.get());
             } else {
-                // Most mods require Java 8 or later version.
-                Controllers.dialog(i18n("launch.advice.newer_java"), i18n("message.error"), MessageBox.WARNING_MESSAGE, onAccept);
+                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"), MessageType.ERROR, null);
+                } else {
+                    // Most mods require Java 8 or later version.
+                    Controllers.dialog(i18n("launch.advice.newer_java"), i18n("message.warning"), MessageType.WARNING, onAccept);
+                }
+                flag = true;
             }
-            flag = true;
         }
 
-        // LaunchWrapper will crash because of assuming the system class loader is an instance of URLClassLoader.
-        // cpw has claimed that he will make MinecraftForge of 1.13 and later versions able to run on Java 9.
-        if (!flag && java.getParsedVersion() >= JavaVersion.JAVA_9 && gameVersion.compareTo(VersionNumber.asVersion("1.12.5")) < 0 && version.getMainClass().contains("launchwrapper")) {
-            Controllers.dialog(i18n("launch.advice.java9"), i18n("message.error"), MessageBox.ERROR_MESSAGE, null);
-            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
+                && 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.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") + "\n" + i18n("launch.advice.uncorrected"), i18n("message.error"), MessageType.ERROR, null);
+                flag = true;
+            }
         }
 
-        if (!flag && java.getPlatform() == org.jackhuang.hmcl.util.Platform.BIT_32 &&
-                org.jackhuang.hmcl.util.Platform.IS_64_BIT) {
-            Controllers.dialog(i18n("launch.advice.different_platform"), i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
-            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");
+        if (!flag && gameVersion.compareTo(VersionNumber.asVersion("1.13")) >= 0 && java.getParsedVersion() == JavaVersion.JAVA_8 && java.getVersionNumber().compareTo(JAVA_8) < 0) {
+            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"), MessageType.WARNING, onAccept);
+                flag = true;
+            }
         }
-        if (!flag && java.getPlatform() == org.jackhuang.hmcl.util.Platform.BIT_32 &&
+
+        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.getJavas().stream()
+                    .filter(javaVersion -> javaVersion.getPlatform() == org.jackhuang.hmcl.util.platform.Platform.PLATFORM)
+                    .filter(javaVersion -> javaVersion.getParsedVersion() == java32.getParsedVersion())
+                    .max(Comparator.comparing(JavaVersion::getVersionNumber));
+
+            if (!java64.isPresent()) {
+                final boolean java8requiredFinal = java8required, newJavaRequiredFinal = newJavaRequired;
+
+                // Then find if other java version which satisfies requirements installed.
+                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;
+                            return true;
+                        })
+                        .max(Comparator.comparing(JavaVersion::getVersionNumber));
+            }
+
+            if (java64.isPresent()) {
+                setting.setJavaVersion(java64.get());
+            } else {
+                Controllers.dialog(i18n("launch.advice.different_platform"), i18n("message.error"), MessageType.ERROR, onAccept);
+                flag = true;
+            }
+        }
+
+        // 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());
@@ -279,8 +395,8 @@ public final class LauncherHelper {
         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);
                 break;
@@ -300,7 +416,7 @@ public final class LauncherHelper {
         }
     }
 
-    private static class LaunchTask<T> extends TaskResult<T> {
+    private static class LaunchTask<T> extends Task<T> {
         private final ExceptionalSupplier<T, Exception> supplier;
 
         public LaunchTask(ExceptionalSupplier<T, Exception> supplier) {
@@ -311,13 +427,6 @@ public final class LauncherHelper {
         public void execute() throws Exception {
             setResult(supplier.get());
         }
-
-        @Override
-        public String getId() {
-            return LAUNCH_ID;
-        }
-
-        static final String LAUNCH_ID = "launch";
     }
 
     /**
@@ -327,9 +436,7 @@ public final class LauncherHelper {
      */
     class HMCLProcessListener implements ProcessListener {
 
-        private final VersionSetting setting;
         private final Map<String, String> forbiddenTokens;
-        private final LauncherVisibility visibility;
         private ManagedProcess process;
         private boolean lwjgl;
         private LogWindow logWindow;
@@ -337,8 +444,7 @@ public final class LauncherHelper {
         private final LinkedList<Pair<String, Log4jLevel>> logs;
         private final CountDownLatch latch = new CountDownLatch(1);
 
-        public HMCLProcessListener(AuthInfo authInfo, VersionSetting setting, boolean detectWindow) {
-            this.setting = setting;
+        public HMCLProcessListener(AuthInfo authInfo, boolean detectWindow) {
             this.detectWindow = detectWindow;
 
             if (authInfo == null)
@@ -350,7 +456,6 @@ public final class LauncherHelper {
                         pair(authInfo.getUsername(), "<player>")
                 );
 
-            visibility = setting.getLauncherVisibility();
             logs = new LinkedList<>();
         }
 
@@ -358,7 +463,7 @@ public final class LauncherHelper {
         public void setProcess(ManagedProcess process) {
             this.process = process;
 
-            if (setting.isShowLogs())
+            if (showLogs)
                 Platform.runLater(() -> {
                     logWindow = new LogWindow();
                     logWindow.show();
@@ -366,6 +471,39 @@ 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();
+                            emitStatus(LoadingState.DONE);
+                        }
+                    });
+                    break;
+                case CLOSE:
+                    // Never come to here.
+                    break;
+                case KEEP:
+                    Platform.runLater(() -> {
+                        emitStatus(LoadingState.DONE);
+                    });
+                    break;
+                case HIDE:
+                    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();
+                            emitStatus(LoadingState.DONE);
+                        }
+                    });
+                    break;
+            }
+        }
+
         @Override
         public synchronized void onLog(String log, Log4jLevel level) {
             String newLog = log;
@@ -378,42 +516,24 @@ public final class LauncherHelper {
                 System.out.print(log);
 
             logs.add(pair(log, level));
-            if (logs.size() > Settings.INSTANCE.getLogLines())
+            if (logs.size() > config().getLogLines())
                 logs.removeFirst();
 
-            if (setting.isShowLogs()) {
-                Lang.invoke(() -> {
+            if (showLogs) {
+                try {
                     latch.await();
                     logWindow.waitForLoaded();
-                });
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    return;
+                }
 
                 Platform.runLater(() -> logWindow.logLine(log, level));
             }
 
-            if (!lwjgl && log.contains("LWJGL Version: ") || !detectWindow) {
+            if (!lwjgl && (log.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();
             }
         }
 
@@ -422,6 +542,9 @@ public final class LauncherHelper {
             if (exitType == ExitType.INTERRUPTED)
                 return;
 
+            // Game crashed before opening the game window.
+            if (!lwjgl) finishLaunch();
+
             if (exitType != ExitType.NORMAL && logWindow == null)
                 Platform.runLater(() -> {
                     logWindow = new LogWindow();
@@ -443,8 +566,14 @@ public final class LauncherHelper {
                     });
                 });
 
-            checkExit(visibility);
+            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) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.game;
 

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.game;
 

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.game;
 
@@ -23,35 +23,39 @@ import org.jackhuang.hmcl.mod.*;
 import org.jackhuang.hmcl.setting.EnumGameDirectory;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.VersionSetting;
-import org.jackhuang.hmcl.task.FinalizedCallback;
+import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.util.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.
         }
@@ -64,7 +68,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,49 +86,60 @@ public final class ModpackHelper {
             throw new UnsupportedModpackException();
     }
 
-    public static Task getInstallTask(Profile profile, File zipFile, String name, Modpack modpack) {
+    public static Task<Void> getInstallTask(Profile profile, File zipFile, String name, Modpack modpack) {
         profile.getRepository().markVersionAsModpack(name);
 
-        FinalizedCallback finalizeTask = (variables, isDependentsSucceeded) -> {
-            profile.getRepository().refreshVersions();
-            VersionSetting vs = profile.specializeVersionSetting(name);
-            profile.getRepository().undoMark(name);
+        ExceptionalRunnable<?> success = () -> {
+            HMCLGameRepository repository = profile.getRepository();
+            repository.refreshVersions();
+            VersionSetting vs = repository.specializeVersionSetting(name);
+            repository.undoMark(name);
             if (vs != null)
                 vs.setGameDirType(EnumGameDirectory.VERSION_FOLDER);
         };
 
+        ExceptionalConsumer<Exception, ?> failure = ex -> {
+            if (ex instanceof CurseCompletionException && !(ex.getCause() instanceof FileNotFoundException)) {
+                success.run();
+                // This is tolerable and we will not delete the game
+            } else {
+                HMCLGameRepository repository = profile.getRepository();
+                repository.removeVersionFromDisk(name);
+            }
+        };
+
         if (modpack.getManifest() instanceof CurseManifest)
-            return new CurseInstallTask(profile.getDependency(), zipFile, ((CurseManifest) modpack.getManifest()), name)
-                    .finalized(finalizeTask);
+            return new CurseInstallTask(profile.getDependency(), zipFile, modpack, ((CurseManifest) modpack.getManifest()), name)
+                    .whenComplete(Schedulers.defaultScheduler(), success, failure);
         else if (modpack.getManifest() instanceof HMCLModpackManifest)
             return new HMCLModpackInstallTask(profile, zipFile, modpack, name)
-                    .finalized(finalizeTask);
+                    .whenComplete(Schedulers.defaultScheduler(), success, failure);
         else if (modpack.getManifest() instanceof MultiMCInstanceConfiguration)
-            return new MultiMCModpackInstallTask(profile.getDependency(), zipFile, ((MultiMCInstanceConfiguration) modpack.getManifest()), name)
-                    .finalized(finalizeTask)
-                    .with(new MultiMCInstallVersionSettingTask(profile, ((MultiMCInstanceConfiguration) modpack.getManifest()), name));
+            return new MultiMCModpackInstallTask(profile.getDependency(), zipFile, modpack, ((MultiMCInstanceConfiguration) modpack.getManifest()), name)
+                    .whenComplete(Schedulers.defaultScheduler(), success, failure)
+                    .thenCompose(new MultiMCInstallVersionSettingTask(profile, ((MultiMCInstanceConfiguration) modpack.getManifest()), name));
         else throw new IllegalStateException("Unrecognized modpack: " + modpack);
     }
 
-    public static Task getUpdateTask(Profile profile, File zipFile, String name, ModpackConfiguration<?> configuration) throws UnsupportedModpackException, MismatchedModpackTypeException {
-        Modpack modpack = ModpackHelper.readModpackManifest(zipFile);
+    public static Task<Void> getUpdateTask(Profile profile, File zipFile, Charset charset, String name, ModpackConfiguration<?> configuration) throws UnsupportedModpackException, MismatchedModpackTypeException {
+        Modpack modpack = ModpackHelper.readModpackManifest(zipFile.toPath(), charset);
 
         switch (configuration.getType()) {
             case CurseInstallTask.MODPACK_TYPE:
                 if (!(modpack.getManifest() instanceof CurseManifest))
                     throw new MismatchedModpackTypeException(CurseInstallTask.MODPACK_TYPE, getManifestType(modpack.getManifest()));
 
-                return new CurseInstallTask(profile.getDependency(), zipFile, (CurseManifest) modpack.getManifest(), name);
+                return new ModpackUpdateTask(profile.getRepository(), name, new CurseInstallTask(profile.getDependency(), zipFile, modpack, (CurseManifest) modpack.getManifest(), name));
             case MultiMCModpackInstallTask.MODPACK_TYPE:
                 if (!(modpack.getManifest() instanceof MultiMCInstanceConfiguration))
                     throw new MismatchedModpackTypeException(MultiMCModpackInstallTask.MODPACK_TYPE, getManifestType(modpack.getManifest()));
 
-                return new MultiMCModpackInstallTask(profile.getDependency(), zipFile, (MultiMCInstanceConfiguration) modpack.getManifest(), name);
+                return new ModpackUpdateTask(profile.getRepository(), name, new MultiMCModpackInstallTask(profile.getDependency(), zipFile, modpack, (MultiMCInstanceConfiguration) modpack.getManifest(), name));
             case HMCLModpackInstallTask.MODPACK_TYPE:
                 if (!(modpack.getManifest() instanceof HMCLModpackManifest))
                     throw new MismatchedModpackTypeException(HMCLModpackInstallTask.MODPACK_TYPE, getManifestType(modpack.getManifest()));
 
-                return new HMCLModpackInstallTask(profile, zipFile, modpack, name);
+                return new ModpackUpdateTask(profile.getRepository(), name, new HMCLModpackInstallTask(profile, zipFile, modpack, name));
             default:
                 throw new UnsupportedModpackException();
         }

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,20 +13,19 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.game;
 
 import org.jackhuang.hmcl.mod.MultiMCInstanceConfiguration;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.VersionSetting;
-import org.jackhuang.hmcl.task.Scheduler;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 
 import java.util.Objects;
 
-public final class MultiMCInstallVersionSettingTask extends Task {
+public final class MultiMCInstallVersionSettingTask extends Task<Void> {
     private final Profile profile;
     private final MultiMCInstanceConfiguration manifest;
     private final String version;
@@ -35,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,221 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.game;
+
+import static java.util.Collections.emptyMap;
+import static java.util.Collections.singletonMap;
+import static java.util.Objects.requireNonNull;
+import static org.jackhuang.hmcl.util.Lang.threadPool;
+import static org.jackhuang.hmcl.util.Logging.LOG;
+
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UncheckedIOException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.EnumMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+
+import javax.imageio.ImageIO;
+
+import org.jackhuang.hmcl.Metadata;
+import org.jackhuang.hmcl.auth.Account;
+import org.jackhuang.hmcl.auth.ServerResponseMalformedException;
+import org.jackhuang.hmcl.auth.yggdrasil.Texture;
+import org.jackhuang.hmcl.auth.yggdrasil.TextureModel;
+import org.jackhuang.hmcl.auth.yggdrasil.TextureType;
+import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
+import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilService;
+import org.jackhuang.hmcl.task.FileDownloadTask;
+import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.javafx.BindingMapping;
+
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.ObjectBinding;
+import javafx.embed.swing.SwingFXUtils;
+import javafx.scene.image.Image;
+
+/**
+ * @author yushijinhun
+ */
+public final class TexturesLoader {
+
+    private TexturesLoader() {
+    }
+
+    // ==== Texture Loading ====
+    public static class LoadedTexture {
+        private final BufferedImage image;
+        private final Map<String, String> metadata;
+
+        public LoadedTexture(BufferedImage image, Map<String, String> metadata) {
+            this.image = requireNonNull(image);
+            this.metadata = requireNonNull(metadata);
+        }
+
+        public BufferedImage getImage() {
+            return image;
+        }
+
+        public Map<String, String> getMetadata() {
+            return metadata;
+        }
+    }
+
+    private static final ThreadPoolExecutor POOL = threadPool("TexturesDownload", true, 2, 10, TimeUnit.SECONDS);
+    private static final Path TEXTURES_DIR = Metadata.MINECRAFT_DIRECTORY.resolve("assets").resolve("skins");
+
+    private static Path getTexturePath(Texture texture) {
+        String url = texture.getUrl();
+        int slash = url.lastIndexOf('/');
+        int dot = url.lastIndexOf('.');
+        if (dot < slash) {
+            dot = url.length();
+        }
+        String hash = url.substring(slash + 1, dot);
+        String prefix = hash.length() > 2 ? hash.substring(0, 2) : "xx";
+        return TEXTURES_DIR.resolve(prefix).resolve(hash);
+    }
+
+    public static LoadedTexture loadTexture(Texture texture) throws IOException {
+        if (StringUtils.isBlank(texture.getUrl())) {
+            throw new IOException("Texture url is empty");
+        }
+
+        Path file = getTexturePath(texture);
+        if (!Files.isRegularFile(file)) {
+            // download it
+            try {
+                new FileDownloadTask(new URL(texture.getUrl()), file.toFile()).run();
+                LOG.info("Texture downloaded: " + texture.getUrl());
+            } catch (Exception e) {
+                if (Files.isRegularFile(file)) {
+                    // concurrency conflict?
+                    LOG.log(Level.WARNING, "Failed to download texture " + texture.getUrl() + ", but the file is available", e);
+                } else {
+                    throw new IOException("Failed to download texture " + texture.getUrl());
+                }
+            }
+        }
+
+        BufferedImage img;
+        try (InputStream in = Files.newInputStream(file)) {
+            img = ImageIO.read(in);
+        }
+        Map<String, String> metadata = texture.getMetadata();
+        if (metadata == null) {
+            metadata = emptyMap();
+        }
+        return new LoadedTexture(img, metadata);
+    }
+    // ====
+
+    // ==== Skins ====
+    private final static Map<TextureModel, LoadedTexture> DEFAULT_SKINS = new EnumMap<>(TextureModel.class);
+    static {
+        loadDefaultSkin("/assets/img/steve.png", TextureModel.STEVE);
+        loadDefaultSkin("/assets/img/alex.png", TextureModel.ALEX);
+    }
+    private static void loadDefaultSkin(String path, TextureModel model) {
+        try (InputStream in = TexturesLoader.class.getResourceAsStream(path)) {
+            DEFAULT_SKINS.put(model, new LoadedTexture(ImageIO.read(in), singletonMap("model", model.modelName)));
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    public static LoadedTexture getDefaultSkin(TextureModel model) {
+        return DEFAULT_SKINS.get(model);
+    }
+
+    public static ObjectBinding<LoadedTexture> skinBinding(YggdrasilService service, UUID uuid) {
+        LoadedTexture uuidFallback = getDefaultSkin(TextureModel.detectUUID(uuid));
+        return BindingMapping.of(service.getProfileRepository().binding(uuid))
+                .map(profile -> profile
+                        .flatMap(it -> {
+                            try {
+                                return YggdrasilService.getTextures(it);
+                            } catch (ServerResponseMalformedException e) {
+                                LOG.log(Level.WARNING, "Failed to parse texture payload", e);
+                                return Optional.empty();
+                            }
+                        })
+                        .flatMap(it -> Optional.ofNullable(it.get(TextureType.SKIN)))
+                        .filter(it -> StringUtils.isNotBlank(it.getUrl())))
+                .asyncMap(it -> {
+                    if (it.isPresent()) {
+                        Texture texture = it.get();
+                        return CompletableFuture.supplyAsync(() -> {
+                            try {
+                                return loadTexture(texture);
+                            } catch (IOException e) {
+                                LOG.log(Level.WARNING, "Failed to load texture " + texture.getUrl() + ", using fallback texture", e);
+                                return uuidFallback;
+                            }
+                        }, POOL);
+                    } else {
+                        return CompletableFuture.completedFuture(uuidFallback);
+                    }
+                }, uuidFallback);
+    }
+    // ====
+
+    // ==== Avatar ====
+    public static BufferedImage toAvatar(BufferedImage skin, int size) {
+        BufferedImage avatar = new BufferedImage(size, size, BufferedImage.TYPE_INT_ARGB);
+        Graphics2D g = avatar.createGraphics();
+
+        int scale = skin.getWidth() / 64;
+        int faceOffset = (int) Math.round(size / 18.0);
+        g.drawImage(skin,
+                faceOffset, faceOffset, size - faceOffset, size - faceOffset,
+                8 * scale, 8 * scale, 16 * scale, 16 * scale,
+                null);
+        g.drawImage(skin,
+                0, 0, size, size,
+                40 * scale, 8 * scale, 48 * scale, 16 * scale, null);
+
+        g.dispose();
+        return avatar;
+    }
+
+    public static ObjectBinding<Image> fxAvatarBinding(YggdrasilService service, UUID uuid, int size) {
+        return BindingMapping.of(skinBinding(service, uuid))
+                .map(it -> toAvatar(it.image, size))
+                .map(img -> SwingFXUtils.toFXImage(img, null));
+    }
+
+    public static ObjectBinding<Image> fxAvatarBinding(Account account, int size) {
+        if (account instanceof YggdrasilAccount) {
+            return fxAvatarBinding(((YggdrasilAccount) account).getYggdrasilService(), account.getUUID(), size);
+        } else {
+            return Bindings.createObjectBinding(
+                    () -> SwingFXUtils.toFXImage(toAvatar(getDefaultSkin(TextureModel.detectUUID(account.getUUID())).image, size), null));
+        }
+    }
+    // ====
+}

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,38 +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.setting;
 
-import org.jackhuang.hmcl.Launcher;
-import org.jackhuang.hmcl.auth.Account;
-import org.jackhuang.hmcl.auth.AccountFactory;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccountFactory;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDownloader;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
-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 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.collections.ObservableList;
+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.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;
 
 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.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
 import static org.jackhuang.hmcl.util.Lang.mapOf;
 import static org.jackhuang.hmcl.util.Logging.LOG;
@@ -58,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));
-    }
-
-    private static String accountId(Account account) {
-        return account.getUsername() + ":" + account.getCharacter();
-    }
-
     private static ObservableList<Account> accounts = observableArrayList(account -> new Observable[] { account });
-    private static ReadOnlyListProperty<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));
         }
@@ -125,7 +132,7 @@ public final class Accounts {
             // selection is valid, store it
             if (!initialized)
                 return;
-            CONFIG.setSelectedAccount(selected == null ? "" : accountId(selected));
+            updateAccountStorages();
         }
     };
 
@@ -138,31 +145,33 @@ public final class Accounts {
         accounts.addListener(onInvalidating(Accounts::updateAccountStorages));
     }
 
+    private static Map<Object, Object> getAccountStorage(Account account) {
+        Map<Object, Object> storage = account.toStorage();
+        storage.put("type", getLoginType(getAccountFactory(account)));
+        if (account == selectedAccount.get()) {
+            storage.put("selected", true);
+        }
+        return storage;
+    }
+
     private static void updateAccountStorages() {
         // don't update the underlying storage before data loading is completed
         // otherwise it might cause data loss
         if (!initialized)
             return;
         // update storage
-        CONFIG.getAccountStorages().setAll(
-                accounts.stream()
-                        .map(account -> {
-                            Map<Object, Object> storage = account.toStorage();
-                            storage.put("type", accountType(account));
-                            return storage;
-                        })
-                        .collect(toList()));
+        config().getAccountStorages().setAll(accounts.stream().map(Accounts::getAccountStorage).collect(toList()));
     }
 
     /**
-     * Called when it's ready to load accounts from {@link ConfigHolder#CONFIG}.
+     * Called when it's ready to load accounts from {@link ConfigHolder#config()}.
      */
     static void init() {
         if (initialized)
             throw new IllegalStateException("Already initialized");
 
         // load accounts
-        CONFIG.getAccountStorages().forEach(storage -> {
+        config().getAccountStorages().forEach(storage -> {
             AccountFactory<?> factory = type2factory.get(storage.get("type"));
             if (factory == null) {
                 LOG.warning("Unrecognized account type: " + storage);
@@ -176,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));
+        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() {
@@ -195,7 +224,7 @@ public final class Accounts {
     }
 
     public static ReadOnlyListProperty<Account> accountsProperty() {
-        return accountsWrapper;
+        return accountsWrapper.getReadOnlyProperty();
     }
 
     public static Account getSelectedAccount() {
@@ -211,22 +240,23 @@ 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()
+        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);
-                    }
-
-                    CONFIG.getAuthlibInjectorServers().add(server);
+                    AuthlibInjectorServer server = new AuthlibInjectorServer(url);
+                    config().getAuthlibInjectorServers().add(server);
                     return server;
                 });
     }
@@ -239,25 +269,21 @@ public final class Accounts {
         accounts.stream()
                 .filter(AuthlibInjectorAccount.class::isInstance)
                 .map(AuthlibInjectorAccount.class::cast)
-                .filter(it -> !CONFIG.getAuthlibInjectorServers().contains(it.getServer()))
+                .filter(it -> !config().getAuthlibInjectorServers().contains(it.getServer()))
                 .collect(toList())
                 .forEach(accounts::remove);
     }
     // ====
 
     // ==== Login type name i18n ===
-    private static Map<AccountFactory<?>, String> loginType2name = mapOf(
-            pair(Accounts.FACTORY_OFFLINE, i18n("account.methods.offline")),
-            pair(Accounts.FACTORY_YGGDRASIL, i18n("account.methods.yggdrasil")),
-            pair(Accounts.FACTORY_AUTHLIB_INJECTOR, i18n("account.methods.authlib_injector")));
+    private static Map<AccountFactory<?>, String> unlocalizedLoginTypeNames = mapOf(
+            pair(Accounts.FACTORY_OFFLINE, "account.methods.offline"),
+            pair(Accounts.FACTORY_MOJANG, "account.methods.yggdrasil"),
+            pair(Accounts.FACTORY_AUTHLIB_INJECTOR, "account.methods.authlib_injector"));
 
-    public static String getAccountTypeName(AccountFactory<?> factory) {
-        return Optional.ofNullable(loginType2name.get(factory))
-                .orElseThrow(() -> new IllegalArgumentException("No corresponding login type name"));
-    }
-
-    public static String getAccountTypeName(Account account) {
-        return getAccountTypeName(getAccountFactory(account));
+    public static String getLocalizedLoginTypeName(AccountFactory<?> factory) {
+        return i18n(Optional.ofNullable(unlocalizedLoginTypeNames.get(factory))
+                .orElseThrow(() -> new IllegalArgumentException("Unrecognized account factory")));
     }
     // ====
 }

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,70 +13,64 @@
  * 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 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;
-
-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.auth.authlibinjector.AuthlibInjectorServer;
-import org.jackhuang.hmcl.util.EnumOrdinalDeserializer;
-import org.jackhuang.hmcl.util.FileTypeAdapter;
-import org.jackhuang.hmcl.util.ObservableHelper;
-
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonParseException;
 import com.google.gson.annotations.SerializedName;
-
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.property.IntegerProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleDoubleProperty;
-import javafx.beans.property.SimpleIntegerProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
+import javafx.beans.property.*;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.collections.ObservableMap;
 import javafx.collections.ObservableSet;
+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.Metadata;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
+import org.jackhuang.hmcl.upgrade.UpdateChannel;
+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.net.Proxy;
+import java.util.Map;
+import java.util.TreeMap;
 
 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(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;
     }
 
@@ -93,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();
@@ -102,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();
@@ -120,10 +114,10 @@ public final class Config implements Cloneable, Observable {
     private ObjectProperty<Theme> theme = new SimpleObjectProperty<>(Theme.BLUE);
 
     @SerializedName("localization")
-    private StringProperty localization = new SimpleStringProperty();
+    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<>());
@@ -131,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");
 
@@ -143,36 +134,35 @@ public final class Config implements Cloneable, Observable {
     @SerializedName("logLines")
     private IntegerProperty logLines = new SimpleIntegerProperty(100);
 
-    @SerializedName("firstLaunch")
-    private BooleanProperty firstLaunch = new SimpleBooleanProperty(true);
-
     @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("_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
@@ -303,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;
     }
 
@@ -351,27 +341,27 @@ public final class Config implements Cloneable, Observable {
         return theme;
     }
 
-    public String getLocalization() {
+    public SupportedLocale getLocalization() {
         return localization.get();
     }
 
-    public void setLocalization(String localization) {
+    public void setLocalization(SupportedLocale localization) {
         this.localization.set(localization);
     }
 
-    public StringProperty localizationProperty() {
+    public ObjectProperty<SupportedLocale> localizationProperty() {
         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;
     }
 
@@ -383,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();
     }
@@ -431,20 +409,55 @@ public final class Config implements Cloneable, Observable {
         return logLines;
     }
 
-    public boolean isFirstLaunch() {
-        return firstLaunch.get();
-    }
-
-    public void setFirstLaunch(boolean firstLaunch) {
-        this.firstLaunch.set(firstLaunch);
-    }
-
-    public BooleanProperty firstLaunchProperty() {
-        return firstLaunch;
-    }
-
     public ObservableList<AuthlibInjectorServer> getAuthlibInjectorServers() {
         return authlibInjectorServers;
     }
 
+    public UpdateChannel getUpdateChannel() {
+        return updateChannel.get();
+    }
+
+    public ObjectProperty<UpdateChannel> updateChannelProperty() {
+        return updateChannel;
+    }
+
+    public void setUpdateChannel(UpdateChannel updateChannel) {
+        this.updateChannel.set(updateChannel);
+    }
+
+    public int getConfigVersion() {
+        return configVersion.get();
+    }
+
+    public IntegerProperty configVersionProperty() {
+        return configVersion;
+    }
+
+    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) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,12 +13,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.setting;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.jackhuang.hmcl.util.Logging.LOG;
+import com.google.gson.Gson;
+import com.google.gson.JsonParseException;
+import org.jackhuang.hmcl.util.InvocationDispatcher;
+import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -27,49 +31,113 @@ import java.nio.file.Paths;
 import java.util.Map;
 import java.util.logging.Level;
 
-import com.google.gson.Gson;
-import com.google.gson.JsonParseException;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.jackhuang.hmcl.util.Logging.LOG;
 
 public final class ConfigHolder {
 
     private ConfigHolder() {}
 
     public static final String CONFIG_FILENAME = "hmcl.json";
-    public static final Path CONFIG_PATH = Paths.get(CONFIG_FILENAME).toAbsolutePath();
-    public static final Config CONFIG = initSettings();
+    public static final String CONFIG_FILENAME_LINUX = ".hmcl.json";
 
-    private static Config upgradeSettings(Config deserialized, Map rawJson) {
-        if (!rawJson.containsKey("commonDirType"))
-            deserialized.setCommonDirType(deserialized.getCommonDirectory().equals(Settings.getDefaultCommonDirectory()) ? EnumCommonDirectory.DEFAULT : EnumCommonDirectory.CUSTOM);
-        return deserialized;
+    private static Path configLocation;
+    private static Config configInstance;
+    private static boolean newlyCreated;
+
+    public static Config config() {
+        if (configInstance == null) {
+            throw new IllegalStateException("Configuration hasn't been loaded");
+        }
+        return configInstance;
     }
 
-    private static Config initSettings() {
-        Config config = new Config();
-        if (Files.exists(CONFIG_PATH)) {
-            try {
-                String json = new String(Files.readAllBytes(CONFIG_PATH), UTF_8);
-                Map raw = new Gson().fromJson(json, Map.class);
-                Config deserialized = Config.fromJson(json);
-                if (deserialized == null) {
-                    LOG.finer("Settings file is empty, use the default settings.");
-                } else {
-                    config = upgradeSettings(deserialized, raw);
+    public synchronized static void init() throws IOException {
+        if (configInstance != null) {
+            throw new IllegalStateException("Configuration is already loaded");
+        }
+
+        configLocation = locateConfig();
+        configInstance = loadConfig();
+        configInstance.addListener(source -> markConfigDirty());
+
+        Settings.init();
+
+        if (newlyCreated) {
+            saveConfigSync();
+
+            // hide the config file on windows
+            if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
+                try {
+                    Files.setAttribute(configLocation, "dos:hidden", true);
+                } catch (IOException e) {
+                    LOG.log(Level.WARNING, "Failed to set hidden attribute of " + configLocation, e);
                 }
-                LOG.finest("Initialized settings.");
-            } catch (IOException | JsonParseException e) {
-                LOG.log(Level.WARNING, "Something happened wrongly when load settings.", e);
             }
         }
-        return config;
-    }
 
-    static void saveConfig(Config config) {
-        try {
-            Files.write(CONFIG_PATH, config.toJson().getBytes(UTF_8));
-        } catch (IOException ex) {
-            LOG.log(Level.SEVERE, "Failed to save config", ex);
+        if (!Files.isWritable(configLocation)) {
+            // the config cannot be saved
+            // throw up the error now to prevent further data loss
+            throw new IOException("Config at " + configLocation + " is not writable");
         }
     }
 
+    private static Path locateConfig() {
+        Path config = Paths.get(CONFIG_FILENAME);
+        if (Files.isRegularFile(config))
+            return config;
+
+        Path dotConfig = Paths.get(CONFIG_FILENAME_LINUX);
+        if (Files.isRegularFile(dotConfig))
+            return dotConfig;
+
+        // create new
+        return OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS ? config : dotConfig;
+    }
+
+    private static Config loadConfig() throws IOException {
+        if (Files.exists(configLocation)) {
+            try {
+                String content = FileUtils.readText(configLocation);
+                Config deserialized = Config.fromJson(content);
+                if (deserialized == null) {
+                    LOG.info("Config is empty");
+                } else {
+                    Map<?, ?> raw = new Gson().fromJson(content, Map.class);
+                    ConfigUpgrader.upgradeConfig(deserialized, raw);
+                    return deserialized;
+                }
+            } catch (JsonParseException e) {
+                LOG.log(Level.WARNING, "Malformed config.", e);
+            }
+        }
+
+        LOG.info("Creating an empty config");
+        newlyCreated = true;
+        return new Config();
+    }
+
+    private static InvocationDispatcher<String> configWriter = InvocationDispatcher.runOn(Lang::thread, content -> {
+        try {
+            writeToConfig(content);
+        } catch (IOException e) {
+            LOG.log(Level.SEVERE, "Failed to save config", 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() {
+        configWriter.accept(configInstance.toJson());
+    }
+
+    private static void saveConfigSync() throws IOException {
+        writeToConfig(configInstance.toJson());
+    }
 }

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

@@ -0,0 +1,129 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.setting;
+
+import org.jackhuang.hmcl.util.StringUtils;
+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() {
+    }
+
+    /**
+     * This method is for the compatibility with old HMCL 3.x as well as HMCL 2.x.
+     *
+     * @param deserialized deserialized config settings
+     * @param rawJson      raw json structure of the config settings without modification
+     * @return true if config version is upgraded
+     */
+    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;
+    }
+
+    /**
+     * Upgrade configuration of HMCL 2.x
+     *
+     * @param deserialized deserialized config settings
+     * @param rawJson      raw json structure of the config settings without modification
+     */
+    private static void upgradeV2(Config deserialized, Map<?, ?> rawJson) {
+        // Convert OfflineAccounts whose stored uuid is important.
+        tryCast(rawJson.get("auth"), Map.class).ifPresent(auth -> {
+            tryCast(auth.get("offline"), Map.class).ifPresent(offline -> {
+                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) -> {
+                        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);
+                    });
+                });
+            });
+        });
+    }
+
+    /**
+     * Upgrade configuration of HMCL earlier than 3.1.70
+     *
+     * @param deserialized deserialized config settings
+     * @param rawJson      raw json structure of the config settings without modification
+     */
+    private static void upgradeV3(Config deserialized, Map<?, ?> rawJson) {
+        if (!rawJson.containsKey("commonDirType"))
+            deserialized.setCommonDirType(deserialized.getCommonDirectory().equals(Settings.getDefaultCommonDirectory()) ? EnumCommonDirectory.DEFAULT : EnumCommonDirectory.CUSTOM);
+        if (!rawJson.containsKey("backgroundType"))
+            deserialized.setBackgroundImageType(StringUtils.isNotBlank(deserialized.getBackgroundImage()) ? EnumBackgroundImage.CUSTOM : EnumBackgroundImage.DEFAULT);
+        if (!rawJson.containsKey("hasProxy"))
+            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) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,24 +13,48 @@
  * 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 static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.util.Lang.mapOf;
+import static org.jackhuang.hmcl.util.Pair.pair;
+
+import java.util.Map;
+import java.util.Optional;
+
 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 java.util.List;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.ObjectBinding;
+import javafx.beans.value.ObservableObjectValue;
 
 public final class DownloadProviders {
     private DownloadProviders() {}
 
-    public static final List<DownloadProvider> DOWNLOAD_PROVIDERS = Lang.immutableListOf(new MojangDownloadProvider(), BMCLAPIDownloadProvider.INSTANCE, CurseCDNDownloadProvider.INSTANCE);
+    public static final Map<String, DownloadProvider> providersById = mapOf(
+            pair("mojang", new MojangDownloadProvider()),
+            pair("bmclapi", new BMCLAPIDownloadProvider()));
 
-    public static DownloadProvider getDownloadProvider(int index) {
-        return Lang.get(DOWNLOAD_PROVIDERS, index).orElse(DOWNLOAD_PROVIDERS.get(0));
+    public static final String DEFAULT_PROVIDER_ID = "bmclapi";
+
+    private static ObjectBinding<DownloadProvider> downloadProviderProperty;
+
+    static void init() {
+        downloadProviderProperty = Bindings.createObjectBinding(
+                () -> Optional.ofNullable(providersById.get(config().getDownloadType()))
+                        .orElse(providersById.get(DEFAULT_PROVIDER_ID)),
+                config().downloadTypeProperty());
+    }
+
+    public static DownloadProvider getDownloadProvider() {
+        return downloadProviderProperty.get();
+    }
+
+    public static ObservableObjectValue<DownloadProvider> downloadProviderProperty() {
+        return downloadProviderProperty;
     }
 }

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,18 +13,11 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.setting;
 
 public enum EnumBackgroundImage {
     DEFAULT,
-    CUSTOM;
-
-    public static EnumBackgroundImage indexOf(int index) {
-        if (index >= values().length || index < 0)
-            return DEFAULT;
-        else
-            return values()[index];
-    }
+    CUSTOM
 }

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,15 +13,11 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.setting;
 
 public enum EnumCommonDirectory {
-    /**
-     * same to game directory
-     */
-    DISABLED,
     /**
      * %appdata%/.minecraft or ~/.minecraft
      */

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.setting;
 

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.setting;
 

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,91 +13,107 @@
  * 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 com.jfoenix.utils.JFXUtilities;
+import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-
-import org.jackhuang.hmcl.game.HMCLDependencyManager;
+import javafx.beans.Observable;
+import javafx.beans.property.*;
+import org.jackhuang.hmcl.download.DefaultDependencyManager;
+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.mod.ModManager;
-import org.jackhuang.hmcl.util.ImmediateObjectProperty;
-import org.jackhuang.hmcl.util.ImmediateStringProperty;
-import org.jackhuang.hmcl.util.ToStringBuilder;
+import org.jackhuang.hmcl.game.Version;
+import org.jackhuang.hmcl.ui.WeakListenerHolder;
+import org.jackhuang.hmcl.util.*;
+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;
+
 /**
  *
  * @author huangyuhui
  */
-public final class Profile {
-
+@JsonAdapter(Profile.Serializer.class)
+public final class Profile implements Observable {
+    private final WeakListenerHolder listenerHolder = new WeakListenerHolder();
     private final HMCLGameRepository repository;
-    private final ModManager modManager;
 
-    private final ImmediateObjectProperty<File> gameDirProperty;
+    private final StringProperty selectedVersion = new SimpleStringProperty();
 
-    public ImmediateObjectProperty<File> gameDirProperty() {
-        return gameDirProperty;
+    public StringProperty selectedVersionProperty() {
+        return selectedVersion;
+    }
+
+    public String getSelectedVersion() {
+        return selectedVersion.get();
+    }
+
+    public void setSelectedVersion(String selectedVersion) {
+        this.selectedVersion.set(selectedVersion);
+    }
+
+    private final ObjectProperty<File> gameDir;
+
+    public ObjectProperty<File> gameDirProperty() {
+        return gameDir;
     }
 
     public File getGameDir() {
-        return gameDirProperty.get();
+        return gameDir.get();
     }
 
     public void setGameDir(File gameDir) {
-        gameDirProperty.set(gameDir);
+        this.gameDir.set(gameDir);
     }
 
-    private final ImmediateObjectProperty<VersionSetting> globalProperty = new ImmediateObjectProperty<>(this, "global", new VersionSetting());
+    private final ReadOnlyObjectWrapper<VersionSetting> global = new ReadOnlyObjectWrapper<>(this, "global");
 
-    public ImmediateObjectProperty<VersionSetting> globalProperty() {
-        return globalProperty;
+    public ReadOnlyObjectProperty<VersionSetting> globalProperty() {
+        return global.getReadOnlyProperty();
     }
 
     public VersionSetting getGlobal() {
-        return globalProperty.get();
+        return global.get();
     }
 
-    public void setGlobal(VersionSetting global) {
-        if (global == null)
-            global = new VersionSetting();
-        globalProperty.set(global);
-    }
+    private final SimpleStringProperty name;
 
-    private final ImmediateStringProperty nameProperty;
-
-    public ImmediateStringProperty nameProperty() {
-        return nameProperty;
+    public StringProperty nameProperty() {
+        return name;
     }
 
     public String getName() {
-        return nameProperty.get();
+        return name.get();
     }
 
     public void setName(String name) {
-        nameProperty.set(name);
+        this.name.set(name);
     }
 
-    private BooleanProperty useRelativePathProperty = new SimpleBooleanProperty(this, "useRelativePath", false);
+    private BooleanProperty useRelativePath = new SimpleBooleanProperty(this, "useRelativePath", false);
 
     public BooleanProperty useRelativePathProperty() {
-        return useRelativePathProperty();
+        return useRelativePath;
     }
 
     public boolean isUseRelativePath() {
-        return useRelativePathProperty.get();
+        return useRelativePath.get();
     }
 
     public void setUseRelativePath(boolean useRelativePath) {
-        useRelativePathProperty.set(useRelativePath);
+        this.useRelativePath.set(useRelativePath);
     }
 
     public Profile(String name) {
@@ -105,24 +121,48 @@ public final class Profile {
     }
 
     public Profile(String name, File initialGameDir) {
-        nameProperty = new ImmediateStringProperty(this, "name", name);
-        gameDirProperty = new ImmediateObjectProperty<>(this, "gameDir", initialGameDir);
-        repository = new HMCLGameRepository(this, initialGameDir);
-        modManager = new ModManager(repository);
+        this(name, initialGameDir, new VersionSetting());
+    }
 
-        gameDirProperty.addListener((a, b, newValue) -> repository.changeDirectory(newValue));
+    public Profile(String name, File initialGameDir, VersionSetting global) {
+        this(name, initialGameDir, global, null, false);
+    }
+
+    public Profile(String name, File initialGameDir, VersionSetting global, String selectedVersion, boolean useRelativePath) {
+        this.name = new SimpleStringProperty(this, "name", name);
+        gameDir = new SimpleObjectProperty<>(this, "gameDir", initialGameDir);
+        repository = new HMCLGameRepository(this, initialGameDir);
+        this.global.set(global == null ? new VersionSetting() : global);
+        this.selectedVersion.set(selectedVersion);
+        this.useRelativePath.set(useRelativePath);
+
+        gameDir.addListener((a, b, newValue) -> repository.changeDirectory(newValue));
+        this.selectedVersion.addListener(o -> checkSelectedVersion());
+        listenerHolder.add(EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).registerWeak(event -> checkSelectedVersion(), EventPriority.HIGHEST));
+
+        addPropertyChangedListener(onInvalidating(this::invalidate));
+    }
+
+    private void checkSelectedVersion() {
+        JFXUtilities.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 HMCLDependencyManager getDependency() {
-        return new HMCLDependencyManager(this, Settings.INSTANCE.getDownloadProvider());
+    public DefaultDependencyManager getDependency() {
+        return new DefaultDependencyManager(repository, DownloadProviders.getDownloadProvider(), HMCLCacheRepository.REPOSITORY);
     }
 
     public VersionSetting getVersionSetting(String id) {
@@ -135,32 +175,6 @@ public final class Profile {
             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);
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this)
@@ -170,19 +184,32 @@ public final class Profile {
                 .toString();
     }
 
-    public void addPropertyChangedListener(InvalidationListener listener) {
-        nameProperty.addListener(listener);
-        globalProperty.addListener(listener);
-        gameDirProperty.addListener(listener);
-        useRelativePathProperty.addListener(listener);
+    private void addPropertyChangedListener(InvalidationListener listener) {
+        name.addListener(listener);
+        global.addListener(listener);
+        gameDir.addListener(listener);
+        useRelativePath.addListener(listener);
+        global.get().addPropertyChangedListener(listener);
+        selectedVersion.addListener(listener);
+    }
+
+    private ObservableHelper observableHelper = new ObservableHelper(this);
+
+    @Override
+    public void addListener(InvalidationListener listener) {
+        observableHelper.addListener(listener);
+    }
+
+    @Override
+    public void removeListener(InvalidationListener listener) {
+        observableHelper.removeListener(listener);
+    }
+
+    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)
@@ -192,6 +219,7 @@ public final class Profile {
             jsonObject.add("global", context.serialize(src.getGlobal()));
             jsonObject.addProperty("gameDir", src.getGameDir().getPath());
             jsonObject.addProperty("useRelativePath", src.isUseRelativePath());
+            jsonObject.addProperty("selectedMinecraftVersion", src.getSelectedVersion());
 
             return jsonObject;
         }
@@ -202,11 +230,11 @@ public final class Profile {
             JsonObject obj = (JsonObject) json;
             String gameDir = Optional.ofNullable(obj.get("gameDir")).map(JsonElement::getAsString).orElse("");
 
-            Profile profile = new Profile("Default", new File(gameDir));
-            profile.setGlobal(context.deserialize(obj.get("global"), VersionSetting.class));
-
-            profile.setUseRelativePath(Optional.ofNullable(obj.get("useRelativePath")).map(JsonElement::getAsBoolean).orElse(false));
-            return profile;
+            return new Profile("Default",
+                    new File(gameDir),
+                    context.deserialize(obj.get("global"), VersionSetting.class),
+                    Optional.ofNullable(obj.get("selectedMinecraftVersion")).map(JsonElement::getAsString).orElse(""),
+                    Optional.ofNullable(obj.get("useRelativePath")).map(JsonElement::getAsBoolean).orElse(false));
         }
 
     }

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,10 +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 com.jfoenix.utils.JFXUtilities;
+import javafx.application.Platform;
+import javafx.beans.Observable;
+import javafx.beans.property.*;
+import javafx.collections.ObservableList;
+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 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.util.i18n.I18n.i18n;
 
 public final class Profiles {
@@ -37,4 +56,160 @@ public final class Profiles {
                 return profile.getName();
         }
     }
+
+    private static final ObservableList<Profile> profiles = observableArrayList(profile -> new Observable[] { profile });
+    private static final ReadOnlyListWrapper<Profile> profilesWrapper = new ReadOnlyListWrapper<>(profiles);
+
+    private static ObjectProperty<Profile> selectedProfile = new SimpleObjectProperty<Profile>() {
+        {
+            profiles.addListener(onInvalidating(this::invalidated));
+        }
+
+        @Override
+        protected void invalidated() {
+            if (!initialized)
+                return;
+
+            Profile profile = get();
+
+            if (profiles.isEmpty()) {
+                if (profile != null) {
+                    set(null);
+                    return;
+                }
+            } else {
+                if (!profiles.contains(profile)) {
+                    set(profiles.get(0));
+                    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, Metadata.MINECRAFT_DIRECTORY.toFile());
+            Platform.runLater(() -> profiles.addAll(current, home));
+        }
+    }
+
+    /**
+     * True if {@link #init()} hasn't been called.
+     */
+    private static boolean initialized = false;
+
+    static {
+        profiles.addListener(onInvalidating(Profiles::updateProfileStorages));
+        profiles.addListener(onInvalidating(Profiles::checkProfiles));
+
+        selectedProfile.addListener((a, b, newValue) -> {
+            if (newValue != null)
+                newValue.getRepository().refreshVersionsAsync().start();
+        });
+    }
+
+    private static void updateProfileStorages() {
+        // don't update the underlying storage before data loading is completed
+        // otherwise it might cause data loss
+        if (!initialized)
+            return;
+        // update storage
+        config().getConfigurations().clear();
+        config().getConfigurations().putAll(profiles.stream().collect(Collectors.toMap(Profile::getName, it -> it)));
+    }
+
+    /**
+     * Called when it's ready to load profiles from {@link ConfigHolder#config()}.
+     */
+    static void init() {
+        if (initialized)
+            throw new IllegalStateException("Already initialized");
+
+        HashSet<String> names = new HashSet<>();
+        config().getConfigurations().forEach((name, profile) -> {
+            if (!names.add(name)) return;
+            profiles.add(profile);
+            profile.setName(name);
+        });
+        checkProfiles();
+
+        // 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)));
+        });
+
+        EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).registerWeak(event -> {
+            JFXUtilities.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() {
+        return profiles;
+    }
+
+    public static ReadOnlyListProperty<Profile> profilesProperty() {
+        return profilesWrapper.getReadOnlyProperty();
+    }
+
+    public static Profile getSelectedProfile() {
+        return selectedProfile.get();
+    }
+
+    public static void setSelectedProfile(Profile profile) {
+        selectedProfile.set(profile);
+    }
+
+    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) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,11 +13,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.setting;
 
-import static org.jackhuang.hmcl.setting.ConfigHolder.CONFIG;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.ObjectBinding;
+import javafx.beans.value.ObservableObjectValue;
+import org.jackhuang.hmcl.util.StringUtils;
 
 import java.net.Authenticator;
 import java.net.InetSocketAddress;
@@ -25,31 +28,14 @@ import java.net.PasswordAuthentication;
 import java.net.Proxy;
 import java.net.Proxy.Type;
 
-import org.jackhuang.hmcl.util.Lang;
-import org.jackhuang.hmcl.util.StringUtils;
-
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.ObjectBinding;
-import javafx.beans.value.ObservableObjectValue;
+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();
@@ -60,17 +46,34 @@ 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()) {
-                    String username = CONFIG.getProxyUser();
-                    String password = CONFIG.getProxyPass();
+                if (config().hasProxyAuth()) {
+                    String username = config().getProxyUser();
+                    String password = config().getProxyPass();
                     if (username != null && password != null) {
                         return new PasswordAuthentication(username, password.toCharArray());
                     }

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,212 +13,64 @@
  * 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.value.ObservableValue;
-import javafx.scene.text.Font;
+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 org.jackhuang.hmcl.Launcher;
-import org.jackhuang.hmcl.download.DownloadProvider;
-import org.jackhuang.hmcl.event.*;
-import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.util.*;
-import org.jackhuang.hmcl.util.i18n.Locales;
-
-import java.io.File;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static org.jackhuang.hmcl.setting.ConfigHolder.CONFIG;
-import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 
 public class Settings {
 
-    public static final Settings INSTANCE = new Settings();
+    private static Settings instance;
 
-    private final boolean firstLaunch;
+    public static Settings instance() {
+        if (instance == null) {
+            throw new IllegalStateException("Settings hasn't been initialized");
+        }
+        return instance;
+    }
+
+    /**
+     * Should be called from {@link ConfigHolder#init()}.
+     */
+    static void init() {
+        instance = new Settings();
+    }
 
     private Settings() {
-        firstLaunch = CONFIG.isFirstLaunch();
-        CONFIG.setFirstLaunch(false);
-
+        DownloadProviders.init();
         ProxyManager.init();
         Accounts.init();
+        Profiles.init();
 
-        checkProfileMap();
-
-        for (Map.Entry<String, Profile> profileEntry : getProfileMap().entrySet()) {
-            profileEntry.getValue().setName(profileEntry.getKey());
-            profileEntry.getValue().nameProperty().setChangedListener(this::profileNameChanged);
-            profileEntry.getValue().addPropertyChangedListener(e -> save());
-        }
-
-        CONFIG.addListener(source -> save());
-    }
-
-    private void save() {
-        LOG.info("Saving config");
-        ConfigHolder.saveConfig(CONFIG);
-    }
-
-    public boolean isFirstLaunch() {
-        return firstLaunch;
-    }
-
-    private Locales.SupportedLocale locale = Locales.getLocaleByName(CONFIG.getLocalization());
-
-    public Locales.SupportedLocale getLocale() {
-        return locale;
-    }
-
-    public void setLocale(Locales.SupportedLocale locale) {
-        this.locale = locale;
-        CONFIG.setLocalization(Locales.getNameByLocale(locale));
-    }
-
-    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);
-    }
-
-    public boolean isCommonDirectoryDisabled() {
-        return CONFIG.getCommonDirType() == EnumCommonDirectory.DISABLED;
+        CacheRepository.setInstance(HMCLCacheRepository.REPOSITORY);
+        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() {
-        switch (CONFIG.getCommonDirType()) {
-            case DISABLED:
-                return null;
+        switch (config().getCommonDirType()) {
             case DEFAULT:
                 return getDefaultCommonDirectory();
             case CUSTOM:
-                return CONFIG.getCommonDirectory();
+                return config().getCommonDirectory();
             default:
                 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);
-    }
-
-    /****************************************
-     *               PROFILES               *
-     ****************************************/
-
-    public Profile getSelectedProfile() {
-        checkProfileMap();
-
-        if (!hasProfile(CONFIG.getSelectedProfile())) {
-            getProfileMap().keySet().stream().findFirst().ifPresent(selectedProfile -> {
-                CONFIG.setSelectedProfile(selectedProfile);
-            });
-            Schedulers.computation().schedule(this::onProfileChanged);
-        }
-        return getProfile(CONFIG.getSelectedProfile());
-    }
-
-    public void setSelectedProfile(Profile selectedProfile) {
-        if (hasProfile(selectedProfile.getName()) && !Objects.equals(selectedProfile.getName(), CONFIG.getSelectedProfile())) {
-            CONFIG.setSelectedProfile(selectedProfile.getName());
-            Schedulers.computation().schedule(this::onProfileChanged);
-        }
-    }
-
-    public Profile getProfile(String name) {
-        checkProfileMap();
-
-        Optional<Profile> p = name == null ? getProfileMap().values().stream().findFirst() : Optional.ofNullable(getProfileMap().get(name));
-        return p.orElse(null);
-    }
-
-    public boolean hasProfile(String name) {
-        return getProfileMap().containsKey(name);
-    }
-
-    public Map<String, Profile> getProfileMap() {
-        return CONFIG.getConfigurations();
-    }
-
-    public Collection<Profile> getProfiles() {
-        return getProfileMap().values().stream().filter(t -> StringUtils.isNotBlank(t.getName())).collect(Collectors.toList());
-    }
-
-    public void putProfile(Profile ver) {
-        if (StringUtils.isBlank(ver.getName()))
-            throw new IllegalArgumentException("Profile's name is empty");
-
-        getProfileMap().put(ver.getName(), ver);
-        Schedulers.computation().schedule(this::onProfileLoading);
-
-        ver.nameProperty().setChangedListener(this::profileNameChanged);
-    }
-
-    public void deleteProfile(Profile profile) {
-        deleteProfile(profile.getName());
-    }
-
-    public void deleteProfile(String profileName) {
-        getProfileMap().remove(profileName);
-        checkProfileMap();
-        Schedulers.computation().schedule(this::onProfileLoading);
-    }
-
-    private void checkProfileMap() {
-        if (getProfileMap().isEmpty()) {
-            Profile current = new Profile(Profiles.DEFAULT_PROFILE);
-            current.setUseRelativePath(true);
-            getProfileMap().put(Profiles.DEFAULT_PROFILE, current);
-
-            Profile home = new Profile(Profiles.HOME_PROFILE, Launcher.MINECRAFT_DIRECTORY);
-            getProfileMap().put(Profiles.HOME_PROFILE, home);
-        }
-    }
-
-    private void onProfileChanged() {
-        EventBus.EVENT_BUS.fireEvent(new ProfileChangedEvent(this, getSelectedProfile()));
-        getSelectedProfile().getRepository().refreshVersionsAsync().start();
-    }
-
-    private void profileNameChanged(ObservableValue<? extends String> observableValue, String oldValue, String newValue) {
-        getProfileMap().put(newValue, getProfileMap().remove(oldValue));
-    }
-
-    /**
-     * Start profiles loading process.
-     * Invoked by loading GUI phase.
-     */
-    public void onProfileLoading() {
-        EventBus.EVENT_BUS.fireEvent(new ProfileLoadingEvent(this, getProfiles()));
-        onProfileChanged();
-    }
 }

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,27 +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.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 com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-
-import static org.jackhuang.hmcl.setting.ConfigHolder.CONFIG;
+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;
 import java.util.Optional;
 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");
 
@@ -43,7 +46,7 @@ public class Theme {
             Color.web("#43A047"), // green
             Color.web("#E67E22"), // orange
             Color.web("#9C27B0"), // purple
-            Color.web("#F44336")  // red
+            Color.web("#B71C1C")  // red
     };
 
     private final String color;
@@ -82,16 +85,14 @@ public class Theme {
                     .replace("%base-color%", color)
                     .replace("%font-color%", getColorDisplayName(getForegroundColor())));
             css = temp.toURI().toString();
-        } catch (IOException e) {
+        } catch (IOException | NullPointerException e) {
             Logging.LOG.log(Level.SEVERE, "Unable to create theme stylesheet. Fallback to blue theme.", e);
-            css = Theme.class.getResource("/assets/css/blue.css").toExternalForm();
+            css = "/assets/css/blue.css";
         }
 
         return new String[]{
-                Theme.class.getResource("/css/jfoenix-fonts.css").toExternalForm(),
-                Theme.class.getResource("/css/jfoenix-design.css").toExternalForm(),
                 css,
-                Theme.class.getResource("/assets/css/root.css").toExternalForm()
+                "/assets/css/root.css"
         };
     }
 
@@ -104,6 +105,18 @@ public class Theme {
     public static Optional<Theme> getTheme(String name) {
         if (name == null)
             return Optional.empty();
+        else if (name.equalsIgnoreCase("blue"))
+            return Optional.of(custom("#5C6BC0"));
+        else if (name.equalsIgnoreCase("darker_blue"))
+            return Optional.of(custom("#283593"));
+        else if (name.equalsIgnoreCase("green"))
+            return Optional.of(custom("#43A047"));
+        else if (name.equalsIgnoreCase("orange"))
+            return Optional.of(custom("#E67E22"));
+        else if (name.equalsIgnoreCase("purple"))
+            return Optional.of(custom("#9C27B0"));
+        else if (name.equalsIgnoreCase("red"))
+            return Optional.of(custom("#F44336"));
 
         if (name.startsWith("#"))
             try {
@@ -120,7 +133,8 @@ public class Theme {
     }
 
     public static ObjectBinding<Color> foregroundFillBinding() {
-        return Bindings.createObjectBinding(() -> CONFIG.getTheme().getForegroundColor(), CONFIG.themeProperty());
+        return BindingMapping.of(config().themeProperty())
+                .map(Theme::getForegroundColor);
     }
 
     public static ObjectBinding<Color> blackFillBinding() {

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,29 +13,44 @@
  * 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 org.jackhuang.hmcl.Launcher;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleIntegerProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.game.LaunchOptions;
 import org.jackhuang.hmcl.util.*;
+import org.jackhuang.hmcl.util.platform.JavaVersion;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;
 
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Type;
+import java.nio.file.Paths;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import static org.jackhuang.hmcl.setting.ConfigHolder.CONFIG;
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 
 /**
  *
  * @author huangyuhui
  */
+@JsonAdapter(VersionSetting.Serializer.class)
 public final class VersionSetting {
 
     public transient String id;
@@ -50,9 +65,9 @@ public final class VersionSetting {
         this.global = global;
     }
 
-    private final ImmediateBooleanProperty usesGlobalProperty = new ImmediateBooleanProperty(this, "usesGlobal", false);
+    private final BooleanProperty usesGlobalProperty = new SimpleBooleanProperty(this, "usesGlobal", false);
 
-    public ImmediateBooleanProperty usesGlobalProperty() {
+    public BooleanProperty usesGlobalProperty() {
         return usesGlobalProperty;
     }
 
@@ -74,9 +89,9 @@ public final class VersionSetting {
 
     // java
 
-    private final ImmediateStringProperty javaProperty = new ImmediateStringProperty(this, "java", "");
+    private final StringProperty javaProperty = new SimpleStringProperty(this, "java", "");
 
-    public ImmediateStringProperty javaProperty() {
+    public StringProperty javaProperty() {
         return javaProperty;
     }
 
@@ -100,7 +115,7 @@ public final class VersionSetting {
         setDefaultJavaPath(null);
     }
 
-    private final ImmediateStringProperty defaultJavaPathProperty = new ImmediateStringProperty(this, "defaultJavaPath", "");
+    private final StringProperty defaultJavaPathProperty = new SimpleStringProperty(this, "defaultJavaPath", "");
 
     /**
      * Path to Java executable, or null if user customizes java directory.
@@ -114,9 +129,9 @@ public final class VersionSetting {
         defaultJavaPathProperty.set(defaultJavaPath);
     }
 
-    private final ImmediateStringProperty javaDirProperty = new ImmediateStringProperty(this, "javaDir", "");
+    private final StringProperty javaDirProperty = new SimpleStringProperty(this, "javaDir", "");
 
-    public ImmediateStringProperty javaDirProperty() {
+    public StringProperty javaDirProperty() {
         return javaDirProperty;
     }
 
@@ -131,9 +146,9 @@ public final class VersionSetting {
         javaDirProperty.set(javaDir);
     }
 
-    private final ImmediateStringProperty wrapperProperty = new ImmediateStringProperty(this, "wrapper", "");
+    private final StringProperty wrapperProperty = new SimpleStringProperty(this, "wrapper", "");
 
-    public ImmediateStringProperty wrapperProperty() {
+    public StringProperty wrapperProperty() {
         return wrapperProperty;
     }
 
@@ -148,9 +163,9 @@ public final class VersionSetting {
         wrapperProperty.set(wrapper);
     }
 
-    private final ImmediateStringProperty permSizeProperty = new ImmediateStringProperty(this, "permSize", "");
+    private final StringProperty permSizeProperty = new SimpleStringProperty(this, "permSize", "");
 
-    public ImmediateStringProperty permSizeProperty() {
+    public StringProperty permSizeProperty() {
         return permSizeProperty;
     }
 
@@ -165,9 +180,9 @@ public final class VersionSetting {
         permSizeProperty.set(permSize);
     }
 
-    private final ImmediateIntegerProperty maxMemoryProperty = new ImmediateIntegerProperty(this, "maxMemory", OperatingSystem.SUGGESTED_MEMORY);
+    private final IntegerProperty maxMemoryProperty = new SimpleIntegerProperty(this, "maxMemory", OperatingSystem.SUGGESTED_MEMORY);
 
-    public ImmediateIntegerProperty maxMemoryProperty() {
+    public IntegerProperty maxMemoryProperty() {
         return maxMemoryProperty;
     }
 
@@ -185,9 +200,9 @@ public final class VersionSetting {
     /**
      * The minimum memory that JVM can allocate for heap.
      */
-    private final ImmediateObjectProperty<Integer> minMemoryProperty = new ImmediateObjectProperty<>(this, "minMemory", null);
+    private final ObjectProperty<Integer> minMemoryProperty = new SimpleObjectProperty<>(this, "minMemory", null);
 
-    public ImmediateObjectProperty<Integer> minMemoryProperty() {
+    public ObjectProperty<Integer> minMemoryProperty() {
         return minMemoryProperty;
     }
 
@@ -199,9 +214,9 @@ public final class VersionSetting {
         minMemoryProperty.set(minMemory);
     }
 
-    private final ImmediateStringProperty preLaunchCommandProperty = new ImmediateStringProperty(this, "precalledCommand", "");
+    private final StringProperty preLaunchCommandProperty = new SimpleStringProperty(this, "precalledCommand", "");
 
-    public ImmediateStringProperty preLaunchCommandProperty() {
+    public StringProperty preLaunchCommandProperty() {
         return preLaunchCommandProperty;
     }
 
@@ -219,9 +234,9 @@ public final class VersionSetting {
 
     // options
 
-    private final ImmediateStringProperty javaArgsProperty = new ImmediateStringProperty(this, "javaArgs", "");
+    private final StringProperty javaArgsProperty = new SimpleStringProperty(this, "javaArgs", "");
 
-    public ImmediateStringProperty javaArgsProperty() {
+    public StringProperty javaArgsProperty() {
         return javaArgsProperty;
     }
 
@@ -236,9 +251,9 @@ public final class VersionSetting {
         javaArgsProperty.set(javaArgs);
     }
 
-    private final ImmediateStringProperty minecraftArgsProperty = new ImmediateStringProperty(this, "minecraftArgs", "");
+    private final StringProperty minecraftArgsProperty = new SimpleStringProperty(this, "minecraftArgs", "");
 
-    public ImmediateStringProperty minecraftArgsProperty() {
+    public StringProperty minecraftArgsProperty() {
         return minecraftArgsProperty;
     }
 
@@ -253,9 +268,9 @@ public final class VersionSetting {
         minecraftArgsProperty.set(minecraftArgs);
     }
 
-    private final ImmediateBooleanProperty noJVMArgsProperty = new ImmediateBooleanProperty(this, "noJVMArgs", false);
+    private final BooleanProperty noJVMArgsProperty = new SimpleBooleanProperty(this, "noJVMArgs", false);
 
-    public ImmediateBooleanProperty noJVMArgsProperty() {
+    public BooleanProperty noJVMArgsProperty() {
         return noJVMArgsProperty;
     }
 
@@ -270,9 +285,26 @@ public final class VersionSetting {
         noJVMArgsProperty.set(noJVMArgs);
     }
 
-    private final ImmediateBooleanProperty notCheckGameProperty = new ImmediateBooleanProperty(this, "notCheckGame", false);
+    private final BooleanProperty notCheckJVMProperty = new SimpleBooleanProperty(this, "notCheckJVM", false);
 
-    public ImmediateBooleanProperty notCheckGameProperty() {
+    public BooleanProperty notCheckJVMProperty() {
+        return notCheckJVMProperty;
+    }
+
+    /**
+     * True if HMCL does not check JVM validity.
+     */
+    public boolean isNotCheckJVM() {
+        return notCheckJVMProperty.get();
+    }
+
+    public void setNotCheckJVM(boolean notCheckJVM) {
+        notCheckJVMProperty.set(notCheckJVM);
+    }
+
+    private final BooleanProperty notCheckGameProperty = new SimpleBooleanProperty(this, "notCheckGame", false);
+
+    public BooleanProperty notCheckGameProperty() {
         return notCheckGameProperty;
     }
 
@@ -287,9 +319,9 @@ public final class VersionSetting {
         notCheckGameProperty.set(notCheckGame);
     }
 
-    private final ImmediateBooleanProperty showLogsProperty = new ImmediateBooleanProperty(this, "showLogs", false);
+    private final BooleanProperty showLogsProperty = new SimpleBooleanProperty(this, "showLogs", false);
 
-    public ImmediateBooleanProperty showLogsProperty() {
+    public BooleanProperty showLogsProperty() {
         return showLogsProperty;
     }
 
@@ -306,14 +338,14 @@ public final class VersionSetting {
 
     // Minecraft settings.
 
-    private final ImmediateStringProperty serverIpProperty = new ImmediateStringProperty(this, "serverIp", "");
+    private final StringProperty serverIpProperty = new SimpleStringProperty(this, "serverIp", "");
 
-    public ImmediateStringProperty serverIpProperty() {
+    public StringProperty serverIpProperty() {
         return serverIpProperty;
     }
 
     /**
-     * The server ip that will be entered after Minecraft successfully loaded immediately.
+     * The server ip that will be entered after Minecraft successfully loaded ly.
      *
      * Format: ip:port or without port.
      */
@@ -326,9 +358,9 @@ public final class VersionSetting {
     }
 
 
-    private final ImmediateBooleanProperty fullscreenProperty = new ImmediateBooleanProperty(this, "fullscreen", false);
+    private final BooleanProperty fullscreenProperty = new SimpleBooleanProperty(this, "fullscreen", false);
 
-    public ImmediateBooleanProperty fullscreenProperty() {
+    public BooleanProperty fullscreenProperty() {
         return fullscreenProperty;
     }
 
@@ -343,9 +375,9 @@ public final class VersionSetting {
         fullscreenProperty.set(fullscreen);
     }
 
-    private final ImmediateIntegerProperty widthProperty = new ImmediateIntegerProperty(this, "width", 854);
+    private final IntegerProperty widthProperty = new SimpleIntegerProperty(this, "width", 854);
 
-    public ImmediateIntegerProperty widthProperty() {
+    public IntegerProperty widthProperty() {
         return widthProperty;
     }
 
@@ -365,9 +397,9 @@ public final class VersionSetting {
     }
 
 
-    private final ImmediateIntegerProperty heightProperty = new ImmediateIntegerProperty(this, "height", 480);
+    private final IntegerProperty heightProperty = new SimpleIntegerProperty(this, "height", 480);
 
-    public ImmediateIntegerProperty heightProperty() {
+    public IntegerProperty heightProperty() {
         return heightProperty;
     }
 
@@ -390,9 +422,9 @@ public final class VersionSetting {
      * 0 - .minecraft<br/>
      * 1 - .minecraft/versions/&lt;version&gt;/<br/>
      */
-    private final ImmediateObjectProperty<EnumGameDirectory> gameDirTypeProperty = new ImmediateObjectProperty<>(this, "gameDirType", EnumGameDirectory.ROOT_FOLDER);
+    private final ObjectProperty<EnumGameDirectory> gameDirTypeProperty = new SimpleObjectProperty<>(this, "gameDirType", EnumGameDirectory.ROOT_FOLDER);
 
-    public ImmediateObjectProperty<EnumGameDirectory> gameDirTypeProperty() {
+    public ObjectProperty<EnumGameDirectory> gameDirTypeProperty() {
         return gameDirTypeProperty;
     }
 
@@ -407,9 +439,9 @@ public final class VersionSetting {
     /**
      * Your custom gameDir
      */
-    private final ImmediateStringProperty gameDirProperty = new ImmediateStringProperty(this, "gameDir", "");
+    private final StringProperty gameDirProperty = new SimpleStringProperty(this, "gameDir", "");
 
-    public ImmediateStringProperty gameDirProperty() {
+    public StringProperty gameDirProperty() {
         return gameDirProperty;
     }
 
@@ -428,9 +460,9 @@ public final class VersionSetting {
      * 1 - Hide the launcher when the game starts.<br/>
      * 2 - Keep the launcher open.<br/>
      */
-    private final ImmediateObjectProperty<LauncherVisibility> launcherVisibilityProperty = new ImmediateObjectProperty<>(this, "launcherVisibility", LauncherVisibility.HIDE);
+    private final ObjectProperty<LauncherVisibility> launcherVisibilityProperty = new SimpleObjectProperty<>(this, "launcherVisibility", LauncherVisibility.HIDE);
 
-    public ImmediateObjectProperty<LauncherVisibility> launcherVisibilityProperty() {
+    public ObjectProperty<LauncherVisibility> launcherVisibilityProperty() {
         return launcherVisibilityProperty;
     }
 
@@ -449,12 +481,12 @@ public final class VersionSetting {
         if ("Default".equals(getJava())) return JavaVersion.fromCurrentEnvironment();
         else if (isUsesCustomJavaDir()) {
             try {
-                return JavaVersion.fromExecutable(new File(getJavaDir()));
+                return JavaVersion.fromExecutable(Paths.get(getJavaDir()));
             } catch (IOException 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 +519,7 @@ public final class VersionSetting {
         minecraftArgsProperty.addListener(listener);
         noJVMArgsProperty.addListener(listener);
         notCheckGameProperty.addListener(listener);
+        notCheckJVMProperty.addListener(listener);
         showLogsProperty.addListener(listener);
         serverIpProperty.addListener(listener);
         fullscreenProperty.addListener(listener);
@@ -500,11 +533,11 @@ public final class VersionSetting {
 
     public LaunchOptions toLaunchOptions(File gameDir) throws InterruptedException {
         JavaVersion javaVersion = Optional.ofNullable(getJavaVersion()).orElse(JavaVersion.fromCurrentEnvironment());
-        return new LaunchOptions.Builder()
+        LaunchOptions.Builder builder = new LaunchOptions.Builder()
                 .setGameDir(gameDir)
                 .setJava(javaVersion)
-                .setVersionName(Launcher.TITLE)
-                .setProfileName(Launcher.TITLE)
+                .setVersionName(Metadata.TITLE)
+                .setProfileName(Metadata.TITLE)
                 .setMinecraftArgs(getMinecraftArgs())
                 .setJavaArgs(getJavaArgs())
                 .setMaxMemory(getMaxMemory())
@@ -515,21 +548,20 @@ public final class VersionSetting {
                 .setFullscreen(isFullscreen())
                 .setServerIp(getServerIp())
                 .setWrapper(getWrapper())
-                .setProxyHost(CONFIG.getProxyHost())
-                .setProxyPort(CONFIG.getProxyPort())
-                .setProxyUser(CONFIG.getProxyUser())
-                .setProxyPass(CONFIG.getProxyPass())
                 .setPrecalledCommand(getPreLaunchCommand())
-                .setNoGeneratedJVMArgs(isNoJVMArgs())
-                .create();
+                .setNoGeneratedJVMArgs(isNoJVMArgs());
+        if (config().hasProxy()) {
+            builder.setProxyHost(config().getProxyHost());
+            builder.setProxyPort(config().getProxyPort());
+            if (config().hasProxyAuth()) {
+                builder.setProxyUser(config().getProxyUser());
+                builder.setProxyPass(config().getProxyPass());
+            }
+        }
+        return builder.create();
     }
 
     public static class Serializer implements JsonSerializer<VersionSetting>, JsonDeserializer<VersionSetting> {
-        public static final Serializer INSTANCE = new Serializer();
-
-        private Serializer() {
-        }
-
         @Override
         public JsonElement serialize(VersionSetting src, Type typeOfSrc, JsonSerializationContext context) {
             if (src == null) return JsonNull.INSTANCE;
@@ -551,6 +583,7 @@ public final class VersionSetting {
             obj.addProperty("fullscreen", src.isFullscreen());
             obj.addProperty("noJVMArgs", src.isNoJVMArgs());
             obj.addProperty("notCheckGame", src.isNotCheckGame());
+            obj.addProperty("notCheckJVM", src.isNotCheckJVM());
             obj.addProperty("showLogs", src.isShowLogs());
             obj.addProperty("gameDir", src.getGameDir());
             obj.addProperty("launcherVisibility", src.getLauncherVisibility().ordinal());
@@ -588,6 +621,7 @@ public final class VersionSetting {
             vs.setFullscreen(Optional.ofNullable(obj.get("fullscreen")).map(JsonElement::getAsBoolean).orElse(false));
             vs.setNoJVMArgs(Optional.ofNullable(obj.get("noJVMArgs")).map(JsonElement::getAsBoolean).orElse(false));
             vs.setNotCheckGame(Optional.ofNullable(obj.get("notCheckGame")).map(JsonElement::getAsBoolean).orElse(false));
+            vs.setNotCheckJVM(Optional.ofNullable(obj.get("notCheckJVM")).map(JsonElement::getAsBoolean).orElse(false));
             vs.setShowLogs(Optional.ofNullable(obj.get("showLogs")).map(JsonElement::getAsBoolean).orElse(false));
             vs.setLauncherVisibility(LauncherVisibility.values()[Optional.ofNullable(obj.get("launcherVisibility")).map(JsonElement::getAsInt).orElse(1)]);
             vs.setGameDirType(EnumGameDirectory.values()[Optional.ofNullable(obj.get("gameDirType")).map(JsonElement::getAsInt).orElse(0)]);
@@ -601,7 +635,9 @@ public final class VersionSetting {
         }
 
         private int parseJsonPrimitive(JsonPrimitive primitive, int defaultValue) {
-            if (primitive.isNumber())
+            if (primitive == null)
+                return defaultValue;
+            else if (primitive.isNumber())
                 return primitive.getAsInt();
             else
                 return Lang.parseInt(primitive.getAsString(), defaultValue);

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

@@ -1,152 +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.controls.JFXButton;
-import com.jfoenix.controls.JFXProgressBar;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.fxml.FXML;
-import javafx.scene.control.Label;
-import javafx.scene.image.Image;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.StackPane;
-
-import org.jackhuang.hmcl.auth.Account;
-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.setting.Accounts;
-import org.jackhuang.hmcl.setting.Theme;
-import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.ui.construct.ComponentList;
-import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
-
-import static org.jackhuang.hmcl.ui.FXUtils.installTooltip;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
-import java.util.Optional;
-
-public class AccountPage extends StackPane implements DecoratorPage {
-    private final StringProperty title;
-    private final ObjectProperty<Runnable> onDelete = new SimpleObjectProperty<>(this, "onDelete");
-    private final VersionListItem item;
-    private final Account account;
-
-    @FXML
-    private Label lblType;
-    @FXML
-    private Label lblServer;
-    @FXML
-    private Label lblCharacter;
-    @FXML
-    private Label lblEmail;
-    @FXML
-    private BorderPane paneServer;
-    @FXML
-    private BorderPane paneEmail;
-    @FXML
-    private ComponentList componentList;
-    @FXML
-    private JFXButton btnDelete;
-    @FXML
-    private JFXButton btnRefresh;
-    @FXML
-    private JFXProgressBar progressBar;
-
-    public AccountPage(Account account, VersionListItem item) {
-        this.account = account;
-        this.item = item;
-
-        title = new SimpleStringProperty(this, "title", i18n("account") + " - " + account.getCharacter());
-
-        FXUtils.loadFXML(this, "/assets/fxml/account.fxml");
-
-        if (account instanceof AuthlibInjectorAccount) {
-            AuthlibInjectorServer server = ((AuthlibInjectorAccount) account).getServer();
-            lblServer.setText(server.getName());
-            installTooltip(lblServer, server.getUrl());
-        } else {
-            componentList.removeChildren(paneServer);
-
-            if (account instanceof OfflineAccount) {
-                componentList.removeChildren(paneEmail);
-            }
-        }
-
-        btnDelete.setGraphic(SVG.delete(Theme.blackFillBinding(), 15, 15));
-        btnRefresh.setGraphic(SVG.refresh(Theme.blackFillBinding(), 15, 15));
-
-        lblCharacter.setText(account.getCharacter());
-        lblType.setText(Accounts.getAccountTypeName(account));
-        lblEmail.setText(account.getUsername());
-
-        btnRefresh.setVisible(account instanceof YggdrasilAccount);
-    }
-
-    @FXML
-    private void onDelete() {
-        Accounts.getAccounts().remove(account);
-        Optional.ofNullable(onDelete.get()).ifPresent(Runnable::run);
-    }
-
-    @FXML
-    private void onRefresh() {
-        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);
-                            item.setImage(image, AccountHelper.getViewport(4));
-                        }
-                    }).start();
-        }
-    }
-
-    public String getTitle() {
-        return title.get();
-    }
-
-    @Override
-    public StringProperty titleProperty() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title.set(title);
-    }
-
-    public Runnable getOnDelete() {
-        return onDelete.get();
-    }
-
-    public ObjectProperty<Runnable> onDeleteProperty() {
-        return onDelete;
-    }
-
-    public void setOnDelete(Runnable onDelete) {
-        this.onDelete.set(onDelete);
-    }
-}

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,30 +13,52 @@
  * 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.utils.JFXUtilities;
 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.setting.Settings;
+import org.jackhuang.hmcl.Metadata;
+import org.jackhuang.hmcl.game.HMCLGameRepository;
+import org.jackhuang.hmcl.game.Version;
+import org.jackhuang.hmcl.setting.Accounts;
+import org.jackhuang.hmcl.setting.EnumCommonDirectory;
+import org.jackhuang.hmcl.setting.Profiles;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
-import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
-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.TaskExecutorDialogPane;
+import org.jackhuang.hmcl.ui.account.AccountList;
+import org.jackhuang.hmcl.ui.account.AuthlibInjectorServersPage;
+import org.jackhuang.hmcl.ui.construct.*;
+import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
+import org.jackhuang.hmcl.ui.decorator.DecoratorController;
+import org.jackhuang.hmcl.ui.download.ModpackInstallWizardProvider;
+import org.jackhuang.hmcl.ui.profile.ProfileList;
+import org.jackhuang.hmcl.ui.versions.GameItem;
+import org.jackhuang.hmcl.ui.versions.GameList;
+import org.jackhuang.hmcl.ui.versions.VersionPage;
+import org.jackhuang.hmcl.upgrade.UpdateChecker;
 import org.jackhuang.hmcl.util.FutureCallback;
-import org.jackhuang.hmcl.util.JavaVersion;
-
-import static org.jackhuang.hmcl.setting.ConfigHolder.CONFIG;
+import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.javafx.BindingMapping;
+import org.jackhuang.hmcl.util.platform.JavaVersion;
+import org.jackhuang.hmcl.util.versioning.VersionNumber;
 
+import java.io.File;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class Controllers {
 
@@ -45,9 +67,12 @@ public final class Controllers {
     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 Decorator decorator;
+    private static DecoratorController decorator;
 
     public static Scene getScene() {
         return scene;
@@ -64,6 +89,40 @@ public final class Controllers {
         return settingsPage;
     }
 
+    // FXThread
+    public static GameList getGameListPage() {
+        if (gameListPage == null) {
+            gameListPage = new GameList();
+            FXUtils.applyDragListener(gameListPage, it -> "zip".equals(FileUtils.getExtension(it)), modpacks -> {
+                File modpack = modpacks.get(0);
+                Controllers.getDecorator().startWizard(new ModpackInstallWizardProvider(Profiles.getSelectedProfile(), modpack), i18n("install.modpack"));
+            });
+        }
+        return gameListPage;
+    }
+
+    // FXThread
+    public static AccountList getAccountListPage() {
+        if (accountListPage == null) {
+            AccountList accountListPage = new AccountList();
+            accountListPage.selectedAccountProperty().bindBidirectional(Accounts.selectedAccountProperty());
+            accountListPage.accountsProperty().bindContent(Accounts.accountsProperty());
+            Controllers.accountListPage = accountListPage;
+        }
+        return accountListPage;
+    }
+
+    // FXThread
+    public static ProfileList getProfileListPage() {
+        if (profileListPage == null) {
+            ProfileList profileListPage = new ProfileList();
+            profileListPage.selectedProfileProperty().bindBidirectional(Profiles.selectedProfileProperty());
+            profileListPage.profilesProperty().bindContent(Profiles.profilesProperty());
+            Controllers.profileListPage = profileListPage;
+        }
+        return profileListPage;
+    }
+
     // FXThread
     public static VersionPage getVersionPage() {
         if (versionPage == null)
@@ -79,13 +138,49 @@ public final class Controllers {
     }
 
     // FXThread
-    public static Decorator getDecorator() {
+    public static DecoratorController getDecorator() {
         return decorator;
     }
 
     public static MainPage getMainPage() {
-        if (mainPage == null)
-            mainPage = new MainPage();
+        if (mainPage == null) {
+            MainPage mainPage = new MainPage();
+            FXUtils.applyDragListener(mainPage, it -> "zip".equals(FileUtils.getExtension(it)), modpacks -> {
+                File modpack = modpacks.get(0);
+                Controllers.getDecorator().startWizard(new ModpackInstallWizardProvider(Profiles.getSelectedProfile(), modpack), i18n("install.modpack"));
+            });
+
+            FXUtils.onChangeAndOperate(Profiles.selectedVersionProperty(), version -> {
+                if (version != null) {
+                    mainPage.setCurrentGame(version);
+                } else {
+                    mainPage.setCurrentGame(i18n("version.empty"));
+                }
+            });
+            mainPage.showUpdateProperty().bind(UpdateChecker.outdatedProperty());
+            mainPage.latestVersionProperty().bind(
+                    BindingMapping.of(UpdateChecker.latestVersionProperty())
+                            .map(version -> version == null ? "" : i18n("update.bubble.title", version.getVersion())));
+
+            Profiles.registerVersionsListener(profile -> {
+                HMCLGameRepository repository = profile.getRepository();
+                List<Node> children = repository.getVersions().parallelStream()
+                        .filter(version -> !version.isHidden())
+                        .sorted(Comparator.comparing((Version version) -> version.getReleaseTime() == null ? new Date(0L) : version.getReleaseTime())
+                                .thenComparing(a -> VersionNumber.asVersion(a.getId())))
+                        .map(version -> {
+                            Node node = PopupMenu.wrapPopupMenuItem(new GameItem(profile, version.getId()));
+                            node.setOnMouseClicked(e -> profile.setSelectedVersion(version.getId()));
+                            return node;
+                        })
+                        .collect(Collectors.toList());
+                JFXUtilities.runInFX(() -> {
+                    if (profile == Profiles.getSelectedProfile())
+                        mainPage.getVersions().setAll(children);
+                });
+            });
+            Controllers.mainPage = mainPage;
+        }
         return mainPage;
     }
 
@@ -94,28 +189,29 @@ public final class Controllers {
     }
 
     public static void initialize(Stage stage) {
+        Logging.LOG.info("Start initializing application");
+
         Controllers.stage = stage;
 
         stage.setOnCloseRequest(e -> Launcher.stopApplication());
 
-        decorator = new Decorator(stage, getMainPage(), Launcher.TITLE, false, true);
-        decorator.showPage(null);
-        leftPaneController = new LeftPaneController(decorator.getLeftPane());
+        decorator = new DecoratorController(stage, getMainPage());
+        leftPaneController = new LeftPaneController();
+        decorator.getDecorator().drawerProperty().setAll(leftPaneController);
 
-        Settings.INSTANCE.onProfileLoading();
-        Task.of(JavaVersion::initialize).start();
+        if (config().getCommonDirType() == EnumCommonDirectory.CUSTOM &&
+                !FileUtils.canCreateDirectory(config().getCommonDirectory())) {
+            config().setCommonDirType(EnumCommonDirectory.DEFAULT);
+            dialog(i18n("launcher.cache_directory.invalid"));
+        }
 
-        decorator.setCustomMaximize(false);
+        Task.runAsync(JavaVersion::initialize).start();
 
-        scene = new Scene(decorator, 804, 521);
-        scene.getStylesheets().setAll(CONFIG.getTheme().getStylesheets());
-        stage.setMinWidth(804);
-        stage.setMaxWidth(804);
-        stage.setMinHeight(521);
-        stage.setMaxHeight(521);
+        scene = new Scene(decorator.getDecorator(), 800, 519);
+        scene.getStylesheets().setAll(config().getTheme().getStylesheets());
 
         stage.getIcons().add(new Image("/assets/img/icon.png"));
-        stage.setTitle(Launcher.TITLE);
+        stage.setTitle(Metadata.TITLE);
     }
 
     public static void dialog(Region content) {
@@ -128,14 +224,14 @@ public final class Controllers {
     }
 
     public static void dialog(String text, String title) {
-        dialog(text, title, MessageBox.INFORMATION_MESSAGE);
+        dialog(text, title, MessageType.INFORMATION);
     }
 
-    public static void dialog(String text, String title, int type) {
+    public static void dialog(String text, String title, MessageType type) {
         dialog(text, title, type, null);
     }
 
-    public static void dialog(String text, String title, int type, Runnable onAccept) {
+    public static void dialog(String text, String title, MessageType type, Runnable onAccept) {
         dialog(new MessageDialogPane(text, title, type, onAccept));
     }
 
@@ -149,6 +245,10 @@ public final class Controllers {
         return pane;
     }
 
+    public static Region taskDialog(TaskExecutor executor, String title) {
+        return taskDialog(executor, title, "");
+    }
+
     public static Region taskDialog(TaskExecutor executor, String title, String subtitle) {
         return taskDialog(executor, title, subtitle, null);
     }
@@ -162,26 +262,8 @@ public final class Controllers {
         return pane;
     }
 
-    /**
-     * Use {@link DialogCloseEvent}
-     */
-    public static void closeDialog(Region content) {
-        if (stage == null) // shut down
-            return;
-        decorator.closeDialog(content);
-    }
-
     public static void navigate(Node node) {
-        if (decorator.getNowPage() == node)
-            decorator.showPage(null);
-        else
-            decorator.showPage(node);
-    }
-
-    public static void showUpdate() {
-        if (stage == null) // shut down
-            return;
-        getLeftPaneController().showUpdate();
+        decorator.getNavigator().navigate(node);
     }
 
     public static boolean isStopped() {
@@ -196,5 +278,8 @@ public final class Controllers {
         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) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui;
 
@@ -27,11 +27,11 @@ import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
+import org.jackhuang.hmcl.Metadata;
+import org.jackhuang.hmcl.upgrade.UpdateChecker;
 
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
-import org.jackhuang.hmcl.Launcher;
-
 /**
  * @author huangyuhui
  */
@@ -39,7 +39,7 @@ public class CrashWindow extends Stage {
 
     public CrashWindow(String text) {
         Label lblCrash = new Label();
-        if (Launcher.UPDATE_CHECKER.isOutOfDate())
+        if (UpdateChecker.isOutdated())
             lblCrash.setText(i18n("launcher.crash_out_dated"));
         else
             lblCrash.setText(i18n("launcher.crash"));
@@ -51,7 +51,7 @@ public class CrashWindow extends Stage {
 
         Button btnContact = new Button();
         btnContact.setText(i18n("launcher.contact"));
-        btnContact.setOnMouseClicked(event -> FXUtils.openLink(Launcher.CONTACT));
+        btnContact.setOnMouseClicked(event -> FXUtils.openLink(Metadata.CONTACT_URL));
         HBox box = new HBox();
         box.setStyle("-fx-padding: 8px;");
         box.getChildren().add(btnContact);

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

@@ -1,714 +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.controls.JFXButton;
-import com.jfoenix.controls.JFXDialog;
-import com.jfoenix.controls.JFXDrawer;
-import com.jfoenix.controls.JFXHamburger;
-import com.jfoenix.svg.SVGGlyph;
-import javafx.animation.Interpolator;
-import javafx.animation.KeyFrame;
-import javafx.animation.KeyValue;
-import javafx.animation.Timeline;
-import javafx.application.Platform;
-import javafx.beans.binding.Bindings;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.event.EventHandler;
-import javafx.fxml.FXML;
-import javafx.geometry.BoundingBox;
-import javafx.geometry.Bounds;
-import javafx.geometry.Insets;
-import javafx.geometry.Rectangle2D;
-import javafx.scene.Cursor;
-import javafx.scene.Node;
-import javafx.scene.control.Label;
-import javafx.scene.control.Tooltip;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import javafx.scene.input.DragEvent;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.*;
-import javafx.scene.paint.Color;
-import javafx.scene.shape.Rectangle;
-import javafx.stage.Screen;
-import javafx.stage.Stage;
-import javafx.stage.StageStyle;
-import javafx.util.Duration;
-import org.jackhuang.hmcl.Launcher;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDnD;
-import org.jackhuang.hmcl.setting.EnumBackgroundImage;
-import org.jackhuang.hmcl.setting.Settings;
-import org.jackhuang.hmcl.setting.Theme;
-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.construct.AdvancedListBox;
-import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
-import org.jackhuang.hmcl.ui.construct.StackContainerPane;
-import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogWizardDisplayer;
-import org.jackhuang.hmcl.ui.wizard.*;
-import org.jackhuang.hmcl.util.Lang;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.InvalidPathException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.List;
-import java.util.Locale;
-import java.util.Optional;
-import java.util.Queue;
-import java.util.Random;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.logging.Level;
-
-import static java.util.stream.Collectors.toList;
-import static org.jackhuang.hmcl.setting.ConfigHolder.CONFIG;
-import static org.jackhuang.hmcl.util.Logging.LOG;
-
-public final class Decorator extends StackPane implements TaskExecutorDialogWizardDisplayer {
-    private static final SVGGlyph minus = Lang.apply(new SVGGlyph(0, "MINUS", "M804.571 420.571v109.714q0 22.857-16 38.857t-38.857 16h-694.857q-22.857 0-38.857-16t-16-38.857v-109.714q0-22.857 16-38.857t38.857-16h694.857q22.857 0 38.857 16t16 38.857z", Color.WHITE),
-            glyph -> { glyph.setSize(12, 2); glyph.setTranslateY(4); });
-    private static final SVGGlyph resizeMax = Lang.apply(new SVGGlyph(0, "RESIZE_MAX", "M726 810v-596h-428v596h428zM726 44q34 0 59 25t25 59v768q0 34-25 60t-59 26h-428q-34 0-59-26t-25-60v-768q0-34 25-60t59-26z", Color.WHITE),
-            glyph -> { glyph.setPrefSize(12, 12); glyph.setSize(12, 12); });
-    private static final SVGGlyph resizeMin = Lang.apply(new SVGGlyph(0, "RESIZE_MIN", "M80.842 943.158v-377.264h565.894v377.264h-565.894zM0 404.21v619.79h727.578v-619.79h-727.578zM377.264 161.684h565.894v377.264h-134.736v80.842h215.578v-619.79h-727.578v323.37h80.842v-161.686z", Color.WHITE),
-            glyph -> { glyph.setPrefSize(12, 12); glyph.setSize(12, 12); });
-    private static final SVGGlyph close = Lang.apply(new SVGGlyph(0, "CLOSE", "M810 274l-238 238 238 238-60 60-238-238-238 238-60-60 238-238-238-238 60-60 238 238 238-238z", Color.WHITE),
-            glyph -> { glyph.setPrefSize(12, 12); glyph.setSize(12, 12); });
-
-    private static final String PROPERTY_DIALOG_CLOSE_HANDLER = Decorator.class.getName() + ".dialog.closeListener";
-
-    private final ObjectProperty<Runnable> onCloseButtonAction;
-    private final BooleanProperty customMaximize = new SimpleBooleanProperty(false);
-
-    private final Stage primaryStage;
-    private final Node mainPage;
-    private final boolean max, min;
-    private final WizardController wizardController = new WizardController(this);
-    private final Queue<Object> cancelQueue = new ConcurrentLinkedQueue<>();
-
-    private double xOffset, yOffset, newX, newY, initX, initY;
-    private boolean allowMove, isDragging, maximized;
-    private BoundingBox originalBox, maximizedBox;
-    private final TransitionHandler animationHandler;
-
-    private JFXDialog dialog;
-    private StackContainerPane dialogPane;
-
-    @FXML
-    private StackPane contentPlaceHolder;
-    @FXML
-    private StackPane drawerWrapper;
-    @FXML
-    private BorderPane titleContainer;
-    @FXML
-    private BorderPane leftRootPane;
-    @FXML
-    private HBox buttonsContainer;
-    @FXML
-    private JFXButton backNavButton;
-    @FXML
-    private JFXButton refreshNavButton;
-    @FXML
-    private JFXButton closeNavButton;
-    @FXML
-    private JFXButton refreshMenuButton;
-    @FXML
-    private Label titleLabel;
-    @FXML
-    private Label lblTitle;
-    @FXML
-    private AdvancedListBox leftPane;
-    @FXML
-    private JFXDrawer drawer;
-    @FXML
-    private StackPane titleBurgerContainer;
-    @FXML
-    private JFXHamburger titleBurger;
-    @FXML
-    private JFXButton btnMin;
-    @FXML
-    private JFXButton btnMax;
-    @FXML
-    private JFXButton btnClose;
-    @FXML
-    private HBox navLeft;
-    @FXML
-    private ImageView welcomeView;
-
-    public Decorator(Stage primaryStage, Node mainPage, String title) {
-        this(primaryStage, mainPage, title, true, true);
-    }
-
-    public Decorator(Stage primaryStage, Node mainPage, String title, boolean max, boolean min) {
-        this.primaryStage = primaryStage;
-        this.mainPage = mainPage;
-        this.max = max;
-        this.min = min;
-
-        FXUtils.loadFXML(this, "/assets/fxml/decorator.fxml");
-
-        onCloseButtonAction = new SimpleObjectProperty<>(this, "onCloseButtonAction", Launcher::stopApplication);
-
-        primaryStage.initStyle(StageStyle.UNDECORATED);
-        btnClose.setGraphic(close);
-        btnMin.setGraphic(minus);
-        btnMax.setGraphic(resizeMax);
-
-        close.fillProperty().bind(Theme.foregroundFillBinding());
-        minus.fillProperty().bind(Theme.foregroundFillBinding());
-        resizeMax.fillProperty().bind(Theme.foregroundFillBinding());
-        resizeMin.fillProperty().bind(Theme.foregroundFillBinding());
-
-        refreshNavButton.setGraphic(SVG.refresh(Theme.foregroundFillBinding(), 15, 15));
-        closeNavButton.setGraphic(SVG.close(Theme.foregroundFillBinding(), 15, 15));
-        backNavButton.setGraphic(SVG.back(Theme.foregroundFillBinding(), 15, 15));
-
-        lblTitle.setText(title);
-
-        buttonsContainer.setBackground(new Background(new BackgroundFill(Color.BLACK, CornerRadii.EMPTY, Insets.EMPTY)));
-        titleContainer.addEventHandler(MouseEvent.MOUSE_CLICKED, event -> {
-            if (event.getClickCount() == 2)
-                btnMax.fire();
-        });
-
-        welcomeView.setCursor(Cursor.HAND);
-        welcomeView.setOnMouseClicked(e -> {
-            Timeline nowAnimation = new Timeline();
-            nowAnimation.getKeyFrames().addAll(
-                    new KeyFrame(Duration.ZERO, new KeyValue(welcomeView.opacityProperty(), 1.0D, Interpolator.EASE_BOTH)),
-                    new KeyFrame(new Duration(300), new KeyValue(welcomeView.opacityProperty(), 0.0D, Interpolator.EASE_BOTH)),
-                    new KeyFrame(new Duration(300), e2 -> drawerWrapper.getChildren().remove(welcomeView))
-            );
-            nowAnimation.play();
-        });
-        if (!Settings.INSTANCE.isFirstLaunch() || Settings.INSTANCE.getLocale().getLocale() != Locale.CHINA)
-            drawerWrapper.getChildren().remove(welcomeView);
-
-        if (!min) buttonsContainer.getChildren().remove(btnMin);
-        if (!max) buttonsContainer.getChildren().remove(btnMax);
-
-        //JFXDepthManager.setDepth(titleContainer, 1);
-        titleContainer.addEventHandler(MouseEvent.MOUSE_ENTERED, e -> allowMove = true);
-        titleContainer.addEventHandler(MouseEvent.MOUSE_EXITED, e -> {
-            if (!isDragging) allowMove = false;
-        });
-        Rectangle rectangle = new Rectangle(0, 0, 0, 0);
-        rectangle.widthProperty().bind(titleContainer.widthProperty());
-        rectangle.heightProperty().bind(Bindings.createDoubleBinding(() -> titleContainer.getHeight() + 100, titleContainer.heightProperty()));
-        titleContainer.setClip(rectangle);
-
-        animationHandler = new TransitionHandler(contentPlaceHolder);
-
-        setupBackground();
-        setupAuthlibInjectorDnD();
-    }
-
-    // ==== Background ====
-    private void setupBackground() {
-        drawerWrapper.backgroundProperty().bind(
-                Bindings.createObjectBinding(
-                        () -> {
-                            Image image = null;
-                            if (CONFIG.getBackgroundImageType() == EnumBackgroundImage.CUSTOM && CONFIG.getBackgroundImage() != null) {
-                                image = tryLoadImage(Paths.get(CONFIG.getBackgroundImage()))
-                                        .orElse(null);
-                            }
-                            if (image == null) {
-                                image = loadDefaultBackgroundImage();
-                            }
-                            return new Background(new BackgroundImage(image, BackgroundRepeat.NO_REPEAT, BackgroundRepeat.NO_REPEAT, BackgroundPosition.DEFAULT, new BackgroundSize(800, 480, false, false, true, true)));
-                        },
-                        CONFIG.backgroundImageTypeProperty(),
-                        CONFIG.backgroundImageProperty()));
-    }
-
-    private Image defaultBackground = new Image("/assets/img/background.jpg");
-
-    /**
-     * Load background image from bg/, background.png, background.jpg
-     */
-    private Image loadDefaultBackgroundImage() {
-        Optional<Image> image = randomImageIn(Paths.get("bg"));
-        if (!image.isPresent()) {
-            image = tryLoadImage(Paths.get("background.png"));
-        }
-        if (!image.isPresent()) {
-            image = tryLoadImage(Paths.get("background.jpg"));
-        }
-        return image.orElse(defaultBackground);
-    }
-
-    private Optional<Image> randomImageIn(Path imageDir) {
-        if (!Files.isDirectory(imageDir)) {
-            return Optional.empty();
-        }
-
-        List<Path> candidates;
-        try {
-            candidates = Files.list(imageDir)
-                    .filter(Files::isRegularFile)
-                    .filter(it -> {
-                        String filename = it.getFileName().toString();
-                        return filename.endsWith(".png") || filename.endsWith(".jpg");
-                    })
-                    .collect(toList());
-        } catch (IOException e) {
-            LOG.log(Level.WARNING, "Failed to list files in ./bg", e);
-            return Optional.empty();
-        }
-
-        Random rnd = new Random();
-        while (candidates.size() > 0) {
-            int selected = rnd.nextInt(candidates.size());
-            Optional<Image> loaded = tryLoadImage(candidates.get(selected));
-            if (loaded.isPresent()) {
-                return Optional.of(loaded.get());
-            } else {
-                candidates.remove(selected);
-            }
-        }
-        return Optional.empty();
-    }
-
-    private Optional<Image> tryLoadImage(Path path) {
-        if (Files.isRegularFile(path)) {
-            try {
-                return Optional.of(new Image(path.toAbsolutePath().toUri().toString()));
-            } catch (IllegalArgumentException ignored) {
-            }
-        }
-        return Optional.empty();
-    }
-    // ====
-
-    @FXML
-    private void onMouseMoved(MouseEvent mouseEvent) {
-        if (!primaryStage.isMaximized() && !primaryStage.isFullScreen() && !maximized) {
-            if (!primaryStage.isResizable())
-                updateInitMouseValues(mouseEvent);
-            else {
-                double x = mouseEvent.getX(), y = mouseEvent.getY();
-                Bounds boundsInParent = getBoundsInParent();
-                if (getBorder() != null && getBorder().getStrokes().size() > 0) {
-                    double borderWidth = this.contentPlaceHolder.snappedLeftInset();
-                    if (this.isRightEdge(x, y, boundsInParent)) {
-                        if (y < borderWidth) {
-                            setCursor(Cursor.NE_RESIZE);
-                        } else if (y > this.getHeight() - borderWidth) {
-                            setCursor(Cursor.SE_RESIZE);
-                        } else {
-                            setCursor(Cursor.E_RESIZE);
-                        }
-                    } else if (this.isLeftEdge(x, y, boundsInParent)) {
-                        if (y < borderWidth) {
-                            setCursor(Cursor.NW_RESIZE);
-                        } else if (y > this.getHeight() - borderWidth) {
-                            setCursor(Cursor.SW_RESIZE);
-                        } else {
-                            setCursor(Cursor.W_RESIZE);
-                        }
-                    } else if (this.isTopEdge(x, y, boundsInParent)) {
-                        setCursor(Cursor.N_RESIZE);
-                    } else if (this.isBottomEdge(x, y, boundsInParent)) {
-                        setCursor(Cursor.S_RESIZE);
-                    } else {
-                        setCursor(Cursor.DEFAULT);
-                    }
-
-                    this.updateInitMouseValues(mouseEvent);
-                }
-            }
-        } else {
-            setCursor(Cursor.DEFAULT);
-        }
-    }
-
-    @FXML
-    private void onMouseReleased() {
-        isDragging = false;
-    }
-
-    @FXML
-    private void onMouseDragged(MouseEvent mouseEvent) {
-        this.isDragging = true;
-        if (mouseEvent.isPrimaryButtonDown() && (this.xOffset != -1.0 || this.yOffset != -1.0)) {
-            if (!this.primaryStage.isFullScreen() && !mouseEvent.isStillSincePress() && !this.primaryStage.isMaximized() && !this.maximized) {
-                this.newX = mouseEvent.getScreenX();
-                this.newY = mouseEvent.getScreenY();
-                double deltaX = this.newX - this.initX;
-                double deltaY = this.newY - this.initY;
-                Cursor cursor = this.getCursor();
-                if (Cursor.E_RESIZE == cursor) {
-                    this.setStageWidth(this.primaryStage.getWidth() + deltaX);
-                    mouseEvent.consume();
-                } else if (Cursor.NE_RESIZE == cursor) {
-                    if (this.setStageHeight(this.primaryStage.getHeight() - deltaY)) {
-                        this.primaryStage.setY(this.primaryStage.getY() + deltaY);
-                    }
-
-                    this.setStageWidth(this.primaryStage.getWidth() + deltaX);
-                    mouseEvent.consume();
-                } else if (Cursor.SE_RESIZE == cursor) {
-                    this.setStageWidth(this.primaryStage.getWidth() + deltaX);
-                    this.setStageHeight(this.primaryStage.getHeight() + deltaY);
-                    mouseEvent.consume();
-                } else if (Cursor.S_RESIZE == cursor) {
-                    this.setStageHeight(this.primaryStage.getHeight() + deltaY);
-                    mouseEvent.consume();
-                } else if (Cursor.W_RESIZE == cursor) {
-                    if (this.setStageWidth(this.primaryStage.getWidth() - deltaX)) {
-                        this.primaryStage.setX(this.primaryStage.getX() + deltaX);
-                    }
-
-                    mouseEvent.consume();
-                } else if (Cursor.SW_RESIZE == cursor) {
-                    if (this.setStageWidth(this.primaryStage.getWidth() - deltaX)) {
-                        this.primaryStage.setX(this.primaryStage.getX() + deltaX);
-                    }
-
-                    this.setStageHeight(this.primaryStage.getHeight() + deltaY);
-                    mouseEvent.consume();
-                } else if (Cursor.NW_RESIZE == cursor) {
-                    if (this.setStageWidth(this.primaryStage.getWidth() - deltaX)) {
-                        this.primaryStage.setX(this.primaryStage.getX() + deltaX);
-                    }
-
-                    if (this.setStageHeight(this.primaryStage.getHeight() - deltaY)) {
-                        this.primaryStage.setY(this.primaryStage.getY() + deltaY);
-                    }
-
-                    mouseEvent.consume();
-                } else if (Cursor.N_RESIZE == cursor) {
-                    if (this.setStageHeight(this.primaryStage.getHeight() - deltaY)) {
-                        this.primaryStage.setY(this.primaryStage.getY() + deltaY);
-                    }
-
-                    mouseEvent.consume();
-                } else if (this.allowMove) {
-                    this.primaryStage.setX(mouseEvent.getScreenX() - this.xOffset);
-                    this.primaryStage.setY(mouseEvent.getScreenY() - this.yOffset);
-                    mouseEvent.consume();
-                }
-            }
-        }
-    }
-
-    @FXML
-    private void onMin() {
-        primaryStage.setIconified(true);
-    }
-
-    @FXML
-    private void onMax() {
-        if (!max) return;
-        if (!this.isCustomMaximize()) {
-            this.primaryStage.setMaximized(!this.primaryStage.isMaximized());
-            this.maximized = this.primaryStage.isMaximized();
-            if (this.primaryStage.isMaximized()) {
-                this.btnMax.setGraphic(resizeMin);
-                this.btnMax.setTooltip(new Tooltip("Restore Down"));
-            } else {
-                this.btnMax.setGraphic(resizeMax);
-                this.btnMax.setTooltip(new Tooltip("Maximize"));
-            }
-        } else {
-            if (!this.maximized) {
-                this.originalBox = new BoundingBox(primaryStage.getX(), primaryStage.getY(), primaryStage.getWidth(), primaryStage.getHeight());
-                Screen screen = Screen.getScreensForRectangle(primaryStage.getX(), primaryStage.getY(), primaryStage.getWidth(), primaryStage.getHeight()).get(0);
-                Rectangle2D bounds = screen.getVisualBounds();
-                this.maximizedBox = new BoundingBox(bounds.getMinX(), bounds.getMinY(), bounds.getWidth(), bounds.getHeight());
-                primaryStage.setX(this.maximizedBox.getMinX());
-                primaryStage.setY(this.maximizedBox.getMinY());
-                primaryStage.setWidth(this.maximizedBox.getWidth());
-                primaryStage.setHeight(this.maximizedBox.getHeight());
-                this.btnMax.setGraphic(resizeMin);
-                this.btnMax.setTooltip(new Tooltip("Restore Down"));
-            } else {
-                primaryStage.setX(this.originalBox.getMinX());
-                primaryStage.setY(this.originalBox.getMinY());
-                primaryStage.setWidth(this.originalBox.getWidth());
-                primaryStage.setHeight(this.originalBox.getHeight());
-                this.originalBox = null;
-                this.btnMax.setGraphic(resizeMax);
-                this.btnMax.setTooltip(new Tooltip("Maximize"));
-            }
-
-            this.maximized = !this.maximized;
-        }
-    }
-
-    @FXML
-    private void onClose() {
-        onCloseButtonAction.get().run();
-    }
-
-    private void updateInitMouseValues(MouseEvent mouseEvent) {
-        initX = mouseEvent.getScreenX();
-        initY = mouseEvent.getScreenY();
-        xOffset = mouseEvent.getSceneX();
-        yOffset = mouseEvent.getSceneY();
-    }
-
-    private boolean isRightEdge(double x, double y, Bounds boundsInParent) {
-        return x < getWidth() && x > getWidth() - contentPlaceHolder.snappedLeftInset();
-    }
-
-    private boolean isTopEdge(double x, double y, Bounds boundsInParent) {
-        return y >= 0 && y < contentPlaceHolder.snappedLeftInset();
-    }
-
-    private boolean isBottomEdge(double x, double y, Bounds boundsInParent) {
-        return y < getHeight() && y > getHeight() - contentPlaceHolder.snappedLeftInset();
-    }
-
-    private boolean isLeftEdge(double x, double y, Bounds boundsInParent) {
-        return x >= 0 && x < contentPlaceHolder.snappedLeftInset();
-    }
-
-    private boolean setStageWidth(double width) {
-        if (width >= primaryStage.getMinWidth() && width >= titleContainer.getMinWidth()) {
-            primaryStage.setWidth(width);
-            initX = newX;
-            return true;
-        } else {
-            if (width >= primaryStage.getMinWidth() && width <= titleContainer.getMinWidth())
-                primaryStage.setWidth(titleContainer.getMinWidth());
-
-            return false;
-        }
-    }
-
-    private boolean setStageHeight(double height) {
-        if (height >= primaryStage.getMinHeight() && height >= titleContainer.getHeight()) {
-            primaryStage.setHeight(height);
-            initY = newY;
-            return true;
-        } else {
-            if (height >= primaryStage.getMinHeight() && height <= titleContainer.getHeight())
-                primaryStage.setHeight(titleContainer.getHeight());
-
-            return false;
-        }
-    }
-
-    public void setMaximized(boolean maximized) {
-        if (this.maximized != maximized) {
-            Platform.runLater(btnMax::fire);
-        }
-    }
-
-    private void showCloseNavButton() {
-        navLeft.getChildren().add(closeNavButton);
-    }
-
-    private void hideCloseNavButton() {
-        navLeft.getChildren().remove(closeNavButton);
-    }
-
-    private void setContent(Node content, AnimationProducer animation) {
-        isWizardPageNow = false;
-        animationHandler.setContent(content, animation);
-
-        if (content instanceof Region) {
-            ((Region) content).setMinSize(0, 0);
-            FXUtils.setOverflowHidden((Region) content, true);
-        }
-
-        refreshNavButton.setVisible(content instanceof Refreshable);
-        backNavButton.setVisible(content != mainPage);
-
-        String prefix = category == null ? "" : category + " - ";
-
-        titleLabel.textProperty().unbind();
-
-        if (content instanceof WizardPage)
-            titleLabel.setText(prefix + ((WizardPage) content).getTitle());
-
-        if (content instanceof DecoratorPage)
-            titleLabel.textProperty().bind(((DecoratorPage) content).titleProperty());
-    }
-
-    private String category;
-    private Node nowPage;
-    private boolean isWizardPageNow;
-
-    public Node getNowPage() {
-        return nowPage;
-    }
-
-    public void showPage(Node content) {
-        FXUtils.checkFxUserThread();
-
-        contentPlaceHolder.getStyleClass().removeAll("gray-background", "white-background");
-        if (content != null)
-            contentPlaceHolder.getStyleClass().add("gray-background");
-
-        Node c = content == null ? mainPage : content;
-        onEnd();
-        if (nowPage instanceof DecoratorPage)
-            ((DecoratorPage) nowPage).onClose();
-        nowPage = content;
-
-        setContent(c, ContainerAnimations.FADE.getAnimationProducer());
-
-        if (c instanceof Region) {
-            // Let root pane fix window size.
-            StackPane parent = (StackPane) c.getParent();
-            ((Region) c).prefWidthProperty().bind(parent.widthProperty());
-            ((Region) c).prefHeightProperty().bind(parent.heightProperty());
-        }
-    }
-
-    public void showDialog(Node node) {
-        FXUtils.checkFxUserThread();
-
-        if (dialog == null) {
-            dialog = new JFXDialog();
-            dialogPane = new StackContainerPane();
-
-            dialog.setContent(dialogPane);
-            dialog.setDialogContainer(drawerWrapper);
-            dialog.setOverlayClose(false);
-            dialog.show();
-        }
-
-        dialogPane.push(node);
-
-        EventHandler<DialogCloseEvent> handler = event -> closeDialog(node);
-        node.getProperties().put(PROPERTY_DIALOG_CLOSE_HANDLER, handler);
-        node.addEventHandler(DialogCloseEvent.CLOSE, handler);
-    }
-
-    @SuppressWarnings("unchecked")
-    public void closeDialog(Node node) {
-        FXUtils.checkFxUserThread();
-
-        Optional.ofNullable(node.getProperties().get(PROPERTY_DIALOG_CLOSE_HANDLER))
-                .ifPresent(handler -> node.removeEventHandler(DialogCloseEvent.CLOSE, (EventHandler<DialogCloseEvent>) handler));
-
-        dialogPane.pop(node);
-
-        if (dialogPane.getChildren().isEmpty()) {
-            dialog.close();
-            dialog = null;
-            dialogPane = null;
-        }
-    }
-
-    public void startWizard(WizardProvider wizardProvider) {
-        startWizard(wizardProvider, null);
-    }
-
-    public void startWizard(WizardProvider wizardProvider, String category) {
-        FXUtils.checkFxUserThread();
-
-        this.category = category;
-        wizardController.setProvider(wizardProvider);
-        wizardController.onStart();
-    }
-
-    @Override
-    public void onStart() {
-        backNavButton.setVisible(true);
-        backNavButton.setDisable(false);
-        showCloseNavButton();
-        refreshNavButton.setVisible(false);
-    }
-
-    @Override
-    public void onEnd() {
-        backNavButton.setVisible(false);
-        hideCloseNavButton();
-        refreshNavButton.setVisible(false);
-    }
-
-    @Override
-    public void navigateTo(Node page, Navigation.NavigationDirection nav) {
-        contentPlaceHolder.getStyleClass().removeAll("gray-background", "white-background");
-        contentPlaceHolder.getStyleClass().add("white-background");
-        setContent(page, nav.getAnimation().getAnimationProducer());
-        isWizardPageNow = true;
-    }
-
-    @FXML
-    private void onRefresh() {
-        ((Refreshable) contentPlaceHolder.getChildren().get(0)).refresh();
-    }
-
-    @FXML
-    private void onCloseNav() {
-        wizardController.onCancel();
-        showPage(null);
-    }
-
-    @FXML
-    private void onBack() {
-        if (isWizardPageNow && wizardController.canPrev())
-            wizardController.onPrev(true);
-        else
-            onCloseNav();
-    }
-
-    @Override
-    public Queue<Object> getCancelQueue() {
-        return cancelQueue;
-    }
-
-    public Runnable getOnCloseButtonAction() {
-        return onCloseButtonAction.get();
-    }
-
-    public ObjectProperty<Runnable> onCloseButtonActionProperty() {
-        return onCloseButtonAction;
-    }
-
-    public void setOnCloseButtonAction(Runnable onCloseButtonAction) {
-        this.onCloseButtonAction.set(onCloseButtonAction);
-    }
-
-    public boolean isCustomMaximize() {
-        return customMaximize.get();
-    }
-
-    public BooleanProperty customMaximizeProperty() {
-        return customMaximize;
-    }
-
-    public void setCustomMaximize(boolean customMaximize) {
-        this.customMaximize.set(customMaximize);
-    }
-
-    @Override
-    public WizardController getWizardController() {
-        return wizardController;
-    }
-
-    public AdvancedListBox getLeftPane() {
-        return leftPane;
-    }
-
-    private void setupAuthlibInjectorDnD() {
-        addEventFilter(DragEvent.DRAG_OVER, AuthlibInjectorDnD.dragOverHandler());
-        addEventFilter(DragEvent.DRAG_DROPPED, AuthlibInjectorDnD.dragDroppedHandler(
-                url -> Controllers.dialog(new AddAuthlibInjectorServerPane(url))));
-    }
-}

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,23 +13,25 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui;
 
-import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.utils.JFXUtilities;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.AuthInfo;
+import org.jackhuang.hmcl.auth.AuthenticationException;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
-import org.jackhuang.hmcl.task.SilentException;
+import org.jackhuang.hmcl.ui.account.AccountLoginPane;
 
 import java.util.Optional;
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
 
 public final class DialogController {
 
-    public static AuthInfo logIn(Account account) throws Exception {
+    public static AuthInfo logIn(Account account) throws CancellationException, AuthenticationException, InterruptedException {
         if (account instanceof YggdrasilAccount) {
             CountDownLatch latch = new CountDownLatch(1);
             AtomicReference<AuthInfo> res = new AtomicReference<>(null);
@@ -41,7 +43,7 @@ public final class DialogController {
                 Controllers.dialog(pane);
             });
             latch.await();
-            return Optional.ofNullable(res.get()).orElseThrow(SilentException::new);
+            return Optional.ofNullable(res.get()).orElseThrow(CancellationException::new);
         }
         return account.logIn();
     }

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,10 +13,11 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui;
 
+import com.jfoenix.utils.JFXUtilities;
 import com.jfoenix.controls.*;
 import javafx.animation.Animation;
 import javafx.animation.Interpolator;
@@ -30,36 +31,44 @@ import javafx.beans.value.ObservableValue;
 import javafx.beans.value.WeakChangeListener;
 import javafx.event.EventHandler;
 import javafx.fxml.FXMLLoader;
+import javafx.geometry.Pos;
 import javafx.scene.Node;
-import javafx.scene.control.ListCell;
-import javafx.scene.control.ListView;
-import javafx.scene.control.ScrollBar;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.control.Tooltip;
+import javafx.scene.control.*;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.input.ScrollEvent;
+import javafx.scene.input.TransferMode;
 import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
 import javafx.scene.shape.Rectangle;
 import javafx.util.Callback;
 import javafx.util.Duration;
 import javafx.util.StringConverter;
-
 import org.jackhuang.hmcl.util.*;
 import org.jackhuang.hmcl.util.i18n.I18n;
+import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.javafx.ExtendedProperties;
+import org.jackhuang.hmcl.util.javafx.SafeStringConverter;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;
 
 import java.io.File;
+import java.io.FileFilter;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.net.URI;
+import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BooleanSupplier;
 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 {
@@ -86,13 +95,18 @@ public final class FXUtils {
     }
 
     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);
         consumer.accept(value.getValue());
+        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) {
@@ -198,6 +212,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);
     }
@@ -206,35 +228,53 @@ 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) {
+        JFXUtilities.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 openFolder(File file) {
@@ -254,11 +294,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);
+                        }
+                    }
+                });
         }
     }
 
@@ -270,21 +314,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) {
@@ -321,9 +369,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()]);
@@ -339,6 +389,7 @@ 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;
@@ -411,6 +462,34 @@ public final class FXUtils {
         }
     }
 
+    public static void applyDragListener(Node node, FileFilter filter, Consumer<List<File>> callback) {
+        applyDragListener(node, filter, callback, null);
+    }
+
+    public static void applyDragListener(Node node, FileFilter filter, Consumer<List<File>> callback, Runnable dragDropped) {
+        node.setOnDragOver(event -> {
+            if (event.getGestureSource() != node && event.getDragboard().hasFiles()) {
+                if (event.getDragboard().getFiles().stream().anyMatch(filter::accept))
+                    event.acceptTransferModes(TransferMode.COPY_OR_MOVE);
+            }
+            event.consume();
+        });
+
+        node.setOnDragDropped(event -> {
+            List<File> files = event.getDragboard().getFiles();
+            if (files != null) {
+                List<File> acceptFiles = files.stream().filter(filter::accept).collect(Collectors.toList());
+                if (!acceptFiles.isEmpty()) {
+                    callback.accept(acceptFiles);
+                    event.setDropCompleted(true);
+                }
+            }
+            if (dragDropped != null)
+                dragDropped.run();
+            event.consume();
+        });
+    }
+
     public static <T> StringConverter<T> stringConverter(Function<T, String> func) {
         return new StringConverter<T>() {
 
@@ -432,6 +511,7 @@ public final class FXUtils {
             public void updateItem(T item, boolean empty) {
                 super.updateItem(item, empty);
                 if (!empty) {
+                    setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
                     setGraphic(graphicBuilder.apply(item));
                 }
             }
@@ -449,4 +529,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/InstallerController.java

@@ -1,98 +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.fxml.FXML;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.layout.VBox;
-
-import org.jackhuang.hmcl.download.MaintainTask;
-import org.jackhuang.hmcl.download.game.VersionJsonSaveTask;
-import org.jackhuang.hmcl.game.GameVersion;
-import org.jackhuang.hmcl.game.Library;
-import org.jackhuang.hmcl.game.Version;
-import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.ui.download.InstallerWizardProvider;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
-import java.util.LinkedList;
-import java.util.Optional;
-import java.util.function.Consumer;
-
-public class InstallerController {
-    private Profile profile;
-    private String versionId;
-    private Version version;
-    @FXML
-    private ScrollPane scrollPane;
-    @FXML private VBox contentPane;
-    private String forge;
-    private String liteLoader;
-    private String optiFine;
-
-    @FXML
-    private void initialize() {
-        FXUtils.smoothScrolling(scrollPane);
-    }
-
-    public void loadVersion(Profile profile, String versionId) {
-        this.profile = profile;
-        this.versionId = versionId;
-        this.version = profile.getRepository().getResolvedVersion(versionId);
-
-        contentPane.getChildren().clear();
-        forge = liteLoader = optiFine = null;
-
-        for (Library library : version.getLibraries()) {
-            Consumer<InstallerItem> removeAction = x -> {
-                LinkedList<Library> newList = new LinkedList<>(version.getLibraries());
-                newList.remove(library);
-                new MaintainTask(version.setLibraries(newList))
-                        .then(variables -> new VersionJsonSaveTask(profile.getRepository(), variables.get(MaintainTask.ID)))
-                        .with(profile.getRepository().refreshVersionsAsync())
-                        .with(Task.of(Schedulers.javafx(), () -> loadVersion(this.profile, this.versionId)))
-                        .start();
-            };
-
-            if (library.getGroupId().equalsIgnoreCase("net.minecraftforge") && library.getArtifactId().equalsIgnoreCase("forge")) {
-                contentPane.getChildren().add(new InstallerItem("Forge", library.getVersion(), removeAction));
-                forge = library.getVersion();
-            }
-            if (library.getGroupId().equalsIgnoreCase("com.mumfrey") && library.getArtifactId().equalsIgnoreCase("liteloader")) {
-                contentPane.getChildren().add(new InstallerItem("LiteLoader", library.getVersion(), removeAction));
-                liteLoader = library.getVersion();
-            }
-            if (library.getGroupId().equalsIgnoreCase("net.optifine") && library.getArtifactId().equalsIgnoreCase("optifine")) {
-                contentPane.getChildren().add(new InstallerItem("OptiFine", library.getVersion(), removeAction));
-                optiFine = library.getVersion();
-            }
-        }
-    }
-
-    @FXML
-    private void onAdd() {
-        Optional<String> gameVersion = GameVersion.minecraftVersion(profile.getRepository().getVersionJar(version));
-
-        if (!gameVersion.isPresent())
-            Controllers.dialog(i18n("version.cannot_read"));
-        else
-            Controllers.getDecorator().startWizard(new InstallerWizardProvider(profile, gameVersion.get(), version, forge, liteLoader, optiFine));
-    }
-}

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui;
 
@@ -22,10 +22,10 @@ import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.layout.BorderPane;
 
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
 import java.util.function.Consumer;
 
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
 /**
  * @author huangyuhui
  */

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,186 +13,94 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui;
 
-import com.jfoenix.concurrency.JFXUtilities;
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXPopup;
+import com.jfoenix.utils.JFXUtilities;
 import javafx.application.Platform;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.When;
-import javafx.beans.property.ListProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleListProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.scene.Node;
-import javafx.scene.control.Tooltip;
 import javafx.scene.image.Image;
-import javafx.scene.input.MouseButton;
 import javafx.scene.layout.Region;
-import javafx.scene.layout.VBox;
-import javafx.scene.paint.Color;
-
-import org.jackhuang.hmcl.auth.Account;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
-import org.jackhuang.hmcl.auth.offline.OfflineAccount;
-import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
-import org.jackhuang.hmcl.event.*;
-import org.jackhuang.hmcl.game.AccountHelper;
+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.*;
+import org.jackhuang.hmcl.setting.Accounts;
+import org.jackhuang.hmcl.setting.Profile;
+import org.jackhuang.hmcl.setting.Profiles;
 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.ClassTitle;
-import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
-import org.jackhuang.hmcl.ui.construct.IconedItem;
-import org.jackhuang.hmcl.ui.construct.RipplerContainer;
-import org.jackhuang.hmcl.util.Lang;
-import org.jackhuang.hmcl.util.MappedObservableList;
+import org.jackhuang.hmcl.ui.construct.AdvancedListItem;
+import org.jackhuang.hmcl.ui.profile.ProfileAdvancedListItem;
+import org.jackhuang.hmcl.ui.versions.GameAdvancedListItem;
+import org.jackhuang.hmcl.ui.versions.Versions;
+import org.jackhuang.hmcl.util.io.CompressingUtils;
 
 import java.io.File;
-import java.util.LinkedList;
-import java.util.Objects;
-import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static javafx.collections.FXCollections.singletonObservableList;
-import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
-public final class LeftPaneController {
-    private final AdvancedListBox leftPane;
-    private final VBox profilePane = new VBox();
-    private final VBox accountPane = new VBox();
-    private final IconedItem launcherSettingsItem;
+public final class LeftPaneController extends AdvancedListBox {
 
-    private ListProperty<RipplerContainer> accountItems = new SimpleListProperty<>();
-    private ObjectProperty<Account> selectedAccount = new SimpleObjectProperty<Account>() {
-        {
-            accountItems.addListener(onInvalidating(this::invalidated));
-        }
+    public LeftPaneController() {
 
-        @Override
-        protected void invalidated() {
-            Account selected = get();
-            accountItems.forEach(item -> item.setSelected(
-                    getAccountFromItem(item)
-                            .map(it -> it == selected)
-                            .orElse(false)));
-        }
-    };
+        AccountAdvancedListItem accountListItem = new AccountAdvancedListItem();
+        accountListItem.setOnAction(e -> Controllers.navigate(Controllers.getAccountListPage()));
+        accountListItem.accountProperty().bind(Accounts.selectedAccountProperty());
 
-    public LeftPaneController(AdvancedListBox leftPane) {
-        this.leftPane = leftPane;
-
-        this.launcherSettingsItem = Lang.apply(new IconedItem(SVG.gear(Theme.blackFillBinding(), 20, 20), i18n("settings.launcher")), iconedItem -> {
-            iconedItem.prefWidthProperty().bind(leftPane.widthProperty());
-            iconedItem.setOnMouseClicked(e -> Controllers.navigate(Controllers.getSettingsPage()));
+        GameAdvancedListItem gameListItem = new GameAdvancedListItem();
+        gameListItem.actionButtonVisibleProperty().bind(Profiles.selectedVersionProperty().isNotNull());
+        gameListItem.setOnAction(e -> {
+        	Profile profile = Profiles.getSelectedProfile();
+        	String version = Profiles.getSelectedVersion();
+        	if (version == null) {
+        		Controllers.navigate(Controllers.getGameListPage());
+        	} else {
+        		Versions.modifyGameSettings(profile, version);        	
+        	}
         });
 
-        leftPane
-                .add(new ClassTitle(i18n("account").toUpperCase(), Lang.apply(new JFXButton(), button -> {
-                    button.setGraphic(SVG.plus(Theme.blackFillBinding(), 10, 10));
-                    button.getStyleClass().add("toggle-icon-tiny");
-                    button.setOnMouseClicked(e -> addNewAccount());
-                })))
-                .add(accountPane)
+        ProfileAdvancedListItem profileListItem = new ProfileAdvancedListItem();
+        profileListItem.setOnAction(e -> Controllers.navigate(Controllers.getProfileListPage()));
+        profileListItem.profileProperty().bind(Profiles.selectedProfileProperty());
+
+        AdvancedListItem gameItem = new AdvancedListItem();
+        gameItem.setImage(new Image("/assets/img/bookshelf.png"));
+        gameItem.setTitle(i18n("version.manage"));
+        gameItem.setOnAction(e -> Controllers.navigate(Controllers.getGameListPage()));
+
+        AdvancedListItem launcherSettingsItem = new AdvancedListItem();
+        launcherSettingsItem.setImage(new Image("/assets/img/command.png"));
+        launcherSettingsItem.setTitle(i18n("settings.launcher"));
+        launcherSettingsItem.setOnAction(e -> Controllers.navigate(Controllers.getSettingsPage()));
+
+        this
+                .startCategory(i18n("account").toUpperCase())
+                .add(accountListItem)
+                .startCategory(i18n("version").toUpperCase())
+                .add(gameListItem)
+                .add(gameItem)
+                .startCategory(i18n("profile.title").toUpperCase())
+                .add(profileListItem)
                 .startCategory(i18n("launcher").toUpperCase())
-                .add(launcherSettingsItem)
-                .add(new ClassTitle(i18n("profile.title").toUpperCase(), Lang.apply(new JFXButton(), button -> {
-                    button.setGraphic(SVG.plus(Theme.blackFillBinding(), 10, 10));
-                    button.getStyleClass().add("toggle-icon-tiny");
-                    button.setOnMouseClicked(e ->
-                            Controllers.getDecorator().showPage(new ProfilePage(null)));
-                })))
-                .add(profilePane);
+                .add(launcherSettingsItem);
 
-        // ==== Accounts ====
-        // Missing account item
-        VersionListItem missingAccountItem = new VersionListItem(i18n("account.missing"), i18n("message.unknown"));
-        RipplerContainer missingAccountRippler = new RipplerContainer(missingAccountItem);
-        missingAccountItem.setOnSettingsButtonClicked(e -> addNewAccount());
-        missingAccountRippler.setOnMouseClicked(e -> addNewAccount());
+        EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).register(event -> onRefreshedVersions((HMCLGameRepository) event.getSource()));
 
-        accountItems.bind(
-                new When(Accounts.accountsProperty().emptyProperty())
-                        .then(singletonObservableList(missingAccountRippler))
-                        .otherwise(MappedObservableList.create(Accounts.getAccounts(), this::createAccountItem)));
-        Bindings.bindContent(accountPane.getChildren(), accountItems);
-
-        selectedAccount.bindBidirectional(Accounts.selectedAccountProperty());
-        // ====
-
-        EventBus.EVENT_BUS.channel(ProfileLoadingEvent.class).register(this::onProfilesLoading);
-        EventBus.EVENT_BUS.channel(ProfileChangedEvent.class).register(this::onProfileChanged);
-        EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).register(this::onRefreshedVersions);
+        Profile profile = Profiles.getSelectedProfile();
+        if (profile != null && profile.getRepository().isLoaded())
+            onRefreshedVersions(Profiles.selectedProfileProperty().get().getRepository());
     }
 
     // ==== Accounts ====
-    private Optional<Account> getAccountFromItem(RipplerContainer accountItem) {
-        return Optional.ofNullable(accountItem.getProperties().get("account"))
-                .map(Account.class::cast);
-    }
-
-    private static String accountSubtitle(Account account) {
-        if (account instanceof OfflineAccount)
-            return i18n("account.methods.offline");
-        else if (account instanceof YggdrasilAccount)
-            return account.getUsername();
-        else
-            return "";
-    }
-
-    private RipplerContainer createAccountItem(Account account) {
-        VersionListItem item = new VersionListItem(account.getCharacter(), accountSubtitle(account));
-        RipplerContainer rippler = new RipplerContainer(item);
-        item.setOnSettingsButtonClicked(e -> {
-            AccountPage accountPage = new AccountPage(account, item);
-            JFXPopup popup = new JFXPopup(accountPage);
-            accountPage.setOnDelete(popup::hide);
-            popup.show((Node) e.getSource(), JFXPopup.PopupVPosition.TOP, JFXPopup.PopupHPosition.LEFT, e.getX(), e.getY());
-        });
-        rippler.setOnMouseClicked(e -> {
-            if (e.getButton() == MouseButton.PRIMARY) {
-                selectedAccount.set(account);
-            }
-        });
-        rippler.getProperties().put("account", account);
-        rippler.maxWidthProperty().bind(leftPane.widthProperty());
-
-        if (account instanceof YggdrasilAccount) {
-            Image image = AccountHelper.getSkin((YggdrasilAccount) account, 4);
-            item.setImage(image, AccountHelper.getViewport(4));
-        } else {
-            item.setImage(AccountHelper.getDefaultSkin(account.getUUID(), 4), AccountHelper.getViewport(4));
-        }
-
-        if (account instanceof AuthlibInjectorAccount) {
-            FXUtils.installTooltip(rippler, 500, 5000, 0, new Tooltip(((AuthlibInjectorAccount) account).getServer().getName()));
-        }
-
-        // update skin
-        if (account instanceof YggdrasilAccount) {
-            AccountHelper.refreshSkinAsync((YggdrasilAccount) account)
-                    .subscribe(Schedulers.javafx(), () -> {
-                        Image image = AccountHelper.getSkin((YggdrasilAccount) account, 4);
-                        item.setImage(image, AccountHelper.getViewport(4));
-                    });
-        }
-
-        return rippler;
-    }
-
     public void checkAccount() {
         if (Accounts.getAccounts().isEmpty())
-            addNewAccount();
+            Platform.runLater(this::addNewAccount);
     }
 
     private void addNewAccount() {
@@ -200,72 +108,30 @@ public final class LeftPaneController {
     }
     // ====
 
-    private void onProfileChanged(ProfileChangedEvent event) {
-        Profile profile = event.getProfile();
-
-        Platform.runLater(() -> {
-            for (Node node : profilePane.getChildren()) {
-                if (node instanceof RipplerContainer && node.getProperties().get("profile") instanceof String) {
-                    boolean current = Objects.equals(node.getProperties().get("profile"), profile.getName());
-                    ((RipplerContainer) node).setSelected(current);
-                    ((VersionListItem) ((RipplerContainer) node).getContainer()).setGameVersion(current ? i18n("profile.selected") : "");
-                }
-            }
-        });
-    }
-
-    private void onProfilesLoading() {
-        LinkedList<RipplerContainer> list = new LinkedList<>();
-        for (Profile profile : Settings.INSTANCE.getProfiles()) {
-            VersionListItem item = new VersionListItem(Profiles.getProfileDisplayName(profile));
-            RipplerContainer ripplerContainer = new RipplerContainer(item);
-            item.setOnSettingsButtonClicked(e -> Controllers.getDecorator().showPage(new ProfilePage(profile)));
-            ripplerContainer.setOnMouseClicked(e -> Settings.INSTANCE.setSelectedProfile(profile));
-            ripplerContainer.getProperties().put("profile", profile.getName());
-            ripplerContainer.maxWidthProperty().bind(leftPane.widthProperty());
-            list.add(ripplerContainer);
-        }
-        Platform.runLater(() -> profilePane.getChildren().setAll(list));
-    }
-
-    public void showUpdate() {
-        launcherSettingsItem.setText(i18n("update.found"));
-        launcherSettingsItem.setTextFill(Color.RED);
-    }
-
     private boolean checkedModpack = false;
-    private static boolean showNewAccount = true;
 
-    private void onRefreshedVersions(RefreshedVersionsEvent event) {
+    private void onRefreshedVersions(HMCLGameRepository repository) {
         JFXUtilities.runInFX(() -> {
-            HMCLGameRepository repository = (HMCLGameRepository) event.getSource();
             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) {
-                        }
+                        Task.supplyAsync(() -> CompressingUtils.findSuitableEncoding(modpackFile.toPath()))
+                                .thenApply(encoding -> ModpackHelper.readModpackManifest(modpackFile.toPath(), encoding))
+                                .thenAccept(modpack -> {
+                                    AtomicReference<Region> region = new AtomicReference<>();
+                                    TaskExecutor executor = ModpackHelper.getInstallTask(repository.getProfile(), modpackFile, modpack.getName(), modpack)
+                                            .withRun(Schedulers.javafx(), this::checkAccount).executor();
+                                    region.set(Controllers.taskDialog(executor, i18n("modpack.installing")));
+                                    executor.start();
+                                }).start();
                     }
                 }
             }
 
-            if (showNewAccount) {
-                showNewAccount = false;
-                checkAccount();
-            }
+            checkAccount();
         });
     }
 }

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

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

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

@@ -0,0 +1,109 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui;
+
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXScrollPane;
+import 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 ListPageSkin(ListPage<?> skinnable) {
+        super(skinnable);
+
+        SpinnerPane spinnerPane = new SpinnerPane();
+        spinnerPane.getStyleClass().add("large-spinner-pane");
+        Pane placeholder = new Pane();
+
+        StackPane contentPane = new StackPane();
+        {
+            ScrollPane scrollPane = new ScrollPane();
+            {
+                scrollPane.setFitToWidth(true);
+
+                VBox list = new VBox();
+                list.maxWidthProperty().bind(scrollPane.widthProperty());
+                list.setSpacing(10);
+                list.setPadding(new Insets(10));
+
+                VBox content = new VBox();
+                content.getChildren().setAll(list, placeholder);
+
+                Bindings.bindContent(list.getChildren(), skinnable.itemsProperty());
+
+                scrollPane.setContent(content);
+                JFXScrollPane.smoothScrolling(scrollPane);
+            }
+            
+            VBox vBox = new VBox();
+            {
+                vBox.setAlignment(Pos.BOTTOM_RIGHT);
+                vBox.setPickOnBounds(false);
+                vBox.setPadding(new Insets(15));
+                vBox.setSpacing(15);
+
+                JFXButton btnAdd = new JFXButton();
+                FXUtils.setLimitWidth(btnAdd, 40);
+                FXUtils.setLimitHeight(btnAdd, 40);
+                btnAdd.getStyleClass().add("jfx-button-raised-round");
+                btnAdd.setButtonType(JFXButton.ButtonType.RAISED);
+                btnAdd.setGraphic(SVG.plus(Theme.whiteFillBinding(), -1, -1));
+                btnAdd.setOnMouseClicked(e -> skinnable.add());
+
+                JFXButton btnRefresh = new JFXButton();
+                FXUtils.setLimitWidth(btnRefresh, 40);
+                FXUtils.setLimitHeight(btnRefresh, 40);
+                btnRefresh.getStyleClass().add("jfx-button-raised-round");
+                btnRefresh.setButtonType(JFXButton.ButtonType.RAISED);
+                btnRefresh.setGraphic(SVG.refresh(Theme.whiteFillBinding(), -1, -1));
+                btnRefresh.setOnMouseClicked(e -> skinnable.refresh());
+
+                vBox.getChildren().setAll(btnAdd);
+
+                FXUtils.onChangeAndOperate(skinnable.refreshableProperty(),
+                        refreshable -> {
+                            if (refreshable) vBox.getChildren().setAll(btnRefresh, btnAdd);
+                            else vBox.getChildren().setAll(btnAdd);
+                        });
+            }
+
+            // Keep a blank space to prevent buttons from blocking up mod items.
+            BorderPane group = new BorderPane();
+            group.setPickOnBounds(false);
+            group.setBottom(vBox);
+            placeholder.minHeightProperty().bind(vBox.heightProperty());
+
+            contentPane.getChildren().setAll(scrollPane, group);
+        }
+
+        spinnerPane.loadingProperty().bind(skinnable.loadingProperty());
+        spinnerPane.setContent(contentPane);
+
+        getChildren().setAll(spinnerPane);
+    }
+}

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui;
 
@@ -30,24 +30,22 @@ import javafx.scene.layout.StackPane;
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebView;
 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.jackhuang.hmcl.util.io.IOUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
-import static org.jackhuang.hmcl.setting.ConfigHolder.CONFIG;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
 import java.util.concurrent.CountDownLatch;
 
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
 /**
  *
  * @author huangyuhui
@@ -65,7 +63,7 @@ public final class LogWindow extends Stage {
 
     public LogWindow() {
         setScene(new Scene(impl, 800, 480));
-        getScene().getStylesheets().addAll(CONFIG.getTheme().getStylesheets());
+        getScene().getStylesheets().addAll(config().getTheme().getStylesheets());
         setTitle(i18n("logwindow.title"));
         getIcons().add(new Image("/assets/img/icon.png"));
     }
@@ -177,12 +175,12 @@ public final class LogWindow extends Stage {
 
             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() + "\""));
+                    .replace("${FONT}", config().getFontSize() + "px \"" + config().getFontFamily() + "\""));
             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());
+                    engine.executeScript("limitedLogs=" + config().getLogLines());
                     latch.countDown();
                     onDone.fireEvent(new Event(LogWindow.this));
                 }
@@ -190,24 +188,24 @@ public final class LogWindow extends Stage {
 
             boolean flag = false;
             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));
+                engine.executeScript("limitedLogs=" + config().getLogLines());
             });
 
             if (!flag)
                 cboLines.getSelectionModel().select(0);
 
-            btnFatals.textProperty().bind(Bindings.createStringBinding(() -> Integer.toString(fatal.get()) + " fatals", fatal));
-            btnErrors.textProperty().bind(Bindings.createStringBinding(() -> Integer.toString(error.get()) + " errors", error));
-            btnWarns.textProperty().bind(Bindings.createStringBinding(() -> Integer.toString(warn.get()) + " warns", warn));
-            btnInfos.textProperty().bind(Bindings.createStringBinding(() -> Integer.toString(info.get()) + " infos", info));
-            btnDebugs.textProperty().bind(Bindings.createStringBinding(() -> Integer.toString(debug.get()) + " debugs", debug));
+            btnFatals.textProperty().bind(Bindings.concat(fatal, " fatals"));
+            btnErrors.textProperty().bind(Bindings.concat(error, " errors"));
+            btnWarns.textProperty().bind(Bindings.concat(warn, " warns"));
+            btnInfos.textProperty().bind(Bindings.concat(info, " infos"));
+            btnDebugs.textProperty().bind(Bindings.concat(debug, " debugs"));
 
             btnFatals.selectedProperty().addListener(o -> specificChanged());
             btnErrors.selectedProperty().addListener(o -> specificChanged());

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,238 +13,192 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui;
 
-import com.jfoenix.concurrency.JFXUtilities;
-import com.jfoenix.controls.*;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.fxml.FXML;
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXPopup;
+import javafx.animation.KeyFrame;
+import javafx.animation.KeyValue;
+import javafx.animation.Timeline;
+import javafx.beans.binding.Bindings;
+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.ScrollPane;
-import javafx.scene.image.Image;
-import javafx.scene.input.MouseButton;
-import javafx.scene.layout.Region;
+import javafx.scene.control.Label;
+import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
-import javafx.stage.FileChooser;
-
-import org.jackhuang.hmcl.event.EventBus;
-import org.jackhuang.hmcl.event.ProfileChangedEvent;
-import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
-import org.jackhuang.hmcl.event.RefreshingVersionsEvent;
-import org.jackhuang.hmcl.game.*;
-import org.jackhuang.hmcl.mod.MismatchedModpackTypeException;
-import org.jackhuang.hmcl.mod.UnsupportedModpackException;
-import org.jackhuang.hmcl.setting.Accounts;
+import javafx.scene.layout.VBox;
+import javafx.scene.shape.Rectangle;
+import javafx.util.Duration;
 import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.setting.Settings;
-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.download.DownloadWizardProvider;
-import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
-import org.jackhuang.hmcl.util.Lang;
-import org.jackhuang.hmcl.util.OperatingSystem;
-import org.jackhuang.hmcl.util.VersionNumber;
+import org.jackhuang.hmcl.setting.Profiles;
+import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.ui.construct.PopupMenu;
+import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
+import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
+import org.jackhuang.hmcl.ui.versions.Versions;
+import org.jackhuang.hmcl.upgrade.RemoteVersion;
+import org.jackhuang.hmcl.upgrade.UpdateChecker;
+import org.jackhuang.hmcl.upgrade.UpdateHandler;
 
-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.ui.FXUtils.SINE;
 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"));
 
-    private final StringProperty title = new SimpleStringProperty(this, "title", i18n("main_page"));
+    private final PopupMenu menu = new PopupMenu();
+    private final JFXPopup popup = new JFXPopup(menu);
 
-    private Profile profile;
+    private final StringProperty currentGame = new SimpleStringProperty(this, "currentGame");
+    private final BooleanProperty showUpdate = new SimpleBooleanProperty(this, "showUpdate");
+    private final StringProperty latestVersion = new SimpleStringProperty(this, "latestVersion");
+    private final ObservableList<Node> versions = FXCollections.observableArrayList();
 
-    @FXML
-    private JFXButton btnRefresh;
-    @FXML
-    private StackPane contentPane;
-    @FXML
-    private JFXButton btnAdd;
-    @FXML
-    private JFXSpinner spinner;
-    @FXML
-    private JFXMasonryPane masonryPane;
-    @FXML
-    private ScrollPane scrollPane;
+    private StackPane updatePane;
+    private JFXButton menuButton;
 
     {
-        FXUtils.loadFXML(this, "/assets/fxml/main.fxml");
+        setPadding(new Insets(25));
 
-        loadingVersions();
+        updatePane = new StackPane();
+        updatePane.setVisible(false);
+        updatePane.getStyleClass().add("bubble");
+        FXUtils.setLimitWidth(updatePane, 230);
+        FXUtils.setLimitHeight(updatePane, 55);
+        StackPane.setAlignment(updatePane, Pos.TOP_RIGHT);
+        updatePane.setOnMouseClicked(e -> onUpgrade());
+        FXUtils.onChange(showUpdateProperty(), this::doAnimation);
 
-        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);
-        });
-        EventBus.EVENT_BUS.channel(ProfileChangedEvent.class).register(event -> {
-            this.profile = event.getProfile();
-        });
+        {
+            HBox hBox = new HBox();
+            hBox.setSpacing(12);
+            hBox.setAlignment(Pos.CENTER_LEFT);
+            StackPane.setAlignment(hBox, Pos.CENTER_LEFT);
+            StackPane.setMargin(hBox, new Insets(9, 12, 9, 16));
+            {
+                Label lblIcon = new Label();
+                lblIcon.setGraphic(SVG.update(Theme.whiteFillBinding(), 20, 20));
 
-        btnAdd.setOnMouseClicked(e -> Controllers.getDecorator().startWizard(new DownloadWizardProvider(), i18n("install")));
-        FXUtils.installTooltip(btnAdd, i18n("install"));
-        btnRefresh.setOnMouseClicked(e -> Settings.INSTANCE.getSelectedProfile().getRepository().refreshVersionsAsync().start());
-        FXUtils.installTooltip(btnRefresh, i18n("button.refresh"));
+                TwoLineListItem prompt = new TwoLineListItem();
+                prompt.setSubtitle(i18n("update.bubble.subtitle"));
+                prompt.setPickOnBounds(false);
+                prompt.titleProperty().bind(latestVersionProperty());
+
+                hBox.getChildren().setAll(lblIcon, prompt);
+            }
+
+            JFXButton closeUpdateButton = new JFXButton();
+            closeUpdateButton.setGraphic(SVG.close(Theme.whiteFillBinding(), 10, 10));
+            StackPane.setAlignment(closeUpdateButton, Pos.TOP_RIGHT);
+            closeUpdateButton.getStyleClass().add("toggle-icon-tiny");
+            StackPane.setMargin(closeUpdateButton, new Insets(5));
+            closeUpdateButton.setOnMouseClicked(e -> closeUpdateBubble());
+
+            updatePane.getChildren().setAll(hBox, closeUpdateButton);
+        }
+
+        StackPane launchPane = new StackPane();
+        launchPane.setMaxWidth(230);
+        launchPane.setMaxHeight(55);
+        StackPane.setAlignment(launchPane, Pos.BOTTOM_RIGHT);
+        {
+            JFXButton launchButton = new JFXButton();
+            launchButton.setPrefWidth(230);
+            launchButton.setPrefHeight(55);
+            launchButton.setButtonType(JFXButton.ButtonType.RAISED);
+            launchButton.getStyleClass().add("jfx-button-raised");
+            launchButton.setOnMouseClicked(e -> launch());
+            launchButton.setClip(new Rectangle(-100, -100, 310, 200));
+            {
+                VBox graphic = new VBox();
+                graphic.setAlignment(Pos.CENTER);
+                graphic.setTranslateX(-7);
+                graphic.setMaxWidth(200);
+                Label launchLabel = new Label(i18n("version.launch"));
+                launchLabel.setStyle("-fx-font-size: 16px;");
+                Label currentLabel = new Label();
+                currentLabel.setStyle("-fx-font-size: 12px;");
+                currentLabel.textProperty().bind(currentGameProperty());
+                graphic.getChildren().setAll(launchLabel, currentLabel);
+
+                launchButton.setGraphic(graphic);
+            }
+
+            Rectangle separator = new Rectangle();
+            separator.getStyleClass().add("darker-fill");
+            separator.setWidth(1);
+            separator.setHeight(57);
+            separator.setTranslateX(95);
+            separator.setMouseTransparent(true);
+
+            menuButton = new JFXButton();
+            menuButton.setPrefHeight(55);
+            menuButton.setPrefWidth(230);
+            menuButton.setButtonType(JFXButton.ButtonType.RAISED);
+            menuButton.getStyleClass().add("jfx-button-raised");
+            menuButton.setStyle("-fx-font-size: 15px;");
+            menuButton.setOnMouseClicked(e -> onMenu());
+            menuButton.setClip(new Rectangle(211, -100, 100, 200));
+            StackPane graphic = new StackPane();
+            Node svg = SVG.triangle(Theme.whiteFillBinding(), 10, 10);
+            StackPane.setAlignment(svg, Pos.CENTER_RIGHT);
+            graphic.getChildren().setAll(svg);
+            graphic.setTranslateX(12);
+            menuButton.setGraphic(graphic);
+
+            launchPane.getChildren().setAll(launchButton, separator, menuButton);
+        }
+
+        getChildren().setAll(updatePane, launchPane);
+
+        menu.setMaxHeight(365);
+        menu.setMaxWidth(545);
+        menu.setAlwaysShowingVBar(true);
+        menu.setOnMouseClicked(e -> popup.hide());
+        Bindings.bindContent(menu.getContent(), versions);
     }
 
-    private String modifyVersion(String gameVersion, String version) {
-        return removeSuffix(removePrefix(removeSuffix(removePrefix(version.replace(gameVersion, "").trim(), "-"), "-"), "_"), "_");
+    private void doAnimation(boolean show) {
+        Duration duration = Duration.millis(320);
+        Timeline nowAnimation = new Timeline();
+        nowAnimation.getKeyFrames().addAll(
+                new KeyFrame(Duration.ZERO,
+                        new KeyValue(updatePane.translateXProperty(), show ? 260 : 0, SINE)),
+                new KeyFrame(duration,
+                        new KeyValue(updatePane.translateXProperty(), show ? 0 : 260, SINE)));
+        if (show) nowAnimation.getKeyFrames().add(
+                new KeyFrame(Duration.ZERO, e -> updatePane.setVisible(true)));
+        else nowAnimation.getKeyFrames().add(
+                new KeyFrame(duration, e -> updatePane.setVisible(false)));
+        nowAnimation.play();
     }
 
-    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();
-            for (Library library : version.getLibraries()) {
-                if (library.getGroupId().equalsIgnoreCase("net.minecraftforge") && library.getArtifactId().equalsIgnoreCase("forge")) {
-                    libraries.append(i18n("install.installer.forge")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)forge", ""))).append("\n");
-                }
-                if (library.getGroupId().equalsIgnoreCase("com.mumfrey") && library.getArtifactId().equalsIgnoreCase("liteloader")) {
-                    libraries.append(i18n("install.installer.liteloader")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)liteloader", ""))).append("\n");
-                }
-                if (library.getGroupId().equalsIgnoreCase("net.optifine") && library.getArtifactId().equalsIgnoreCase("optifine")) {
-                    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 -> {
-            if (Accounts.getSelectedAccount() == null)
-                Controllers.getLeftPaneController().checkAccount();
-            else
-                LauncherHelper.INSTANCE.launch(profile, Accounts.getSelectedAccount(), id, null);
-        });
-        item.setOnScriptButtonClicked(e -> {
-            if (Accounts.getSelectedAccount() == null)
-                Controllers.dialog(i18n("login.empty_username"));
-            else {
-                FileChooser chooser = new FileChooser();
-                if (repository.getRunDirectory(id).isDirectory())
-                    chooser.setInitialDirectory(repository.getRunDirectory(id));
-                chooser.setTitle(i18n("version.launch_script.save"));
-                chooser.getExtensionFilters().add(OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS
-                        ? new FileChooser.ExtensionFilter(i18n("extension.bat"), "*.bat")
-                        : new FileChooser.ExtensionFilter(i18n("extension.sh"), "*.sh"));
-                File file = chooser.showSaveDialog(Controllers.getStage());
-                if (file != null)
-                    LauncherHelper.INSTANCE.launch(profile, Accounts.getSelectedAccount(), id, file);
-            }
-        });
-        item.setOnSettingsButtonClicked(e -> {
-            Controllers.getDecorator().showPage(Controllers.getVersionPage());
-            Controllers.getVersionPage().load(id, profile);
-        });
-        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:
-                            VersionPage.renameVersion(profile, id);
-                            break;
-                        case 1:
-                            VersionPage.deleteVersion(profile, id);
-                            break;
-                        case 2:
-                            VersionPage.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) {
-                if (Accounts.getSelectedAccount() == null)
-                    Controllers.dialog(i18n("login.empty_username"));
-                else
-                    LauncherHelper.INSTANCE.launch(profile, Accounts.getSelectedAccount(), id, null);
-            }
-        });
-        File iconFile = repository.getVersionIcon(id);
-        if (iconFile.exists())
-            item.setImage(new Image("file:" + iconFile.getAbsolutePath()));
-        return item;
+    private void launch() {
+        Profile profile = Profiles.getSelectedProfile();
+        Versions.launch(profile, profile.getSelectedVersion());
     }
 
-    private void loadingVersions() {
-        getChildren().setAll(spinner);
-        masonryPane.getChildren().clear();
+    private void onMenu() {
+        popup.show(menuButton, JFXPopup.PopupVPosition.BOTTOM, JFXPopup.PopupHPosition.RIGHT, 0, -menuButton.getHeight());
     }
 
-    private void loadVersions(HMCLGameRepository repository) {
-        List<Node> children = repository.getVersions().parallelStream()
-                .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);
-            }
-        });
+    private void onUpgrade() {
+        RemoteVersion target = UpdateChecker.getLatestVersion();
+        if (target == null) {
+            return;
+        }
+        UpdateHandler.updateFrom(target);
+    }
+
+    private void closeUpdateBubble() {
+        showUpdate.unbind();
+        showUpdate.set(false);
     }
 
     public String getTitle() {
@@ -252,11 +206,51 @@ public final class MainPage extends StackPane implements DecoratorPage {
     }
 
     @Override
-    public StringProperty titleProperty() {
-        return title;
+    public ReadOnlyStringProperty titleProperty() {
+        return title.getReadOnlyProperty();
     }
 
     public void setTitle(String title) {
         this.title.set(title);
     }
+
+    public String getCurrentGame() {
+        return currentGame.get();
+    }
+
+    public StringProperty currentGameProperty() {
+        return currentGame;
+    }
+
+    public void setCurrentGame(String currentGame) {
+        this.currentGame.set(currentGame);
+    }
+
+    public boolean isShowUpdate() {
+        return showUpdate.get();
+    }
+
+    public BooleanProperty showUpdateProperty() {
+        return showUpdate;
+    }
+
+    public void setShowUpdate(boolean showUpdate) {
+        this.showUpdate.set(showUpdate);
+    }
+
+    public String getLatestVersion() {
+        return latestVersion.get();
+    }
+
+    public StringProperty latestVersionProperty() {
+        return latestVersion;
+    }
+
+    public void setLatestVersion(String latestVersion) {
+        this.latestVersion.set(latestVersion);
+    }
+
+    public ObservableList<Node> getVersions() {
+        return versions;
+    }
 }

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

@@ -1,177 +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.JFXSpinner;
-import com.jfoenix.controls.JFXTabPane;
-import javafx.fxml.FXML;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.input.TransferMode;
-import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
-import javafx.stage.FileChooser;
-
-import org.jackhuang.hmcl.mod.ModInfo;
-import org.jackhuang.hmcl.mod.ModManager;
-import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.util.FileUtils;
-import org.jackhuang.hmcl.util.Logging;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.stream.Collectors;
-
-public final class ModController {
-    @FXML
-    private ScrollPane scrollPane;
-
-    @FXML private StackPane rootPane;
-
-    @FXML private VBox modPane;
-
-    @FXML private StackPane contentPane;
-    @FXML private JFXSpinner spinner;
-
-    private JFXTabPane parentTab;
-    private ModManager modManager;
-    private String versionId;
-
-    @FXML
-    private void initialize() {
-        FXUtils.smoothScrolling(scrollPane);
-
-        rootPane.setOnDragOver(event -> {
-            if (event.getGestureSource() != rootPane && event.getDragboard().hasFiles())
-                event.acceptTransferModes(TransferMode.COPY_OR_MOVE);
-            event.consume();
-        });
-
-        rootPane.setOnDragDropped(event -> {
-            List<File> files = event.getDragboard().getFiles();
-            if (files != null) {
-                Collection<File> mods = files.stream()
-                        .filter(it -> Arrays.asList("jar", "zip", "litemod").contains(FileUtils.getExtension(it)))
-                        .collect(Collectors.toList());
-                if (!mods.isEmpty()) {
-                    mods.forEach(it -> {
-                        try {
-                            modManager.addMod(versionId, it);
-                        } catch (IOException | IllegalArgumentException e) {
-                            Logging.LOG.log(Level.WARNING, "Unable to parse mod file " + it, e);
-                        }
-                    });
-                    loadMods(modManager, versionId);
-                    event.setDropCompleted(true);
-                }
-            }
-            event.consume();
-        });
-    }
-
-    public void loadMods(ModManager modManager, String versionId) {
-        this.modManager = modManager;
-        this.versionId = versionId;
-        Task.of(variables -> {
-            synchronized (ModController.this) {
-                JFXUtilities.runInFX(() -> {
-                    rootPane.getChildren().remove(contentPane);
-                    spinner.setVisible(true);
-                });
-
-                modManager.refreshMods(versionId);
-
-                // Surprisingly, if there are a great number of mods, this processing will cause a long UI pause,
-                // constructing UI elements.
-                // We must do this asynchronously.
-                LinkedList<ModItem> list = new LinkedList<>();
-                for (ModInfo modInfo : modManager.getMods(versionId)) {
-                    ModItem item = new ModItem(modInfo, i -> {
-                        modManager.removeMods(versionId, modInfo);
-                        loadMods(modManager, versionId);
-                    });
-                    modInfo.activeProperty().addListener((a, b, newValue) -> {
-                        if (newValue)
-                            item.getStyleClass().remove("disabled");
-                        else
-                            item.getStyleClass().add("disabled");
-                    });
-                    if (!modInfo.isActive())
-                        item.getStyleClass().add("disabled");
-
-                    list.add(item);
-                }
-
-                variables.set("list", list);
-            }
-        }).finalized(Schedulers.javafx(), (variables, isDependentsSucceeded) -> {
-            rootPane.getChildren().add(contentPane);
-            spinner.setVisible(false);
-            if (isDependentsSucceeded)
-                FXUtils.onWeakChangeAndOperate(parentTab.getSelectionModel().selectedItemProperty(), newValue -> {
-                    if (newValue != null && newValue.getUserData() == ModController.this)
-                        modPane.getChildren().setAll(variables.<List<ModItem>>get("list"));
-                });
-        }).start();
-    }
-
-    @FXML
-    private void onAdd() {
-        FileChooser chooser = new FileChooser();
-        chooser.setTitle(i18n("mods.choose_mod"));
-        chooser.getExtensionFilters().setAll(new FileChooser.ExtensionFilter(i18n("extension.mod"), "*.jar", "*.zip", "*.litemod"));
-        List<File> res = chooser.showOpenMultipleDialog(Controllers.getStage());
-
-        // It's guaranteed that succeeded and failed are thread safe here.
-        List<String> succeeded = new LinkedList<>();
-        List<String> failed = new LinkedList<>();
-        if (res == null) return;
-        Task.of(variables -> {
-            for (File file : res) {
-                try {
-                    modManager.addMod(versionId, file);
-                    succeeded.add(file.getName());
-                } catch (Exception e) {
-                    Logging.LOG.log(Level.WARNING, "Unable to add mod " + file, e);
-                    failed.add(file.getName());
-
-                    // Actually addMod will not throw exceptions because FileChooser has already filtered files.
-                }
-            }
-        }).with(Task.of(Schedulers.javafx(), variables -> {
-            List<String> prompt = new LinkedList<>();
-            if (!succeeded.isEmpty())
-                prompt.add(i18n("mods.add.success", String.join(", ", succeeded)));
-            if (!failed.isEmpty())
-                prompt.add(i18n("mods.add.failed", String.join(", ", failed)));
-            Controllers.dialog(String.join("\n", prompt), i18n("mods.add"));
-            loadMods(modManager, versionId);
-        })).start();
-    }
-
-    public void setParentTab(JFXTabPane parentTab) {
-        this.parentTab = parentTab;
-    }
-}

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,13 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui;
 
 import javafx.beans.binding.ObjectBinding;
+import javafx.geometry.Pos;
 import javafx.scene.Group;
 import javafx.scene.Node;
+import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Paint;
 import javafx.scene.shape.SVGPath;
 
@@ -33,6 +35,12 @@ public final class SVG {
         path.setContent(d);
         path.fillProperty().bind(fill);
 
+        if (width < 0 || height < 0) {
+            StackPane pane = new StackPane(path);
+            pane.setAlignment(Pos.CENTER);
+            return pane;
+        }
+
         Group svg = new Group(path);
         double scale = Math.min(width / svg.getBoundsInParent().getWidth(), height / svg.getBoundsInParent().getHeight());
         svg.setScaleX(scale);
@@ -83,6 +91,10 @@ public final class SVG {
         return createSVGPath("M1008 6.286q18.857 13.714 15.429 36.571l-146.286 877.714q-2.857 16.571-18.286 25.714-8 4.571-17.714 4.571-6.286 0-13.714-2.857l-258.857-105.714-138.286 168.571q-10.286 13.143-28 13.143-7.429 0-12.571-2.286-10.857-4-17.429-13.429t-6.571-20.857v-199.429l493.714-605.143-610.857 528.571-225.714-92.571q-21.143-8-22.857-31.429-1.143-22.857 18.286-33.714l950.857-548.571q8.571-5.143 18.286-5.14311.429 0 20.571 6.286z", fill, width, height);
     }
 
+    public static Node launch2(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.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V12H19V19Z", fill, width, height);
+    }
+
     public static Node script(ObjectBinding<? extends Paint> fill, double width, double height) {
         return createSVGPath("M14,20A2,2 0 0,0 16,18V5H9A1,1 0 0,0 8,6V16H5V5A3,3 0 0,1 8,2H19A3,3 0 0,1 22,5V6H18V18L18,19A3,3 0 0,1 15,22H5A3,3 0 0,1 2,19V18H12A2,2 0 0,0 14,20Z", fill, width, height);
     }
@@ -127,4 +139,31 @@ public final class SVG {
         return createSVGPath("M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z", fill, width, height);
     }
 
+    public static Node importIcon(ObjectBinding<? extends Paint> fill, double width, double height) {
+        return createSVGPath("M14,12L10,8V11H2V13H10V16M20,18V6C20,4.89 19.1,4 18,4H6A2,2 0 0,0 4,6V9H6V6H18V18H6V15H4V18A2,2 0 0,0 6,20H18A2,2 0 0,0 20,18Z", fill, width, height);
+    }
+
+    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);
+    }
 }

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

@@ -1,43 +0,0 @@
-/*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
- */
-package org.jackhuang.hmcl.ui;
-
-import javafx.util.StringConverter;
-import org.jackhuang.hmcl.util.Lang;
-
-import java.util.Optional;
-
-/**
- * @author huangyuhui
- */
-public final class SafeIntStringConverter extends StringConverter<Number> {
-    public static final SafeIntStringConverter INSTANCE = new SafeIntStringConverter();
-
-    private SafeIntStringConverter() {
-    }
-
-    @Override
-    public Number fromString(String string) {
-        return Optional.ofNullable(string).map(Lang::toIntOrNull).orElse(null);
-    }
-
-    @Override
-    public String toString(Number object) {
-        return Optional.ofNullable(object).map(Object::toString).orElse("");
-    }
-}

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,211 +13,181 @@
  * 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 com.jfoenix.controls.JFXColorPicker;
 import com.jfoenix.effects.JFXDepthManager;
 import javafx.application.Platform;
+import javafx.beans.InvalidationListener;
+import javafx.beans.WeakInvalidationListener;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.When;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.fxml.FXML;
-import javafx.scene.control.Label;
-import javafx.scene.control.ScrollPane;
+import javafx.beans.property.ReadOnlyStringProperty;
+import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.scene.control.ToggleGroup;
-import javafx.scene.layout.GridPane;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
-import org.jackhuang.hmcl.Launcher;
+import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.setting.*;
-import org.jackhuang.hmcl.ui.construct.FileItem;
-import org.jackhuang.hmcl.ui.construct.FontComboBox;
-import org.jackhuang.hmcl.ui.construct.MultiFileItem;
+import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
 import org.jackhuang.hmcl.ui.construct.Validator;
-import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
-import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
+import org.jackhuang.hmcl.upgrade.RemoteVersion;
+import org.jackhuang.hmcl.upgrade.UpdateChannel;
+import org.jackhuang.hmcl.upgrade.UpdateChecker;
+import org.jackhuang.hmcl.upgrade.UpdateHandler;
+import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.i18n.Locales;
+import org.jackhuang.hmcl.util.javafx.SafeStringConverter;
 
-import static org.jackhuang.hmcl.setting.ConfigHolder.CONFIG;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
+import java.awt.*;
+import java.io.IOException;
 import java.net.Proxy;
+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.Arrays;
 import java.util.Collections;
-import java.util.Objects;
 import java.util.Optional;
+import java.util.logging.Level;
 
-public final class SettingsPage extends StackPane implements DecoratorPage {
-    private final StringProperty title = new SimpleStringProperty(this, "title", i18n("settings.launcher"));
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.util.Lang.thread;
+import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import static org.jackhuang.hmcl.util.javafx.ExtendedProperties.reservedSelectedPropertyFor;
+import static org.jackhuang.hmcl.util.javafx.ExtendedProperties.selectedItemPropertyFor;
 
-    @FXML
-    private JFXTextField txtProxyHost;
-    @FXML
-    private JFXTextField txtProxyPort;
-    @FXML
-    private JFXTextField txtProxyUsername;
-    @FXML
-    private JFXPasswordField txtProxyPassword;
-    @FXML
-    private JFXTextField txtFontSize;
-    @FXML
-    private JFXComboBox<Label> cboLanguage;
-    @FXML
-    private JFXComboBox<?> cboDownloadSource;
-    @FXML
-    private FontComboBox cboFont;
-    @FXML
-    private MultiFileItem<EnumCommonDirectory> fileCommonLocation;
-    @FXML
-    private Label lblDisplay;
-    @FXML
-    private Label lblUpdate;
-    @FXML
-    private Label lblUpdateSub;
-    @FXML
-    private JFXButton btnUpdate;
-    @FXML
-    private ScrollPane scroll;
-    @FXML
-    private MultiFileItem<EnumBackgroundImage> backgroundItem;
-    @FXML
-    private StackPane themeColorPickerContainer;
-    @FXML
-    private JFXCheckBox chkEnableProxy;
-    @FXML
-    private JFXRadioButton chkProxyHttp;
-    @FXML
-    private JFXRadioButton chkProxySocks;
-    @FXML
-    private JFXCheckBox chkProxyAuthentication;
-    @FXML
-    private GridPane authPane;
-    @FXML
-    private Pane proxyPane;
+public final class SettingsPage extends SettingsView implements DecoratorPage {
+    private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper(this, "title", i18n("settings.launcher"));
 
-    private ObjectProperty<Proxy.Type> selectedProxyType;
+    private InvalidationListener updateListener;
 
     public SettingsPage() {
-        FXUtils.loadFXML(this, "/assets/fxml/setting.fxml");
-
         FXUtils.smoothScrolling(scroll);
 
-        cboDownloadSource.getSelectionModel().select(DownloadProviders.DOWNLOAD_PROVIDERS.indexOf(Settings.INSTANCE.getDownloadProvider()));
-        cboDownloadSource.getSelectionModel().selectedIndexProperty().addListener((a, b, newValue) -> Settings.INSTANCE.setDownloadProvider(DownloadProviders.getDownloadProvider(newValue.intValue())));
+        // ==== Download sources ====
+        cboDownloadSource.getItems().setAll(DownloadProviders.providersById.keySet());
+        selectedItemPropertyFor(cboDownloadSource).bindBidirectional(config().downloadTypeProperty());
+        // ====
 
-        cboFont.getSelectionModel().select(Settings.INSTANCE.getFont().getFamily());
-        cboFont.valueProperty().addListener((a, b, newValue) -> {
-            Font font = Font.font(newValue, Settings.INSTANCE.getFont().getSize());
-            Settings.INSTANCE.setFont(font);
-            lblDisplay.setStyle("-fx-font: " + font.getSize() + " \"" + font.getFamily() + "\";");
-        });
+        // ==== Font ====
+        cboFont.valueProperty().bindBidirectional(config().fontFamilyProperty());
 
-        txtFontSize.setText(Double.toString(Settings.INSTANCE.getFont().getSize()));
-        txtFontSize.getValidators().add(new Validator(it -> Lang.toDoubleOrNull(it) != null));
-        txtFontSize.textProperty().addListener((a, b, newValue) -> {
-            if (txtFontSize.validate()) {
-                Font font = Font.font(Settings.INSTANCE.getFont().getFamily(), Double.parseDouble(newValue));
-                Settings.INSTANCE.setFont(font);
-                lblDisplay.setStyle("-fx-font: " + font.getSize() + " \"" + font.getFamily() + "\";");
-            }
-        });
+        txtFontSize.textProperty().bindBidirectional(config().fontSizeProperty(),
+                SafeStringConverter.fromFiniteDouble()
+                        .restrict(it -> it > 0)
+                        .fallbackTo(12.0)
+                        .asPredicate(Validator.addTo(txtFontSize)));
 
-        lblDisplay.setStyle("-fx-font: " + Settings.INSTANCE.getFont().getSize() + " \"" + Settings.INSTANCE.getFont().getFamily() + "\";");
+        lblDisplay.fontProperty().bind(Bindings.createObjectBinding(
+                () -> Font.font(config().getFontFamily(), config().getFontSize()),
+                config().fontFamilyProperty(), config().fontSizeProperty()));
+        // ====
 
-        ObservableList<Label> list = FXCollections.observableArrayList();
-        for (Locales.SupportedLocale locale : Locales.LOCALES)
-            list.add(new Label(locale.getName(Settings.INSTANCE.getLocale().getResourceBundle())));
-
-        cboLanguage.setItems(list);
-        cboLanguage.getSelectionModel().select(Locales.LOCALES.indexOf(Settings.INSTANCE.getLocale()));
-        cboLanguage.getSelectionModel().selectedIndexProperty().addListener((a, b, newValue) -> Settings.INSTANCE.setLocale(Locales.getLocale(newValue.intValue())));
+        // ==== Languages ====
+        cboLanguage.getItems().setAll(Locales.LOCALES);
+        selectedItemPropertyFor(cboLanguage).bindBidirectional(config().localizationProperty());
+        // ====
 
         // ==== Proxy ====
-        txtProxyHost.textProperty().bindBidirectional(CONFIG.proxyHostProperty());
-        txtProxyPort.textProperty().bindBidirectional(CONFIG.proxyPortProperty());
-        txtProxyUsername.textProperty().bindBidirectional(CONFIG.proxyUserProperty());
-        txtProxyPassword.textProperty().bindBidirectional(CONFIG.proxyPassProperty());
+        txtProxyHost.textProperty().bindBidirectional(config().proxyHostProperty());
+        txtProxyPort.textProperty().bindBidirectional(config().proxyPortProperty(),
+                SafeStringConverter.fromInteger()
+                        .restrict(it -> it >= 0 && it <= 0xFFFF)
+                        .fallbackTo(0)
+                        .asPredicate(Validator.addTo(txtProxyPort)));
+        txtProxyUsername.textProperty().bindBidirectional(config().proxyUserProperty());
+        txtProxyPassword.textProperty().bindBidirectional(config().proxyPassProperty());
 
-        proxyPane.disableProperty().bind(chkEnableProxy.selectedProperty().not());
+        proxyPane.disableProperty().bind(chkDisableProxy.selectedProperty());
         authPane.disableProperty().bind(chkProxyAuthentication.selectedProperty().not());
 
-        chkEnableProxy.selectedProperty().bindBidirectional(CONFIG.hasProxyProperty());
-        chkProxyAuthentication.selectedProperty().bindBidirectional(CONFIG.hasProxyAuthProperty());
-
-        selectedProxyType = new SimpleObjectProperty<Proxy.Type>(Proxy.Type.HTTP) {
-            {
-                invalidated();
-            }
-
-            @Override
-            protected void invalidated() {
-                Proxy.Type type = Objects.requireNonNull(get());
-                if (type == Proxy.Type.DIRECT) {
-                    set(Proxy.Type.HTTP); // HTTP by default
-                } else {
-                    chkProxyHttp.setSelected(type == Proxy.Type.HTTP);
-                    chkProxySocks.setSelected(type == Proxy.Type.SOCKS);
-                }
-            }
-        };
-        selectedProxyType.bindBidirectional(CONFIG.proxyTypeProperty());
+        reservedSelectedPropertyFor(chkDisableProxy).bindBidirectional(config().hasProxyProperty());
+        chkProxyAuthentication.selectedProperty().bindBidirectional(config().hasProxyAuthProperty());
 
         ToggleGroup proxyConfigurationGroup = new ToggleGroup();
         chkProxyHttp.setUserData(Proxy.Type.HTTP);
         chkProxyHttp.setToggleGroup(proxyConfigurationGroup);
         chkProxySocks.setUserData(Proxy.Type.SOCKS);
         chkProxySocks.setToggleGroup(proxyConfigurationGroup);
-        proxyConfigurationGroup.getToggles().forEach(
-                toggle -> toggle.selectedProperty().addListener((observable, oldValue, newValue) -> {
-                    if (newValue) {
-                        selectedProxyType.set((Proxy.Type) toggle.getUserData());
-                    }
-                }));
+        selectedItemPropertyFor(proxyConfigurationGroup, Proxy.Type.class).bindBidirectional(config().proxyTypeProperty());
         // ====
 
         fileCommonLocation.loadChildren(Arrays.asList(
-                fileCommonLocation.createChildren(i18n("launcher.common_directory.disabled"), EnumCommonDirectory.DISABLED),
-                fileCommonLocation.createChildren(i18n("launcher.common_directory.default"), EnumCommonDirectory.DEFAULT)
+                fileCommonLocation.createChildren(i18n("launcher.cache_directory.default"), EnumCommonDirectory.DEFAULT)
         ), EnumCommonDirectory.CUSTOM);
-        fileCommonLocation.selectedDataProperty().bindBidirectional(CONFIG.commonDirTypeProperty());
-        fileCommonLocation.customTextProperty().bindBidirectional(CONFIG.commonDirectoryProperty());
+        fileCommonLocation.selectedDataProperty().bindBidirectional(config().commonDirTypeProperty());
+        fileCommonLocation.customTextProperty().bindBidirectional(config().commonDirectoryProperty());
         fileCommonLocation.subtitleProperty().bind(
-                Bindings.createObjectBinding(() -> Optional.ofNullable(Settings.INSTANCE.getCommonDirectory())
-                                .orElse(i18n("launcher.common_directory.disabled")),
-                        CONFIG.commonDirectoryProperty(), CONFIG.commonDirTypeProperty()));
+                Bindings.createObjectBinding(() -> Optional.ofNullable(Settings.instance().getCommonDirectory())
+                                .orElse(i18n("launcher.cache_directory.disabled")),
+                        config().commonDirectoryProperty(), config().commonDirTypeProperty()));
 
-        FXUtils.installTooltip(btnUpdate, i18n("update.tooltip"));
-        checkUpdate();
+        // ==== Update ====
+        FXUtils.installFastTooltip(btnUpdate, i18n("update.tooltip"));
+        updateListener = any -> {
+            btnUpdate.setVisible(UpdateChecker.isOutdated());
+
+            if (UpdateChecker.isOutdated()) {
+                lblUpdateSub.setText(i18n("update.newest_version", UpdateChecker.getLatestVersion().getVersion()));
+                lblUpdateSub.getStyleClass().setAll("update-label");
+
+                lblUpdate.setText(i18n("update.found"));
+                lblUpdate.getStyleClass().setAll("update-label");
+            } else if (UpdateChecker.isCheckingUpdate()) {
+                lblUpdateSub.setText(i18n("update.checking"));
+                lblUpdateSub.getStyleClass().setAll("subtitle-label");
+
+                lblUpdate.setText(i18n("update"));
+                lblUpdate.getStyleClass().setAll();
+            } else {
+                lblUpdateSub.setText(i18n("update.latest"));
+                lblUpdateSub.getStyleClass().setAll("subtitle-label");
+
+                lblUpdate.setText(i18n("update"));
+                lblUpdate.getStyleClass().setAll();
+            }
+        };
+        UpdateChecker.latestVersionProperty().addListener(new WeakInvalidationListener(updateListener));
+        UpdateChecker.outdatedProperty().addListener(new WeakInvalidationListener(updateListener));
+        UpdateChecker.checkingUpdateProperty().addListener(new WeakInvalidationListener(updateListener));
+        updateListener.invalidated(null);
+
+        lblUpdateNote.setWrappingWidth(470);
+
+        ToggleGroup updateChannelGroup = new ToggleGroup();
+        chkUpdateDev.setToggleGroup(updateChannelGroup);
+        chkUpdateDev.setUserData(UpdateChannel.DEVELOPMENT);
+        chkUpdateStable.setToggleGroup(updateChannelGroup);
+        chkUpdateStable.setUserData(UpdateChannel.STABLE);
+        selectedItemPropertyFor(updateChannelGroup, UpdateChannel.class).bindBidirectional(config().updateChannelProperty());
+        // ====
 
         // ==== Background ====
         backgroundItem.loadChildren(Collections.singletonList(
                 backgroundItem.createChildren(i18n("launcher.background.default"), EnumBackgroundImage.DEFAULT)
         ), EnumBackgroundImage.CUSTOM);
-        backgroundItem.customTextProperty().bindBidirectional(CONFIG.backgroundImageProperty());
-        backgroundItem.selectedDataProperty().bindBidirectional(CONFIG.backgroundImageTypeProperty());
+        backgroundItem.customTextProperty().bindBidirectional(config().backgroundImageProperty());
+        backgroundItem.selectedDataProperty().bindBidirectional(config().backgroundImageTypeProperty());
         backgroundItem.subtitleProperty().bind(
                 new When(backgroundItem.selectedDataProperty().isEqualTo(EnumBackgroundImage.DEFAULT))
                         .then(i18n("launcher.background.default"))
-                        .otherwise(CONFIG.backgroundImageProperty()));
+                        .otherwise(config().backgroundImageProperty()));
         // ====
 
         // ==== Theme ====
-        JFXColorPicker picker = new JFXColorPicker(Color.web(CONFIG.getTheme().getColor()), null);
+        JFXColorPicker picker = new JFXColorPicker(Color.web(config().getTheme().getColor()), null);
         picker.setCustomColorText(i18n("color.custom"));
         picker.setRecentColorsText(i18n("color.recent"));
         picker.getCustomColors().setAll(Theme.SUGGESTED_COLORS);
         picker.setOnAction(e -> {
             Theme theme = Theme.custom(Theme.getColorDisplayName(picker.getValue()));
-            CONFIG.setTheme(theme);
+            config().setTheme(theme);
             Controllers.getScene().getStylesheets().setAll(theme.getStylesheets());
         });
         themeColorPickerContainer.getChildren().setAll(picker);
@@ -230,34 +200,56 @@ public final class SettingsPage extends StackPane implements DecoratorPage {
     }
 
     @Override
-    public StringProperty titleProperty() {
-        return title;
+    public ReadOnlyStringProperty titleProperty() {
+        return title.getReadOnlyProperty();
     }
 
     public void setTitle(String title) {
         this.title.set(title);
     }
 
-    public void checkUpdate() {
-        btnUpdate.setVisible(Launcher.UPDATE_CHECKER.isOutOfDate());
-
-        if (Launcher.UPDATE_CHECKER.isOutOfDate()) {
-            lblUpdateSub.setText(i18n("update.newest_version", Launcher.UPDATE_CHECKER.getNewVersion().toString()));
-            lblUpdateSub.getStyleClass().setAll("update-label");
-
-            lblUpdate.setText(i18n("update.found"));
-            lblUpdate.getStyleClass().setAll("update-label");
-        } else {
-            lblUpdateSub.setText(i18n("update.latest"));
-            lblUpdateSub.getStyleClass().setAll("subtitle-label");
-
-            lblUpdate.setText(i18n("update"));
-            lblUpdate.getStyleClass().setAll();
+    @Override
+    protected void onUpdate() {
+        RemoteVersion target = UpdateChecker.getLatestVersion();
+        if (target == null) {
+            return;
         }
+        UpdateHandler.updateFrom(target);
     }
 
-    @FXML
-    private void onUpdate() {
-        Launcher.UPDATE_CHECKER.checkOutdate();
+    @Override
+    protected void onExportLogs() {
+        // We cannot determine which file is JUL using.
+        // So we write all the logs to a new file.
+        thread(() -> {
+            Path logFile = Paths.get("hmcl-exported-logs-" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH-mm-ss")) + ".log").toAbsolutePath();
+
+            LOG.info("Exporting logs to " + logFile);
+            try {
+                Files.write(logFile, Logging.getRawLogs());
+            } catch (IOException e) {
+                Platform.runLater(() -> Controllers.dialog(i18n("settings.launcher.launcher_log.export.failed") + "\n" + e, null, MessageType.ERROR));
+                LOG.log(Level.WARNING, "Failed to export logs", e);
+                return;
+            }
+
+            Platform.runLater(() -> Controllers.dialog(i18n("settings.launcher.launcher_log.export.success", logFile)));
+            if (Desktop.isDesktopSupported()) {
+                try {
+                    Desktop.getDesktop().open(logFile.toFile());
+                } catch (IOException ignored) {
+                }
+            }
+        });
+    }
+
+    @Override
+    protected void onHelp() {
+        FXUtils.openLink(Metadata.HELP_URL);
+    }
+
+    @Override
+    protected void onSponsor() {
+        FXUtils.openLink("https://hmcl.huangyuhui.net/api/redirect/sponsor");
     }
 }

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

@@ -0,0 +1,509 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui;
+
+import com.jfoenix.controls.*;
+import javafx.geometry.HPos;
+import javafx.geometry.Pos;
+import javafx.geometry.VPos;
+import javafx.scene.Cursor;
+import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.layout.*;
+import javafx.scene.text.Text;
+import javafx.scene.text.TextAlignment;
+import org.jackhuang.hmcl.setting.EnumBackgroundImage;
+import org.jackhuang.hmcl.setting.EnumCommonDirectory;
+import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.ui.construct.*;
+import org.jackhuang.hmcl.util.i18n.Locales.SupportedLocale;
+
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.ui.FXUtils.stringConverter;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+public abstract class SettingsView extends StackPane {
+    protected final JFXTextField txtProxyHost;
+    protected final JFXTextField txtProxyPort;
+    protected final JFXTextField txtProxyUsername;
+    protected final JFXPasswordField txtProxyPassword;
+    protected final JFXTextField txtFontSize;
+    protected final JFXComboBox<SupportedLocale> cboLanguage;
+    protected final JFXComboBox<String> cboDownloadSource;
+    protected final FontComboBox cboFont;
+    protected final MultiFileItem<EnumCommonDirectory> fileCommonLocation;
+    protected final Label lblDisplay;
+    protected final Label lblUpdate;
+    protected final Label lblUpdateSub;
+    protected final Text lblUpdateNote;
+    protected final JFXRadioButton chkUpdateStable;
+    protected final JFXRadioButton chkUpdateDev;
+    protected final JFXButton btnUpdate;
+    protected final ScrollPane scroll;
+    protected final MultiFileItem<EnumBackgroundImage> backgroundItem;
+    protected final StackPane themeColorPickerContainer;
+    protected final JFXCheckBox chkDisableProxy;
+    protected final JFXRadioButton chkProxyHttp;
+    protected final JFXRadioButton chkProxySocks;
+    protected final JFXCheckBox chkProxyAuthentication;
+    protected final GridPane authPane;
+    protected final Pane proxyPane;
+
+    public SettingsView() {
+        scroll = new ScrollPane();
+        getChildren().setAll(scroll);
+        scroll.setStyle("-fx-font-size: 14;");
+        scroll.setFitToWidth(true);
+
+        {
+            VBox rootPane = new VBox();
+            rootPane.setStyle("-fx-padding: 18;");
+            {
+                ComponentList settingsPane = new ComponentList();
+                {
+                    {
+                        StackPane sponsorPane = new StackPane();
+                        sponsorPane.setCursor(Cursor.HAND);
+                        sponsorPane.setOnMouseClicked(e -> onSponsor());
+                        {
+                            Label label = new Label(i18n("sponsor.hmcl"));
+                            label.setWrapText(true);
+                            label.prefWidthProperty().bind(sponsorPane.widthProperty());
+                            sponsorPane.getChildren().add(label);
+                        }
+                        settingsPane.getContent().add(sponsorPane);
+                    }
+
+                    ComponentSublist updatePane = new ComponentSublist();
+                    updatePane.setTitle(i18n("update"));
+                    updatePane.setHasSubtitle(true);
+                    {
+                        VBox headerLeft = new VBox();
+
+                        lblUpdate = new Label(i18n("update"));
+                        lblUpdateSub = new Label();
+                        lblUpdateSub.getStyleClass().add("subtitle-label");
+
+                        headerLeft.getChildren().setAll(lblUpdate, lblUpdateSub);
+                        updatePane.setHeaderLeft(headerLeft);
+                    }
+
+                    {
+                        btnUpdate = new JFXButton();
+                        btnUpdate.setOnMouseClicked(e -> onUpdate());
+                        btnUpdate.getStyleClass().add("toggle-icon4");
+                        btnUpdate.setGraphic(SVG.update(Theme.blackFillBinding(), 20, 20));
+
+                        updatePane.setHeaderRight(btnUpdate);
+                    }
+
+                    {
+                        VBox content = new VBox();
+                        content.setSpacing(8);
+
+                        chkUpdateStable = new JFXRadioButton(i18n("update.channel.stable"));
+                        chkUpdateDev = new JFXRadioButton(i18n("update.channel.dev"));
+
+                        VBox noteWrapper = new VBox();
+                        noteWrapper.setStyle("-fx-padding: 10 0 0 0;");
+                        lblUpdateNote = new Text(i18n("update.note"));
+                        noteWrapper.getChildren().setAll(lblUpdateNote);
+
+                        content.getChildren().setAll(chkUpdateStable, chkUpdateDev, noteWrapper);
+
+                        updatePane.getContent().add(content);
+                    }
+                    settingsPane.getContent().add(updatePane);
+                }
+
+                {
+                    BorderPane updatePane = new BorderPane();
+                    {
+                        VBox headerLeft = new VBox();
+
+                        Label help = new Label(i18n("help"));
+                        Label helpSubtitle = new Label(i18n("help.detail"));
+                        helpSubtitle.getStyleClass().add("subtitle-label");
+
+                        headerLeft.getChildren().setAll(help, helpSubtitle);
+                        updatePane.setLeft(headerLeft);
+                    }
+
+                    {
+                        JFXButton btnExternal = new JFXButton();
+                        btnExternal.setOnMouseClicked(e -> onHelp());
+                        btnExternal.getStyleClass().add("toggle-icon4");
+                        btnExternal.setGraphic(SVG.openInNew(Theme.blackFillBinding(), -1, -1));
+
+                        updatePane.setRight(btnExternal);
+                    }
+                    settingsPane.getContent().add(updatePane);
+                }
+
+                {
+                    fileCommonLocation = new MultiFileItem<>(true);
+                    fileCommonLocation.setTitle(i18n("launcher.cache_directory"));
+                    fileCommonLocation.setDirectory(true);
+                    fileCommonLocation.setChooserTitle(i18n("launcher.cache_directory.choose"));
+                    fileCommonLocation.setHasSubtitle(true);
+                    fileCommonLocation.setCustomText("settings.custom");
+
+                    settingsPane.getContent().add(fileCommonLocation);
+                }
+
+                {
+                    backgroundItem = new MultiFileItem<>(true);
+                    backgroundItem.setTitle(i18n("launcher.background"));
+                    backgroundItem.setChooserTitle(i18n("launcher.background.choose"));
+                    backgroundItem.setHasSubtitle(true);
+                    backgroundItem.setCustomText(i18n("settings.custom"));
+
+                    settingsPane.getContent().add(backgroundItem);
+                }
+
+                {
+                    BorderPane downloadSourcePane = new BorderPane();
+                    {
+                        Label label = new Label(i18n("settings.launcher.download_source"));
+                        BorderPane.setAlignment(label, Pos.CENTER_LEFT);
+                        downloadSourcePane.setLeft(label);
+                    }
+
+                    {
+                        cboDownloadSource = new JFXComboBox<>();
+                        cboDownloadSource.setConverter(stringConverter(key -> i18n("download.provider." + key)));
+                        downloadSourcePane.setRight(cboDownloadSource);
+                    }
+                    settingsPane.getContent().add(downloadSourcePane);
+                }
+
+                {
+                    BorderPane languagePane = new BorderPane();
+
+                    Label left = new Label(i18n("settings.launcher.language"));
+                    BorderPane.setAlignment(left, Pos.CENTER_LEFT);
+                    languagePane.setLeft(left);
+
+                    cboLanguage = new JFXComboBox<>();
+                    cboLanguage.setConverter(stringConverter(locale -> locale.getName(config().getLocalization().getResourceBundle())));
+                    FXUtils.setLimitWidth(cboLanguage, 400);
+                    languagePane.setRight(cboLanguage);
+
+                    settingsPane.getContent().add(languagePane);
+                }
+
+                {
+                    ComponentList proxyList = new ComponentList();
+                    proxyList.setTitle(i18n("settings.launcher.proxy"));
+
+                    VBox proxyWrapper = new VBox();
+                    proxyWrapper.setSpacing(10);
+
+                    {
+                        chkDisableProxy = new JFXCheckBox(i18n("settings.launcher.proxy.disable"));
+                        proxyWrapper.getChildren().add(chkDisableProxy);
+                    }
+
+                    {
+                        proxyPane = new VBox();
+                        proxyPane.setStyle("-fx-padding: 0 0 0 30;");
+
+                        ColumnConstraints colHgrow = new ColumnConstraints();
+                        colHgrow.setHgrow(Priority.ALWAYS);
+
+                        {
+                            HBox hBox = new HBox();
+                            chkProxyHttp = new JFXRadioButton(i18n("settings.launcher.proxy.http"));
+                            chkProxySocks = new JFXRadioButton(i18n("settings.launcher.proxy.socks"));
+                            hBox.getChildren().setAll(chkProxyHttp, chkProxySocks);
+                            proxyPane.getChildren().add(hBox);
+                        }
+
+                        {
+                            GridPane gridPane = new GridPane();
+                            gridPane.setHgap(20);
+                            gridPane.setVgap(10);
+                            gridPane.setStyle("-fx-padding: 0 0 0 15;");
+                            gridPane.getColumnConstraints().setAll(new ColumnConstraints(), colHgrow);
+                            gridPane.getRowConstraints().setAll(new RowConstraints(), new RowConstraints());
+
+                            {
+                                Label host = new Label(i18n("settings.launcher.proxy.host"));
+                                GridPane.setRowIndex(host, 1);
+                                GridPane.setColumnIndex(host, 0);
+                                GridPane.setHalignment(host, HPos.RIGHT);
+                                gridPane.getChildren().add(host);
+                            }
+
+                            {
+                                txtProxyHost = new JFXTextField();
+                                GridPane.setRowIndex(txtProxyHost, 1);
+                                GridPane.setColumnIndex(txtProxyHost, 1);
+                                gridPane.getChildren().add(txtProxyHost);
+                            }
+
+                            {
+                                Label port = new Label(i18n("settings.launcher.proxy.port"));
+                                GridPane.setRowIndex(port, 2);
+                                GridPane.setColumnIndex(port, 0);
+                                GridPane.setHalignment(port, HPos.RIGHT);
+                                gridPane.getChildren().add(port);
+                            }
+
+                            {
+                                txtProxyPort = new JFXTextField();
+                                GridPane.setRowIndex(txtProxyPort, 2);
+                                GridPane.setColumnIndex(txtProxyPort, 1);
+                                FXUtils.setValidateWhileTextChanged(txtProxyPort, true);
+                                txtProxyHost.getValidators().setAll(new NumberValidator(i18n("input.number"), false));
+                                gridPane.getChildren().add(txtProxyPort);
+                            }
+                            proxyPane.getChildren().add(gridPane);
+                        }
+
+                        {
+                            VBox vBox = new VBox();
+                            vBox.setStyle("-fx-padding: 20 0 20 5;");
+
+                            chkProxyAuthentication = new JFXCheckBox(i18n("settings.launcher.proxy.authentication"));
+                            vBox.getChildren().setAll(chkProxyAuthentication);
+
+                            proxyPane.getChildren().add(vBox);
+                        }
+
+                        {
+                            authPane = new GridPane();
+                            authPane.setHgap(20);
+                            authPane.setVgap(10);
+                            authPane.setStyle("-fx-padding: 0 0 0 15;");
+                            authPane.getColumnConstraints().setAll(new ColumnConstraints(), colHgrow);
+                            authPane.getRowConstraints().setAll(new RowConstraints(), new RowConstraints());
+
+                            {
+                                Label username = new Label(i18n("settings.launcher.proxy.username"));
+                                GridPane.setRowIndex(username, 0);
+                                GridPane.setColumnIndex(username, 0);
+                                authPane.getChildren().add(username);
+                            }
+
+                            {
+                                txtProxyUsername = new JFXTextField();
+                                GridPane.setRowIndex(txtProxyUsername, 0);
+                                GridPane.setColumnIndex(txtProxyUsername, 1);
+                                authPane.getChildren().add(txtProxyUsername);
+                            }
+
+                            {
+                                Label password = new Label(i18n("settings.launcher.proxy.password"));
+                                GridPane.setRowIndex(password, 1);
+                                GridPane.setColumnIndex(password, 0);
+                                authPane.getChildren().add(password);
+                            }
+
+                            {
+                                txtProxyPassword = new JFXPasswordField();
+                                GridPane.setRowIndex(txtProxyPassword, 1);
+                                GridPane.setColumnIndex(txtProxyPassword, 1);
+                                authPane.getChildren().add(txtProxyPassword);
+                            }
+
+                            proxyPane.getChildren().add(authPane);
+                        }
+                        proxyWrapper.getChildren().add(proxyPane);
+                    }
+                    proxyList.getContent().add(proxyWrapper);
+                    settingsPane.getContent().add(proxyList);
+                }
+
+                {
+                    BorderPane themePane = new BorderPane();
+
+                    Label left = new Label(i18n("settings.launcher.theme"));
+                    BorderPane.setAlignment(left, Pos.CENTER_LEFT);
+                    themePane.setLeft(left);
+
+                    themeColorPickerContainer = new StackPane();
+                    themeColorPickerContainer.setMinHeight(30);
+                    themePane.setRight(themeColorPickerContainer);
+
+                    settingsPane.getContent().add(themePane);
+                }
+
+                {
+                    ComponentSublist logPane = new ComponentSublist();
+                    logPane.setTitle(i18n("settings.launcher.log"));
+
+                    {
+                        JFXButton logButton = new JFXButton(i18n("settings.launcher.launcher_log.export"));
+                        logButton.setOnMouseClicked(e -> onExportLogs());
+                        logButton.getStyleClass().add("jfx-button-border");
+
+                        logPane.setHeaderRight(logButton);
+                    }
+
+                    {
+                        VBox fontPane = new VBox();
+                        fontPane.setSpacing(5);
+
+                        {
+                            BorderPane borderPane = new BorderPane();
+                            fontPane.getChildren().add(borderPane);
+                            {
+                                Label left = new Label(i18n("settings.launcher.log.font"));
+                                BorderPane.setAlignment(left, Pos.CENTER_LEFT);
+                                borderPane.setLeft(left);
+                            }
+
+                            {
+                                HBox hBox = new HBox();
+                                hBox.setSpacing(3);
+
+                                cboFont = new FontComboBox(12);
+                                txtFontSize = new JFXTextField();
+                                FXUtils.setLimitWidth(txtFontSize, 50);
+                                hBox.getChildren().setAll(cboFont, txtFontSize);
+
+                                borderPane.setRight(hBox);
+                            }
+                        }
+
+                        lblDisplay = new Label("[23:33:33] [Client Thread/INFO] [WaterPower]: Loaded mod WaterPower.");
+                        fontPane.getChildren().add(lblDisplay);
+
+                        logPane.getContent().add(fontPane);
+                    }
+                    settingsPane.getContent().add(logPane);
+                }
+
+                {
+                    StackPane aboutPane = new StackPane();
+                    GridPane gridPane = new GridPane();
+                    gridPane.setHgap(20);
+                    gridPane.setVgap(10);
+
+                    ColumnConstraints col1 = new ColumnConstraints();
+                    col1.setHgrow(Priority.SOMETIMES);
+                    col1.setMaxWidth(Double.NEGATIVE_INFINITY);
+                    col1.setMinWidth(Double.NEGATIVE_INFINITY);
+
+                    ColumnConstraints col2 = new ColumnConstraints();
+                    col2.setHgrow(Priority.SOMETIMES);
+                    col2.setMinWidth(20);
+                    col2.setMaxWidth(Double.POSITIVE_INFINITY);
+
+                    gridPane.getColumnConstraints().setAll(col1, col2);
+
+                    RowConstraints row = new RowConstraints();
+                    row.setMinHeight(Double.NEGATIVE_INFINITY);
+                    row.setValignment(VPos.TOP);
+                    row.setVgrow(Priority.SOMETIMES);
+                    gridPane.getRowConstraints().setAll(row, row, row, row, row, row);
+
+                    {
+                        Label label = new Label(i18n("about.copyright"));
+                        GridPane.setRowIndex(label, 0);
+                        GridPane.setColumnIndex(label, 0);
+                        gridPane.getChildren().add(label);
+                    }
+                    {
+                        Label label = new Label(i18n("about.copyright.statement"));
+                        label.setWrapText(true);
+                        GridPane.setRowIndex(label, 0);
+                        GridPane.setColumnIndex(label, 1);
+                        gridPane.getChildren().add(label);
+                    }
+                    {
+                        Label label = new Label(i18n("about.author"));
+                        GridPane.setRowIndex(label, 1);
+                        GridPane.setColumnIndex(label, 0);
+                        gridPane.getChildren().add(label);
+                    }
+                    {
+                        Label label = new Label(i18n("about.author.statement"));
+                        label.setWrapText(true);
+                        GridPane.setRowIndex(label, 1);
+                        GridPane.setColumnIndex(label, 1);
+                        gridPane.getChildren().add(label);
+                    }
+                    {
+                        Label label = new Label(i18n("about.thanks_to"));
+                        GridPane.setRowIndex(label, 2);
+                        GridPane.setColumnIndex(label, 0);
+                        gridPane.getChildren().add(label);
+                    }
+                    {
+                        Label label = new Label(i18n("about.thanks_to.statement"));
+                        label.setWrapText(true);
+                        GridPane.setRowIndex(label, 2);
+                        GridPane.setColumnIndex(label, 1);
+                        gridPane.getChildren().add(label);
+                    }
+                    {
+                        Label label = new Label(i18n("about.dependency"));
+                        GridPane.setRowIndex(label, 3);
+                        GridPane.setColumnIndex(label, 0);
+                        gridPane.getChildren().add(label);
+                    }
+                    {
+                        Label label = new Label(i18n("about.dependency.statement"));
+                        label.setWrapText(true);
+                        GridPane.setRowIndex(label, 3);
+                        GridPane.setColumnIndex(label, 1);
+                        gridPane.getChildren().add(label);
+                    }
+                    {
+                        Label label = new Label(i18n("about.claim"));
+                        GridPane.setRowIndex(label, 4);
+                        GridPane.setColumnIndex(label, 0);
+                        gridPane.getChildren().add(label);
+                    }
+                    {
+                        Label label = new Label(i18n("about.claim.statement"));
+                        label.setWrapText(true);
+                        label.setTextAlignment(TextAlignment.JUSTIFY);
+                        GridPane.setRowIndex(label, 4);
+                        GridPane.setColumnIndex(label, 1);
+                        gridPane.getChildren().add(label);
+                    }
+                    {
+                        Label label = new Label(i18n("about.open_source"));
+                        GridPane.setRowIndex(label, 5);
+                        GridPane.setColumnIndex(label, 0);
+                        gridPane.getChildren().add(label);
+                    }
+                    {
+                        Label label = new Label(i18n("about.open_source.statement"));
+                        label.setWrapText(true);
+                        GridPane.setRowIndex(label, 5);
+                        GridPane.setColumnIndex(label, 1);
+                        gridPane.getChildren().add(label);
+                    }
+                    aboutPane.getChildren().setAll(gridPane);
+                    settingsPane.getContent().add(aboutPane);
+                }
+                rootPane.getChildren().add(settingsPane);
+            }
+            scroll.setContent(rootPane);
+        }
+    }
+
+    protected abstract void onUpdate();
+    protected abstract void onHelp();
+    protected abstract void onExportLogs();
+    protected abstract void onSponsor();
+}

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

@@ -1,217 +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.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.css.*;
-import javafx.scene.Node;
-import javafx.scene.control.Label;
-import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
-import javafx.scene.paint.Color;
-import javafx.scene.paint.Paint;
-import javafx.scene.text.Font;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class TwoLineListItem extends StackPane {
-
-    private final StringProperty title = new SimpleStringProperty(this, "title");
-    private final StringProperty subtitle = new SimpleStringProperty(this, "subtitle");
-
-    private final StyleableObjectProperty<Font> titleFont = new SimpleStyleableObjectProperty<>(StyleableProperties.TITLE_FONT, this, "title-font", Font.font(15));
-    private final StyleableObjectProperty<Font> subtitleFont = new SimpleStyleableObjectProperty<>(StyleableProperties.SUBTITLE_FONT, this, "subtitle-font", Font.getDefault());
-
-    private final StyleableObjectProperty<Paint> titleFill = new SimpleStyleableObjectProperty<>(StyleableProperties.TITLE_FILL, this, "title-fill", Color.BLACK);
-    private final StyleableObjectProperty<Paint> subtitleFill = new SimpleStyleableObjectProperty<>(StyleableProperties.SUBTITLE_FILL, this, "subtitle-fill", Color.GRAY);
-
-    public TwoLineListItem(String titleString, String subtitleString) {
-        this();
-
-        title.set(titleString);
-        subtitle.set(subtitleString);
-    }
-
-    public TwoLineListItem() {
-        Label lblTitle = new Label();
-        lblTitle.textFillProperty().bind(titleFill);
-        lblTitle.fontProperty().bind(titleFont);
-        lblTitle.textProperty().bind(title);
-
-        Label lblSubtitle = new Label();
-        lblSubtitle.textFillProperty().bind(subtitleFill);
-        lblSubtitle.fontProperty().bind(subtitleFont);
-        lblSubtitle.textProperty().bind(subtitle);
-
-        VBox vbox = new VBox();
-        vbox.getChildren().setAll(lblTitle, lblSubtitle);
-        getChildren().setAll(vbox);
-    }
-
-    public String getTitle() {
-        return title.get();
-    }
-
-    public StringProperty titleProperty() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title.set(title);
-    }
-
-    public String getSubtitle() {
-        return subtitle.get();
-    }
-
-    public StringProperty subtitleProperty() {
-        return subtitle;
-    }
-
-    public void setSubtitle(String subtitle) {
-        this.subtitle.set(subtitle);
-    }
-
-    public Font getTitleFont() {
-        return titleFont.get();
-    }
-
-    public StyleableObjectProperty<Font> titleFontProperty() {
-        return titleFont;
-    }
-
-    public void setTitleFont(Font titleFont) {
-        this.titleFont.set(titleFont);
-    }
-
-    public Font getSubtitleFont() {
-        return subtitleFont.get();
-    }
-
-    public StyleableObjectProperty<Font> subtitleFontProperty() {
-        return subtitleFont;
-    }
-
-    public void setSubtitleFont(Font subtitleFont) {
-        this.subtitleFont.set(subtitleFont);
-    }
-
-    public Paint getTitleFill() {
-        return titleFill.get();
-    }
-
-    public StyleableObjectProperty<Paint> titleFillProperty() {
-        return titleFill;
-    }
-
-    public void setTitleFill(Paint titleFill) {
-        this.titleFill.set(titleFill);
-    }
-
-    public Paint getSubtitleFill() {
-        return subtitleFill.get();
-    }
-
-    public StyleableObjectProperty<Paint> subtitleFillProperty() {
-        return subtitleFill;
-    }
-
-    public void setSubtitleFill(Paint subtitleFill) {
-        this.subtitleFill.set(subtitleFill);
-    }
-
-    @Override
-    public String toString() {
-        return getTitle();
-    }
-
-    @Override
-    public List<CssMetaData<? extends Styleable, ?>> getCssMetaData() {
-        return getClassCssMetaData();
-    }
-
-    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
-        return StyleableProperties.STYLEABLES;
-    }
-
-    private static class StyleableProperties {
-
-        private static final FontCssMetaData<TwoLineListItem> TITLE_FONT = new FontCssMetaData<TwoLineListItem>("-jfx-title-font", Font.font(15)) {
-            @Override
-            public boolean isSettable(TwoLineListItem control) {
-                return control.title == null || !control.title.isBound();
-            }
-
-            @Override
-            public StyleableProperty<Font> getStyleableProperty(TwoLineListItem control) {
-                return control.titleFontProperty();
-            }
-        };
-
-        private static final FontCssMetaData<TwoLineListItem> SUBTITLE_FONT = new FontCssMetaData<TwoLineListItem>("-jfx-subtitle-font", Font.getDefault()) {
-            @Override
-            public boolean isSettable(TwoLineListItem control) {
-                return control.subtitle == null || !control.subtitle.isBound();
-            }
-
-            @Override
-            public StyleableProperty<Font> getStyleableProperty(TwoLineListItem control) {
-                return control.subtitleFontProperty();
-            }
-        };
-
-        private static final CssMetaData<TwoLineListItem, Paint> TITLE_FILL = new CssMetaData<TwoLineListItem, Paint>("-jfx-title-fill", StyleConverter.getPaintConverter(), Color.BLACK) {
-            @Override
-            public boolean isSettable(TwoLineListItem control) {
-                return control.titleFill == null || !control.titleFill.isBound();
-            }
-
-            @Override
-            public StyleableProperty<Paint> getStyleableProperty(TwoLineListItem control) {
-                return control.titleFillProperty();
-            }
-        };
-
-        private static final CssMetaData<TwoLineListItem, Paint> SUBTITLE_FILL = new CssMetaData<TwoLineListItem, Paint>("-jfx-subtitle-fill", StyleConverter.getPaintConverter(), Color.GRAY) {
-            @Override
-            public boolean isSettable(TwoLineListItem control) {
-                return control.subtitleFill == null || !control.subtitleFill.isBound();
-            }
-
-            @Override
-            public StyleableProperty<Paint> getStyleableProperty(TwoLineListItem control) {
-                return control.subtitleFillProperty();
-            }
-        };
-
-        private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
-
-        private StyleableProperties() {
-        }
-
-        static {
-            List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(Node.getClassCssMetaData());
-            Collections.addAll(styleables, TITLE_FONT);
-            Collections.addAll(styleables, SUBTITLE_FONT);
-            STYLEABLES = Collections.unmodifiableList(styleables);
-        }
-    }
-}

HMCL/src/main/java/org/jackhuang/hmcl/ui/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 static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
-import java.util.Optional;
-
-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/VersionListItem.java

@@ -1,70 +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.controls.JFXButton;
-import javafx.event.EventHandler;
-import javafx.fxml.FXML;
-import javafx.geometry.Rectangle2D;
-import javafx.scene.control.Label;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.StackPane;
-
-public final class VersionListItem extends StackPane {
-    @FXML
-    private StackPane imageViewContainer;
-    @FXML
-    private Label lblVersionName;
-    @FXML
-    private Label lblGameVersion;
-    @FXML
-    private ImageView imageView;
-    @FXML private JFXButton btnSettings;
-
-    public VersionListItem(String versionName) {
-        this(versionName, "");
-    }
-
-    public VersionListItem(String versionName, String gameVersion) {
-        FXUtils.loadFXML(this, "/assets/fxml/version-list-item.fxml");
-
-        lblVersionName.setText(versionName);
-        lblGameVersion.setText(gameVersion);
-
-        FXUtils.limitSize(imageView, 32, 32);
-    }
-
-    public void setOnSettingsButtonClicked(EventHandler<? super MouseEvent> handler) {
-        btnSettings.setOnMouseClicked(handler);
-    }
-
-    public void setVersionName(String versionName) {
-        lblVersionName.setText(versionName);
-    }
-
-    public void setGameVersion(String gameVersion) {
-        lblGameVersion.setText(gameVersion);
-    }
-
-    public void setImage(Image image, Rectangle2D viewport) {
-        imageView.setImage(image);
-        imageView.setViewport(viewport);
-    }
-}

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

@@ -1,212 +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.controls.JFXButton;
-import com.jfoenix.controls.JFXListView;
-import com.jfoenix.controls.JFXPopup;
-import com.jfoenix.controls.JFXTabPane;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.fxml.FXML;
-import javafx.scene.control.Tab;
-import javafx.scene.layout.StackPane;
-
-import org.jackhuang.hmcl.download.game.GameAssetIndexDownloadTask;
-import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.ui.export.ExportWizardProvider;
-import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
-import org.jackhuang.hmcl.util.FileUtils;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
-import java.io.File;
-
-public final class VersionPage extends StackPane implements DecoratorPage {
-    private final StringProperty title = new SimpleStringProperty(this, "title", null);
-
-    @FXML
-    private VersionSettingsController versionSettingsController;
-    @FXML
-    private Tab modTab;
-    @FXML
-    private ModController modController;
-    @FXML
-    private InstallerController installerController;
-    @FXML
-    private JFXListView<?> browseList;
-    @FXML
-    private JFXListView<?> managementList;
-    @FXML
-    private JFXButton btnBrowseMenu;
-    @FXML
-    private JFXButton btnDelete;
-    @FXML
-    private JFXButton btnManagementMenu;
-    @FXML
-    private JFXButton btnExport;
-    @FXML
-    private StackPane rootPane;
-    @FXML
-    private StackPane contentPane;
-    @FXML
-    private JFXTabPane tabPane;
-
-    private final JFXPopup browsePopup;
-    private final JFXPopup managementPopup;
-
-    private Profile profile;
-    private String version;
-
-    {
-        FXUtils.loadFXML(this, "/assets/fxml/version/version.fxml");
-
-        getChildren().removeAll(browseList, managementList);
-
-        browsePopup = new JFXPopup(browseList);
-        managementPopup = new JFXPopup(managementList);
-
-        FXUtils.installTooltip(btnDelete, i18n("version.manage.remove"));
-        FXUtils.installTooltip(btnBrowseMenu, i18n("settings.game.exploration"));
-        FXUtils.installTooltip(btnManagementMenu, i18n("settings.game.management"));
-        FXUtils.installTooltip(btnExport, i18n("modpack.export"));
-    }
-
-    public void load(String id, Profile profile) {
-        this.version = id;
-        this.profile = profile;
-
-        title.set(i18n("settings.game") + " - " + id);
-
-        versionSettingsController.loadVersionSetting(profile, id);
-        modController.setParentTab(tabPane);
-        modTab.setUserData(modController);
-        modController.loadMods(profile.getModManager(), id);
-        installerController.loadVersion(profile, id);
-    }
-
-    @FXML
-    private void onBrowseMenu() {
-        browseList.getSelectionModel().select(-1);
-        browsePopup.show(btnBrowseMenu, JFXPopup.PopupVPosition.TOP, JFXPopup.PopupHPosition.RIGHT, -12, 15);
-    }
-
-    @FXML
-    private void onManagementMenu() {
-        managementList.getSelectionModel().select(-1);
-        managementPopup.show(btnManagementMenu, JFXPopup.PopupVPosition.TOP, JFXPopup.PopupHPosition.RIGHT, -12, 15);
-    }
-
-    @FXML
-    private void onDelete() {
-        deleteVersion(profile, version);
-    }
-
-    @FXML
-    private void onExport() {
-        exportVersion(profile, version);
-    }
-
-    @FXML
-    private void onBrowse() {
-        String sub;
-        switch (browseList.getSelectionModel().getSelectedIndex()) {
-            case 0:
-                sub = "";
-                break;
-            case 1:
-                sub = "mods";
-                break;
-            case 2:
-                sub = "coremods";
-                break;
-            case 3:
-                sub = "config";
-                break;
-            case 4:
-                sub = "resourcepacks";
-                break;
-            case 5:
-                sub = "screenshots";
-                break;
-            case 6:
-                sub = "saves";
-                break;
-            default:
-                throw new RuntimeException();
-        }
-        FXUtils.openFolder(new File(profile.getRepository().getRunDirectory(version), sub));
-    }
-
-    @FXML
-    private void onManagement() {
-        switch (managementList.getSelectionModel().getSelectedIndex()) {
-            case 0: // rename a version
-                renameVersion(profile, version);
-                break;
-            case 1: // remove a version
-                deleteVersion(profile, version);
-                break;
-            case 2: // redownload asset index
-                new GameAssetIndexDownloadTask(profile.getDependency(), profile.getRepository().getResolvedVersion(version)).start();
-                break;
-            case 3: // delete libraries
-                FileUtils.deleteDirectoryQuietly(new File(profile.getRepository().getBaseDirectory(), "libraries"));
-                break;
-            case 4:
-                throw new Error();
-        }
-    }
-
-    public String getTitle() {
-        return title.get();
-    }
-
-    @Override
-    public StringProperty titleProperty() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title.set(title);
-    }
-
-    public static void deleteVersion(Profile profile, String version) {
-        Controllers.confirmDialog(i18n("version.manage.remove.confirm", version), i18n("message.confirm"), () -> {
-            if (profile.getRepository().removeVersionFromDisk(version)) {
-                profile.getRepository().refreshVersionsAsync().start();
-                Controllers.navigate(null);
-            }
-        }, null);
-    }
-
-    public static void renameVersion(Profile profile, String version) {
-        Controllers.inputDialog(i18n("version.manage.rename.message"), (res, resolve, reject) -> {
-            if (profile.getRepository().renameVersion(version, res)) {
-                profile.getRepository().refreshVersionsAsync().start();
-                Controllers.navigate(null);
-                resolve.run();
-            } else {
-                reject.accept(i18n("version.manage.rename.fail"));
-            }
-        }).setInitialText(version);
-    }
-
-    public static void exportVersion(Profile profile, String version) {
-        Controllers.getDecorator().startWizard(new ExportWizardProvider(profile, version), i18n("modpack.wizard"));
-    }
-}

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

@@ -0,0 +1,58 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui;
+
+import javafx.beans.InvalidationListener;
+import javafx.beans.WeakInvalidationListener;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.WeakChangeListener;
+import javafx.collections.ListChangeListener;
+import javafx.collections.WeakListChangeListener;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class WeakListenerHolder {
+    private List<Object> refs = new LinkedList<>();
+
+    public WeakListenerHolder() {
+    }
+
+    public WeakInvalidationListener weak(InvalidationListener listener) {
+        refs.add(listener);
+        return new WeakInvalidationListener(listener);
+    }
+
+    public <T> WeakChangeListener<T> weak(ChangeListener<T> listener) {
+        refs.add(listener);
+        return new WeakChangeListener<>(listener);
+    }
+
+    public <T> WeakListChangeListener<T> weak(ListChangeListener<T> listener) {
+        refs.add(listener);
+        return new WeakListChangeListener<>(listener);
+    }
+
+    public void add(Object obj) {
+        refs.add(obj);
+    }
+
+    public boolean remove(Object obj) {
+        return refs.remove(obj);
+    }
+}

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui;
 
@@ -22,14 +22,14 @@ 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.setting.ConfigHolder.config;
 
 public class WebStage extends Stage {
     private final WebView webView = new WebView();
 
     public WebStage() {
         setScene(new Scene(webView, 800, 480));
-        getScene().getStylesheets().addAll(CONFIG.getTheme().getStylesheets());
+        getScene().getStylesheets().addAll(config().getTheme().getStylesheets());
         getIcons().add(new Image("/assets/img/icon.png"));
     }
 

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

@@ -0,0 +1,70 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.account;
+
+import javafx.beans.binding.Bindings;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.image.Image;
+import org.jackhuang.hmcl.auth.Account;
+import org.jackhuang.hmcl.auth.offline.OfflineAccount;
+import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
+import org.jackhuang.hmcl.game.TexturesLoader;
+import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.ui.SVG;
+import org.jackhuang.hmcl.ui.construct.AdvancedListItem;
+
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+public class AccountAdvancedListItem extends AdvancedListItem {
+    private ObjectProperty<Account> account = new SimpleObjectProperty<Account>() {
+
+        @Override
+        protected void invalidated() {
+            Account account = get();
+            if (account == null) {
+                titleProperty().unbind();
+                setTitle(i18n("account.missing"));
+                setSubtitle(i18n("account.missing.add"));
+                imageProperty().unbind();
+                setImage(new Image("/assets/img/craft_table.png"));
+            } else {
+                titleProperty().bind(Bindings.createStringBinding(account::getCharacter, account));
+                setSubtitle(accountSubtitle(account));
+                imageProperty().bind(TexturesLoader.fxAvatarBinding(account, 32));
+            }
+        }
+    };
+
+    public AccountAdvancedListItem() {
+        setRightGraphic(SVG.viewList(Theme.blackFillBinding(), -1, -1));
+    }
+
+    public ObjectProperty<Account> accountProperty() {
+        return account;
+    }
+
+    private static String accountSubtitle(Account account) {
+        if (account instanceof OfflineAccount)
+            return i18n("account.methods.offline");
+        else if (account instanceof YggdrasilAccount)
+            return account.getUsername();
+        else
+            return "";
+    }
+}

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

@@ -0,0 +1,57 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.account;
+
+import javafx.beans.property.*;
+import javafx.collections.FXCollections;
+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.javafx.MappedObservableList;
+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(this, "title", i18n("account.manage"));
+    private final ListProperty<Account> accounts = new SimpleListProperty<>(this, "accounts", FXCollections.observableArrayList());
+    private final ObjectProperty<Account> selectedAccount;
+
+    public AccountList() {
+        setItems(MappedObservableList.create(accounts, AccountListItem::new));
+        selectedAccount = createSelectedItemPropertyFor(getItems(), Account.class);
+    }
+
+    public ObjectProperty<Account> selectedAccountProperty() {
+        return selectedAccount;
+    }
+
+    public ListProperty<Account> accountsProperty() {
+        return accounts;
+    }
+
+    @Override
+    public void add() {
+        Controllers.dialog(new AddAccountPane());
+    }
+
+    @Override
+    public ReadOnlyStringProperty titleProperty() {
+        return title.getReadOnlyProperty();
+    }
+}

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

@@ -0,0 +1,142 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.account;
+
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.StringBinding;
+import javafx.beans.property.*;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.Skin;
+import javafx.scene.image.Image;
+import org.jackhuang.hmcl.auth.Account;
+import org.jackhuang.hmcl.auth.AuthenticationException;
+import org.jackhuang.hmcl.auth.CredentialExpiredException;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
+import org.jackhuang.hmcl.auth.offline.OfflineAccount;
+import org.jackhuang.hmcl.game.TexturesLoader;
+import org.jackhuang.hmcl.setting.Accounts;
+import org.jackhuang.hmcl.ui.DialogController;
+
+import static org.jackhuang.hmcl.util.Lang.thread;
+import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+import java.util.concurrent.CancellationException;
+import java.util.logging.Level;
+
+public class AccountListItem extends RadioButton {
+
+    private final Account account;
+    private final StringProperty title = new SimpleStringProperty();
+    private final StringProperty subtitle = new SimpleStringProperty();
+    private final ObjectProperty<Image> image = new SimpleObjectProperty<>();
+
+    public AccountListItem(Account account) {
+        this.account = account;
+        getStyleClass().clear();
+        setUserData(account);
+
+        String loginTypeName = Accounts.getLocalizedLoginTypeName(Accounts.getAccountFactory(account));
+        if (account instanceof AuthlibInjectorAccount) {
+            AuthlibInjectorServer server = ((AuthlibInjectorAccount) account).getServer();
+            subtitle.bind(Bindings.concat(
+                    loginTypeName, ", ", i18n("account.injector.server"), ": ",
+                    Bindings.createStringBinding(server::getName, server)));
+        } else {
+            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
+    protected Skin<?> createDefaultSkin() {
+        return new AccountListItemSkin(this);
+    }
+
+    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 Image getImage() {
+        return image.get();
+    }
+
+    public void setImage(Image image) {
+        this.image.set(image);
+    }
+
+    public ObjectProperty<Image> imageProperty() {
+        return image;
+    }
+}

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

@@ -0,0 +1,111 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.account;
+
+import com.jfoenix.utils.JFXUtilities;
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXRadioButton;
+import com.jfoenix.effects.JFXDepthManager;
+
+import javafx.geometry.Pos;
+import javafx.scene.control.Label;
+import javafx.scene.control.SkinBase;
+import javafx.scene.control.Tooltip;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.VBox;
+
+import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.SVG;
+import org.jackhuang.hmcl.util.javafx.BindingMapping;
+
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
+
+public class AccountListItemSkin extends SkinBase<AccountListItem> {
+
+    public AccountListItemSkin(AccountListItem skinnable) {
+        super(skinnable);
+
+        BorderPane root = new BorderPane();
+
+        JFXRadioButton chkSelected = new JFXRadioButton() {
+            @Override
+            public void fire() {
+                skinnable.fire();
+            }
+        };
+        BorderPane.setAlignment(chkSelected, Pos.CENTER);
+        chkSelected.selectedProperty().bind(skinnable.selectedProperty());
+        root.setLeft(chkSelected);
+
+        HBox center = new HBox();
+        center.setSpacing(8);
+        center.setAlignment(Pos.CENTER_LEFT);
+
+        ImageView imageView = new ImageView();
+        FXUtils.limitSize(imageView, 32, 32);
+        imageView.imageProperty().bind(skinnable.imageProperty());
+
+        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);
+
+        HBox right = new HBox();
+        right.setAlignment(Pos.CENTER_RIGHT);
+        JFXButton btnRefresh = new JFXButton();
+        btnRefresh.setOnMouseClicked(e -> skinnable.refresh());
+        btnRefresh.getStyleClass().add("toggle-icon4");
+        btnRefresh.setGraphic(SVG.refresh(Theme.blackFillBinding(), -1, -1));
+        JFXUtilities.runInFX(() -> FXUtils.installFastTooltip(btnRefresh, i18n("button.refresh")));
+        right.getChildren().add(btnRefresh);
+
+        JFXButton btnRemove = new JFXButton();
+        btnRemove.setOnMouseClicked(e -> skinnable.remove());
+        btnRemove.getStyleClass().add("toggle-icon4");
+        BorderPane.setAlignment(btnRemove, Pos.CENTER);
+        btnRemove.setGraphic(SVG.delete(Theme.blackFillBinding(), -1, -1));
+        JFXUtilities.runInFX(() -> FXUtils.installFastTooltip(btnRemove, i18n("button.delete")));
+        right.getChildren().add(btnRemove);
+        root.setRight(right);
+
+        root.setStyle("-fx-background-color: white; -fx-padding: 8 8 8 12;");
+        JFXDepthManager.setDepth(root, 1);
+
+        getChildren().setAll(root);
+    }
+}

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,9 +13,9 @@
  * 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;
+package org.jackhuang.hmcl.ui.account;
 
 import com.jfoenix.controls.JFXPasswordField;
 import com.jfoenix.controls.JFXProgressBar;
@@ -27,17 +27,20 @@ import org.jackhuang.hmcl.auth.AuthInfo;
 import org.jackhuang.hmcl.auth.NoSelectedCharacterException;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
+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;
@@ -58,25 +61,20 @@ public class AccountLoginPane extends StackPane {
         String password = txtPassword.getText();
         progressBar.setVisible(true);
         lblCreationWarning.setText("");
-        Task.ofResult("login", () -> {
-            try {
-                return oldAccount.logInWithPassword(password);
-            } catch (Exception e) {
-                return e;
-            }
-        }).subscribe(Schedulers.javafx(), variable -> {
-            Object account = variable.get("login");
-            if (account instanceof AuthInfo) {
-                success.accept(((AuthInfo) account));
-                fireEvent(new DialogCloseEvent());
-            } else if (account instanceof NoSelectedCharacterException) {
-                fireEvent(new DialogCloseEvent());
-            } else if (account instanceof Exception) {
-                lblCreationWarning.setText(AddAccountPane.accountException((Exception) account));
-            }
-
-            progressBar.setVisible(false);
-        });
+        Task.supplyAsync(() -> oldAccount.logInWithPassword(password))
+                .whenComplete(Schedulers.javafx(), authInfo -> {
+                    success.accept(authInfo);
+                    fireEvent(new DialogCloseEvent());
+                    progressBar.setVisible(false);
+                }, e -> {
+                    LOG.log(Level.INFO, "Failed to login with password: " + oldAccount, e);
+                    if (e instanceof NoSelectedCharacterException) {
+                        fireEvent(new DialogCloseEvent());
+                    } else {
+                        lblCreationWarning.setText(AddAccountPane.accountException(e));
+                    }
+                    progressBar.setVisible(false);
+                }).start();
     }
 
     @FXML

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,51 +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;
+package org.jackhuang.hmcl.ui.account;
 
-import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.utils.JFXUtilities;
 import com.jfoenix.controls.*;
 
+import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
+import javafx.beans.property.ListProperty;
 import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
 import javafx.geometry.Pos;
 import javafx.scene.control.Hyperlink;
 import javafx.scene.control.Label;
-import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 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.construct.AdvancedListBox;
-import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
-import org.jackhuang.hmcl.ui.construct.IconedItem;
-import org.jackhuang.hmcl.ui.construct.SpinnerPane;
-import org.jackhuang.hmcl.ui.construct.Validator;
-import org.jackhuang.hmcl.util.Constants;
-import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.construct.*;
+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.jfxListCellFactory;
-import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
-import static org.jackhuang.hmcl.ui.FXUtils.stringConverter;
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.ui.FXUtils.*;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public class AddAccountPane extends StackPane {
@@ -69,32 +69,48 @@ 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");
 
         cboServers.setCellFactory(jfxListCellFactory(server -> new TwoLineListItem(server.getName(), server.getUrl())));
         cboServers.setConverter(stringConverter(AuthlibInjectorServer::getName));
-        Bindings.bindContent(cboServers.getItems(), CONFIG.getAuthlibInjectorServers());
+        Bindings.bindContent(cboServers.getItems(), config().getAuthlibInjectorServers());
         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("@")));
 
@@ -108,6 +124,34 @@ public class AddAccountPane extends StackPane {
                 txtUsername.textProperty(),
                 txtPassword.textProperty(), txtPassword.visibleProperty(),
                 cboServers.getSelectionModel().selectedItemProperty(), cboServers.visibleProperty()));
+
+        // authlib-injector links
+        links.bind(BindingMapping.of(cboServers.getSelectionModel().selectedItemProperty())
+                .map(AddAccountPane::createHyperlinks)
+                .map(FXCollections::observableList));
+        Bindings.bindContent(linksContainer.getChildren(), links);
+        linksContainer.visibleProperty().bind(cboServers.visibleProperty());
+    }
+
+    private static final String[] ALLOWED_LINKS = { "register" };
+
+    public static List<Hyperlink> createHyperlinks(AuthlibInjectorServer server) {
+        if (server == null) {
+            return emptyList();
+        }
+
+        Map<String, String> links = server.getLinks();
+        List<Hyperlink> result = new ArrayList<>();
+        for (String key : ALLOWED_LINKS) {
+            String value = links.get(key);
+            if (value != null) {
+                Hyperlink link = new Hyperlink(i18n("account.injector.link." + key));
+                FXUtils.installSlowTooltip(link, value);
+                link.setOnAction(e -> FXUtils.openLink(value));
+                result.add(link);
+            }
+        }
+        return unmodifiableList(result);
     }
 
     /**
@@ -119,6 +163,13 @@ public class AddAccountPane extends StackPane {
         }
     }
 
+    private void checkIfNoServer() {
+        if (cboServers.getItems().isEmpty())
+            cboServers.getStyleClass().setAll("jfx-combo-box-warning");
+        else
+            cboServers.getStyleClass().setAll("jfx-combo-box");
+    }
+
     /**
      * Gets the additional data that needs to be passed into {@link AccountFactory#create(CharacterSelector, String, String, Object)}.
      */
@@ -144,10 +195,8 @@ public class AddAccountPane extends StackPane {
         AccountFactory<?> factory = cboType.getSelectionModel().getSelectedItem();
         Object additionalData = getAuthAdditionalData();
 
-        Task.ofResult("create_account", () -> factory.create(new Selector(), username, password, additionalData))
-                .finalized(Schedulers.javafx(), variables -> {
-
-                    Account account = variables.get("create_account");
+        Task.supplyAsync(() -> factory.create(new Selector(), username, password, additionalData))
+                .whenComplete(Schedulers.javafx(), account -> {
                     int oldIndex = Accounts.getAccounts().indexOf(account);
                     if (oldIndex == -1) {
                         Accounts.getAccounts().add(account);
@@ -185,14 +234,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"));
@@ -210,48 +265,33 @@ public class AddAccountPane extends StackPane {
         }
 
         @Override
-        public GameProfile select(Account account, List<GameProfile> names) throws NoSelectedCharacterException {
-            if (!(account instanceof YggdrasilAccount))
-                return CharacterSelector.DEFAULT.select(account, names);
-            YggdrasilAccount yggdrasilAccount = (YggdrasilAccount) account;
+        public GameProfile select(YggdrasilService service, List<GameProfile> profiles) throws NoSelectedCharacterException {
+            Platform.runLater(() -> {
+                for (GameProfile profile : profiles) {
+                    ImageView portraitView = new ImageView();
+                    portraitView.setSmooth(false);
+                    portraitView.imageProperty().bind(TexturesLoader.fxAvatarBinding(service, profile.getId(), 32));
+                    FXUtils.limitSize(portraitView, 32, 32);
 
-            for (GameProfile profile : names) {
-                Image image;
-                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()));
             }
@@ -277,6 +317,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) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,35 +13,36 @@
  * 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 static org.jackhuang.hmcl.ui.FXUtils.loadFXML;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
-import java.io.IOException;
-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.construct.DialogCloseEvent;
-import org.jackhuang.hmcl.ui.construct.SpinnerPane;
-import org.jackhuang.hmcl.util.NetworkUtils;
+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;
+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.construct.DialogAware;
+import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
+import org.jackhuang.hmcl.ui.construct.SpinnerPane;
+import org.jackhuang.hmcl.util.io.NetworkUtils;
 
-import static org.jackhuang.hmcl.setting.ConfigHolder.CONFIG;
+import java.io.IOException;
+import java.util.logging.Level;
 
-public class AddAuthlibInjectorServerPane extends StackPane {
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.ui.FXUtils.loadFXML;
+import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+public class AddAuthlibInjectorServerPane extends StackPane implements DialogAware {
 
     @FXML private StackPane addServerContainer;
     @FXML private Label lblServerUrl;
@@ -69,16 +70,13 @@ public class AddAuthlibInjectorServerPane extends StackPane {
         transitionHandler = new TransitionHandler(addServerContainer);
         transitionHandler.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) {
@@ -101,18 +99,18 @@ 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());
 
@@ -120,7 +118,8 @@ public class AddAuthlibInjectorServerPane extends StackPane {
 
                 transitionHandler.setContent(confirmServerPane, ContainerAnimations.SWIPE_LEFT.getAnimationProducer());
             } else {
-                lblCreationWarning.setText(resolveFetchExceptionMessage(variables.<Exception>get("lastException")));
+                LOG.log(Level.WARNING, "Failed to resolve auth server: " + url, exception);
+                lblCreationWarning.setText(resolveFetchExceptionMessage(exception));
             }
         }).start();
 
@@ -133,8 +132,8 @@ public class AddAuthlibInjectorServerPane extends StackPane {
 
     @FXML
     private void onAddFinish() {
-        if (!CONFIG.getAuthlibInjectorServers().contains(serverBeingAdded)) {
-            CONFIG.getAuthlibInjectorServers().add(serverBeingAdded);
+        if (!config().getAuthlibInjectorServers().contains(serverBeingAdded)) {
+            config().getAuthlibInjectorServers().add(serverBeingAdded);
         }
         fireEvent(new DialogCloseEvent());
     }

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,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.ui;
+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;
 import javafx.scene.layout.VBox;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.ui.SVG;
 
 import java.util.function.Consumer;
 
@@ -32,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();
@@ -54,8 +57,8 @@ public final class AuthlibInjectorServerItem extends BorderPane {
 
         setStyle("-fx-background-radius: 2; -fx-background-color: white; -fx-padding: 8;");
         JFXDepthManager.setDepth(this, 1);
-        lblServerName.setText(server.getName());
-        lblServerIp.setText(server.getUrl());
+        lblServerName.textProperty().bind(Bindings.createStringBinding(server::getName, server));
+        lblServerUrl.setText(server.getUrl());
     }
 
     public AuthlibInjectorServer getServer() {

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,31 +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 static org.jackhuang.hmcl.ui.FXUtils.loadFXML;
-import static org.jackhuang.hmcl.ui.FXUtils.smoothScrolling;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
-import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
-import org.jackhuang.hmcl.util.MappedObservableList;
+package org.jackhuang.hmcl.ui.account;
 
 import javafx.beans.binding.Bindings;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
+import javafx.beans.property.ReadOnlyStringProperty;
+import javafx.beans.property.ReadOnlyStringWrapper;
 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.decorator.DecoratorPage;
+import org.jackhuang.hmcl.util.javafx.MappedObservableList;
 
-import static org.jackhuang.hmcl.setting.ConfigHolder.CONFIG;
+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 StringProperty title = new SimpleStringProperty(this, "title", i18n("account.injector.manage.title"));
+    private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper(this, "title", i18n("account.injector.manage.title"));
 
     @FXML private ScrollPane scrollPane;
     @FXML private VBox listPane;
@@ -49,13 +48,13 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
         loadFXML(this, "/assets/fxml/authlib-injector-servers.fxml");
         smoothScrolling(scrollPane);
 
-        serverItems = MappedObservableList.create(CONFIG.getAuthlibInjectorServers(), this::createServerItem);
+        serverItems = MappedObservableList.create(config().getAuthlibInjectorServers(), this::createServerItem);
         Bindings.bindContent(listPane.getChildren(), serverItems);
     }
 
     private AuthlibInjectorServerItem createServerItem(AuthlibInjectorServer server) {
         return new AuthlibInjectorServerItem(server,
-                item -> CONFIG.getAuthlibInjectorServers().remove(item.getServer()));
+                item -> config().getAuthlibInjectorServers().remove(item.getServer()));
     }
 
     @FXML
@@ -68,8 +67,8 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
     }
 
     @Override
-    public StringProperty titleProperty() {
-        return title;
+    public ReadOnlyStringProperty titleProperty() {
+        return title.getReadOnlyProperty();
     }
 
     public void setTitle(String title) {

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.animation;
 

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,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.animation;
 
 import javafx.animation.KeyFrame;
-import javafx.util.Duration;
 
 import java.util.List;
 

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright c 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,21 +13,18 @@
  * 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.Interpolator;
 import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
-import javafx.scene.Node;
 import javafx.util.Duration;
-import org.jackhuang.hmcl.util.Lang;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
@@ -52,30 +49,35 @@ public enum ContainerAnimations {
         c.getPreviousNode().setTranslateY(0);
         c.getPreviousNode().setScaleX(1);
         c.getPreviousNode().setScaleY(1);
+        c.getPreviousNode().setOpacity(1);
         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.getPreviousNode().opacityProperty(), 1.0D, Interpolator.EASE_BOTH),
-                            new KeyValue(c.getCurrentNode().opacityProperty(), 0.0D, Interpolator.EASE_BOTH)),
+                            new KeyValue(c.getPreviousNode().opacityProperty(), 1, Interpolator.EASE_BOTH),
+                            new KeyValue(c.getCurrentNode().opacityProperty(), 0, Interpolator.EASE_BOTH)),
                     new KeyFrame(c.getDuration(),
-                            new KeyValue(c.getPreviousNode().opacityProperty(), 0.0D, Interpolator.EASE_BOTH),
-                            new KeyValue(c.getCurrentNode().opacityProperty(), 1.0D, Interpolator.EASE_BOTH)))),
+                            new KeyValue(c.getPreviousNode().opacityProperty(), 0, Interpolator.EASE_BOTH),
+                            new KeyValue(c.getCurrentNode().opacityProperty(), 1, Interpolator.EASE_BOTH)))),
     /**
      * A zoom effect
      */
     ZOOM_IN(c -> {
         c.getPreviousNode().setTranslateX(0);
         c.getPreviousNode().setTranslateY(0);
+        c.getPreviousNode().setScaleX(1);
+        c.getPreviousNode().setScaleY(1);
+        c.getPreviousNode().setOpacity(1);
         c.getCurrentNode().setTranslateX(0);
         c.getCurrentNode().setTranslateY(0);
     }, c ->
             Arrays.asList(new KeyFrame(Duration.ZERO,
                             new KeyValue(c.getPreviousNode().scaleXProperty(), 1, Interpolator.EASE_BOTH),
                             new KeyValue(c.getPreviousNode().scaleYProperty(), 1, Interpolator.EASE_BOTH),
-                            new KeyValue(c.getPreviousNode().opacityProperty(), 1.0D, Interpolator.EASE_BOTH)),
+                            new KeyValue(c.getPreviousNode().opacityProperty(), 1, Interpolator.EASE_BOTH)),
                     new KeyFrame(c.getDuration(),
                             new KeyValue(c.getPreviousNode().scaleXProperty(), 4, Interpolator.EASE_BOTH),
                             new KeyValue(c.getPreviousNode().scaleYProperty(), 4, Interpolator.EASE_BOTH),
@@ -86,13 +88,16 @@ public enum ContainerAnimations {
     ZOOM_OUT(c -> {
         c.getPreviousNode().setTranslateX(0);
         c.getPreviousNode().setTranslateY(0);
+        c.getPreviousNode().setScaleX(1);
+        c.getPreviousNode().setScaleY(1);
+        c.getPreviousNode().setOpacity(1);
         c.getCurrentNode().setTranslateX(0);
         c.getCurrentNode().setTranslateY(0);
     }, c ->
             (Arrays.asList(new KeyFrame(Duration.ZERO,
                             new KeyValue(c.getPreviousNode().scaleXProperty(), 1, Interpolator.EASE_BOTH),
                             new KeyValue(c.getPreviousNode().scaleYProperty(), 1, Interpolator.EASE_BOTH),
-                            new KeyValue(c.getPreviousNode().opacityProperty(), 1.0D, Interpolator.EASE_BOTH)),
+                            new KeyValue(c.getPreviousNode().opacityProperty(), 1, Interpolator.EASE_BOTH)),
                     new KeyFrame(c.getDuration(),
                             new KeyValue(c.getPreviousNode().scaleXProperty(), 0, Interpolator.EASE_BOTH),
                             new KeyValue(c.getPreviousNode().scaleYProperty(), 0, Interpolator.EASE_BOTH),
@@ -104,9 +109,11 @@ public enum ContainerAnimations {
         c.getPreviousNode().setScaleX(1);
         c.getPreviousNode().setScaleY(1);
         c.getPreviousNode().setOpacity(0);
+        c.getPreviousNode().setTranslateX(0);
         c.getCurrentNode().setScaleX(1);
         c.getCurrentNode().setScaleY(1);
         c.getCurrentNode().setOpacity(1);
+        c.getCurrentNode().setTranslateX(c.getCurrentRoot().getWidth());
     }, c ->
             Arrays.asList(new KeyFrame(Duration.ZERO,
                             new KeyValue(c.getCurrentNode().translateXProperty(), c.getCurrentRoot().getWidth(), Interpolator.EASE_BOTH),
@@ -122,9 +129,11 @@ public enum ContainerAnimations {
         c.getPreviousNode().setScaleX(1);
         c.getPreviousNode().setScaleY(1);
         c.getPreviousNode().setOpacity(0);
+        c.getPreviousNode().setTranslateX(0);
         c.getCurrentNode().setScaleX(1);
         c.getCurrentNode().setScaleY(1);
         c.getCurrentNode().setOpacity(1);
+        c.getCurrentNode().setTranslateX(-c.getCurrentRoot().getWidth());
     }, c ->
             Arrays.asList(new KeyFrame(Duration.ZERO,
                             new KeyValue(c.getCurrentNode().translateXProperty(), -c.getCurrentRoot().getWidth(), Interpolator.EASE_BOTH),

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.animation;
 

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 
@@ -42,7 +42,7 @@ public class AdvancedListBox extends ScrollPane {
     }
 
     public AdvancedListBox add(Node child) {
-        if (child instanceof Pane)
+        if (child instanceof Pane || child instanceof AdvancedListItem)
             container.getChildren().add(child);
         else {
             StackPane pane = new StackPane();

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

@@ -0,0 +1,123 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.construct;
+
+import javafx.beans.property.*;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+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<>(this, "image");
+    private final ObjectProperty<Node> rightGraphic = new SimpleObjectProperty<>(this, "rightGraphic");
+    private final StringProperty title = new SimpleStringProperty(this, "title");
+    private final StringProperty subtitle = new SimpleStringProperty(this, "subtitle");
+    private final BooleanProperty actionButtonVisible = new SimpleBooleanProperty(this, "actionButtonVisible", true);
+
+    public AdvancedListItem() {
+        addEventHandler(MouseEvent.MOUSE_CLICKED, e -> fireEvent(new ActionEvent()));
+    }
+
+    public Image getImage() {
+        return image.get();
+    }
+
+    public ObjectProperty<Image> imageProperty() {
+        return image;
+    }
+
+    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 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;
+    }
+
+    public final void setOnAction(EventHandler<ActionEvent> value) {
+        onActionProperty().set(value);
+    }
+
+    public final EventHandler<ActionEvent> getOnAction() {
+        return onActionProperty().get();
+    }
+
+    private ObjectProperty<EventHandler<ActionEvent>> onAction = new SimpleObjectProperty<EventHandler<ActionEvent>>(this, "onAction") {
+        @Override
+        protected void invalidated() {
+            setEventHandler(ActionEvent.ACTION, get());
+        }
+    };
+
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new AdvancedListItemSkin(this);
+    }
+}

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

@@ -0,0 +1,108 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.construct;
+
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.control.Label;
+import javafx.scene.control.SkinBase;
+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 javafx.scene.text.TextAlignment;
+import org.jackhuang.hmcl.ui.FXUtils;
+
+public class AdvancedListItemSkin extends SkinBase<AdvancedListItem> {
+
+    public AdvancedListItemSkin(AdvancedListItem skinnable) {
+        super(skinnable);
+
+        StackPane stackPane = new StackPane();
+        RipplerContainer container = new RipplerContainer(stackPane);
+
+        BorderPane root = new BorderPane();
+        root.setPickOnBounds(false);
+
+        HBox left = new HBox();
+        left.setAlignment(Pos.CENTER);
+        left.setMouseTransparent(true);
+
+        StackPane imageViewContainer = new StackPane();
+        FXUtils.setLimitWidth(imageViewContainer, 32);
+        FXUtils.setLimitHeight(imageViewContainer, 32);
+
+        ImageView imageView = new ImageView();
+        FXUtils.limitSize(imageView, 32, 32);
+        imageView.setPreserveRatio(true);
+        imageView.imageProperty().bind(skinnable.imageProperty());
+        imageViewContainer.getChildren().setAll(imageView);
+
+        VBox vbox = new VBox();
+        vbox.setAlignment(Pos.CENTER_LEFT);
+        vbox.setPadding(new Insets(0, 0, 0, 10));
+
+        Label title = new Label();
+        title.textProperty().bind(skinnable.titleProperty());
+        title.setMaxWidth(90);
+        title.setStyle("-fx-font-size: 15;");
+        title.setTextAlignment(TextAlignment.JUSTIFY);
+        vbox.getChildren().add(title);
+
+        Label subtitle = new Label();
+        subtitle.textProperty().bind(skinnable.subtitleProperty());
+        subtitle.setMaxWidth(90);
+        subtitle.setStyle("-fx-font-size: 10;");
+        subtitle.setTextAlignment(TextAlignment.JUSTIFY);
+        vbox.getChildren().add(subtitle);
+
+        FXUtils.onChangeAndOperate(skinnable.subtitleProperty(), subtitleString -> {
+            if (subtitleString == null) vbox.getChildren().setAll(title);
+            else vbox.getChildren().setAll(title, subtitle);
+        });
+
+        left.getChildren().setAll(imageViewContainer, vbox);
+        root.setLeft(left);
+
+        HBox right = new HBox();
+        right.setAlignment(Pos.CENTER);
+        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().add("transparent");
+        stackPane.setPickOnBounds(false);
+        stackPane.getChildren().setAll(root);
+
+        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) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,25 +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.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.layout.StackPane;
+import javafx.scene.control.Control;
+import javafx.scene.control.SkinBase;
 import javafx.scene.layout.VBox;
 
 @DefaultProperty("content")
-public class ComponentList extends StackPane {
-    private final VBox vbox = new VBox();
+public class ComponentList extends Control {
     private final StringProperty title = new SimpleStringProperty(this, "title", "Group");
     private final StringProperty subtitle = new SimpleStringProperty(this, "subtitle", "");
     private final IntegerProperty depth = new SimpleIntegerProperty(this, "depth", 0);
@@ -39,35 +43,9 @@ public class ComponentList extends StackPane {
     public final ObservableList<Node> content = FXCollections.observableArrayList();
 
     public ComponentList() {
-        getChildren().setAll(vbox);
-        content.addListener((ListChangeListener<? super Node>) change -> {
-            while (change.next()) {
-                for (int i = change.getFrom(); i < change.getTo(); ++i)
-                    addChildren(change.getList().get(i));
-            }
-        });
         getStyleClass().add("options-list");
     }
 
-    public void addChildren(Node node) {
-        if (node instanceof ComponentList) {
-            node.getProperties().put("title", ((ComponentList) node).getTitle());
-            node.getProperties().put("subtitle", ((ComponentList) node).getSubtitle());
-        }
-        StackPane child = new StackPane();
-        child.getChildren().add(new ComponentListCell(node));
-        if (vbox.getChildren().isEmpty())
-            child.getStyleClass().add("options-list-item-ahead");
-        else
-            child.getStyleClass().add("options-list-item");
-        child.getProperties().put("node", node);
-        vbox.getChildren().add(child);
-    }
-
-    public void removeChildren(Node node) {
-        vbox.getChildren().removeIf(node1 -> node1.getProperties().get("node") == node);
-    }
-
     public String getTitle() {
         return title.get();
     }
@@ -115,4 +93,40 @@ public class ComponentList extends StackPane {
     public ObservableList<Node> getContent() {
         return content;
     }
+
+    @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 final ObservableList<Node> list;
+        private final ObjectBinding<Node> firstItem;
+
+        protected Skin(ComponentList control) {
+            super(control);
+
+            list = MappedObservableList.create(control.getContent(), node -> {
+                ComponentListCell cell = new ComponentListCell(node);
+                cell.getStyleClass().add("options-list-item");
+                return cell;
+            });
+
+            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);
+
+            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) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 
@@ -24,9 +24,12 @@ 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;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.shape.Rectangle;
@@ -38,13 +41,13 @@ import org.jackhuang.hmcl.ui.SVG;
 /**
  * @author huangyuhui
  */
-public class ComponentListCell extends StackPane {
+class ComponentListCell extends StackPane {
     private final Node content;
     private Animation expandAnimation;
     private Rectangle clipRect;
     private final BooleanProperty expanded = new SimpleBooleanProperty(this, "expanded", false);
 
-    public ComponentListCell(Node content) {
+    ComponentListCell(Node content) {
         this.content = content;
 
         updateLayout();
@@ -75,44 +78,57 @@ public class ComponentListCell extends StackPane {
             content.getStyleClass().remove("options-list");
             content.getStyleClass().add("options-sublist");
 
-            StackPane groupNode = new StackPane();
-            groupNode.getStyleClass().add("options-list-item-header");
+            BorderPane groupNode = new BorderPane();
 
             Node expandIcon = SVG.expand(Theme.blackFillBinding(), 10, 10);
             JFXButton expandButton = new JFXButton();
             expandButton.setGraphic(expandIcon);
             expandButton.getStyleClass().add("options-list-item-expand-button");
-            StackPane.setAlignment(expandButton, Pos.CENTER_RIGHT);
 
             VBox labelVBox = new VBox();
-            Label label = new Label();
-            label.textProperty().bind(list.titleProperty());
-            label.setMouseTransparent(true);
-            labelVBox.getChildren().add(label);
+            labelVBox.setAlignment(Pos.CENTER_LEFT);
 
-            if (list.isHasSubtitle()) {
-                Label subtitleLabel = new Label();
-                subtitleLabel.textProperty().bind(list.subtitleProperty());
-                subtitleLabel.setMouseTransparent(true);
-                subtitleLabel.getStyleClass().add("subtitle-label");
-                labelVBox.getChildren().add(subtitleLabel);
+            boolean overrideHeaderLeft = false;
+            if (list instanceof ComponentSublist) {
+                Node leftNode = ((ComponentSublist) list).getHeaderLeft();
+                if (leftNode != null) {
+                    labelVBox.getChildren().setAll(leftNode);
+                    overrideHeaderLeft = true;
+                }
             }
 
-            StackPane.setAlignment(labelVBox, Pos.CENTER_LEFT);
-            groupNode.getChildren().setAll(labelVBox, expandButton);
+            if (!overrideHeaderLeft) {
+                Label label = new Label();
+                label.textProperty().bind(list.titleProperty());
+                labelVBox.getChildren().add(label);
+
+                if (list.isHasSubtitle()) {
+                    Label subtitleLabel = new Label();
+                    subtitleLabel.textProperty().bind(list.subtitleProperty());
+                    subtitleLabel.getStyleClass().add("subtitle-label");
+                    labelVBox.getChildren().add(subtitleLabel);
+                }
+            }
+
+            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)
+                    right.getChildren().add(rightNode);
+            }
+            right.getChildren().add(expandButton);
+            groupNode.setRight(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, true);
             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) {
@@ -144,7 +160,7 @@ public class ComponentListCell extends StackPane {
             expandedProperty().addListener((a, b, newValue) ->
                     expandIcon.setRotate(newValue ? 180 : 0));
 
-            getChildren().setAll(holder);
+            getChildren().setAll(groupNode);
         } else
             getChildren().setAll(content);
     }

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

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

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,12 +13,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.util.AutoTypingMap;
+import org.jackhuang.hmcl.ui.Controllers;
+
+/**
+ * @author yushijinhun
+ * @see Controllers#dialog(javafx.scene.layout.Region)
+ */
+public interface DialogAware {
+
+    default void onDialogShown() {
+    }
 
-public interface FinalizedCallback {
-    void execute(AutoTypingMap<String> variables, boolean isDependentsSucceeded) throws Exception;
 }

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,16 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 
-import org.jackhuang.hmcl.ui.Controllers;
-
 import javafx.event.Event;
 import javafx.event.EventTarget;
 import javafx.event.EventType;
 import javafx.scene.layout.Region;
+import org.jackhuang.hmcl.ui.Controllers;
 
 /**
  * Indicates a close operation on the dialog.
@@ -32,7 +31,7 @@ import javafx.scene.layout.Region;
  */
 public class DialogCloseEvent extends Event {
 
-    public static final EventType<DialogCloseEvent> CLOSE = new EventType<>("CLOSE");
+    public static final EventType<DialogCloseEvent> CLOSE = new EventType<>("DIALOG_CLOSE");
 
     public DialogCloseEvent() {
         super(CLOSE);

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,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.JFXButton;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -28,19 +27,18 @@ import javafx.scene.control.Tooltip;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.VBox;
 import javafx.stage.DirectoryChooser;
-
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
 
-import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
 import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
+import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
 public class FileItem extends BorderPane {
     private final Label lblPath = new Label();
 
@@ -63,7 +61,7 @@ public class FileItem extends BorderPane {
         right.setGraphic(SVG.pencil(Theme.blackFillBinding(), 15, 15));
         right.getStyleClass().add("toggle-icon4");
         right.setOnMouseClicked(e -> onExplore());
-        FXUtils.installTooltip(right, i18n("button.edit"));
+        FXUtils.installFastTooltip(right, i18n("button.edit"));
         setRight(right);
 
         Tooltip tip = new Tooltip();

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,36 +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.collections.FXCollections;
-import javafx.scene.control.ListCell;
+import javafx.beans.binding.Bindings;
 import javafx.scene.text.Font;
 
 public class FontComboBox extends JFXComboBox<String> {
 
-    public FontComboBox(@NamedArg(value = "fontSize", defaultValue = "12.0") double fontSize,
-                        @NamedArg(value = "enableStyle", defaultValue = "false") boolean enableStyle) {
-        super(FXCollections.observableArrayList(Font.getFamilies()));
+    private boolean loaded = false;
 
-        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;
+            itemsProperty().unbind();
+            setItems(observableList(Font.getFamilies()));
+            loaded = true;
+        });
     }
 }

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,40 +13,46 @@
  * 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;
-import javafx.scene.paint.Paint;
 
 public class IconedItem extends RipplerContainer {
 
+    private Label label;
+
     public IconedItem(Node icon, String text) {
-        super(createHBox(icon, text));
+        this(icon);
+        label.setText(text);
     }
 
-    private static HBox createHBox(Node icon, String text) {
+    public IconedItem(Node icon) {
+        super(createHBox(icon));
+        label = ((Label) lookup("#label"));
+        getStyleClass().setAll("iconed-item");
+    }
+
+    private static HBox createHBox(Node icon) {
         HBox hBox = new HBox();
-        icon.setMouseTransparent(true);
-        Label textLabel = new Label(text);
+
+        if (icon != null) {
+            icon.setMouseTransparent(true);
+            hBox.getChildren().add(icon);
+        }
+
+        hBox.getStyleClass().add("iconed-item-container");
+        Label textLabel = new Label();
         textLabel.setId("label");
-        textLabel.setAlignment(Pos.CENTER);
         textLabel.setMouseTransparent(true);
-        hBox.getChildren().addAll(icon, textLabel);
-        hBox.setStyle("-fx-padding: 10 16 10 16; -fx-spacing: 10; -fx-font-size: 14;");
-        hBox.setAlignment(Pos.CENTER_LEFT);
+        hBox.getChildren().addAll(textLabel);
         return hBox;
     }
 
-    public void setText(String text) {
-        ((Label) lookup("#label")).setText(text);
-    }
-
-    public void setTextFill(Paint paint) {
-        ((Label) lookup("#label")).setTextFill(paint);
+    public Label getLabel() {
+        return label;
     }
 }

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

@@ -0,0 +1,36 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.construct;
+
+import javafx.scene.Node;
+import org.jackhuang.hmcl.ui.FXUtils;
+
+public class IconedMenuItem extends IconedItem {
+
+    public IconedMenuItem(Node node, String text, Runnable action) {
+        super(node, text);
+
+        getStyleClass().setAll("iconed-menu-item");
+        setOnMouseClicked(e -> action.run());
+    }
+
+    public IconedMenuItem addTooltip(String tooltip) {
+        FXUtils.installFastTooltip(this, tooltip);
+        return this;
+    }
+}

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

@@ -1,3 +1,20 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package org.jackhuang.hmcl.ui.construct;
 
 import com.jfoenix.controls.JFXButton;
@@ -15,22 +32,20 @@ import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
-
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
 
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
 @DefaultProperty("image")
 public final class ImagePickerItem extends BorderPane {
 
     private final ImageView imageView;
-    private final JFXButton selectButton;
-    private final Label label;
 
     private final StringProperty title = new SimpleStringProperty(this, "title");
     private final ObjectProperty<EventHandler<? super MouseEvent>> onSelectButtonClicked = new SimpleObjectProperty<>(this, "onSelectButtonClicked");
+    private final ObjectProperty<EventHandler<? super MouseEvent>> onDeleteButtonClicked = new SimpleObjectProperty<>(this, "onDeleteButtonClicked");
     private final ObjectProperty<Image> image = new SimpleObjectProperty<>(this, "image");
 
     public ImagePickerItem() {
@@ -38,21 +53,26 @@ public final class ImagePickerItem extends BorderPane {
         imageView.setSmooth(false);
         imageView.setPreserveRatio(true);
 
-        selectButton = new JFXButton();
+        JFXButton selectButton = new JFXButton();
         selectButton.setGraphic(SVG.pencil(Theme.blackFillBinding(), 15, 15));
         selectButton.onMouseClickedProperty().bind(onSelectButtonClicked);
         selectButton.getStyleClass().add("toggle-icon4");
 
-        FXUtils.installTooltip(selectButton, i18n("button.edit"));
+        JFXButton deleteButton = new JFXButton();
+        deleteButton.setGraphic(SVG.close(Theme.blackFillBinding(), 15, 15));
+        deleteButton.onMouseClickedProperty().bind(onDeleteButtonClicked);
+        deleteButton.getStyleClass().add("toggle-icon4");
+
+        FXUtils.installFastTooltip(selectButton, i18n("button.edit"));
 
         HBox hBox = new HBox();
-        hBox.getChildren().setAll(imageView, selectButton);
+        hBox.getChildren().setAll(imageView, selectButton, deleteButton);
         hBox.setAlignment(Pos.CENTER_RIGHT);
         hBox.setSpacing(8);
         setRight(hBox);
 
         VBox vBox = new VBox();
-        label = new Label();
+        Label label = new Label();
         label.textProperty().bind(title);
         vBox.getChildren().setAll(label);
         vBox.setAlignment(Pos.CENTER_LEFT);
@@ -85,6 +105,18 @@ public final class ImagePickerItem extends BorderPane {
         this.onSelectButtonClicked.set(onSelectButtonClicked);
     }
 
+    public EventHandler<? super MouseEvent> getOnDeleteButtonClicked() {
+        return onDeleteButtonClicked.get();
+    }
+
+    public ObjectProperty<EventHandler<? super MouseEvent>> onDeleteButtonClickedProperty() {
+        return onDeleteButtonClicked;
+    }
+
+    public void setOnDeleteButtonClicked(EventHandler<? super MouseEvent> onDeleteButtonClicked) {
+        this.onDeleteButtonClicked.set(onDeleteButtonClicked);
+    }
+
     public Image getImage() {
         return image.get();
     }

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package org.jackhuang.hmcl.ui.construct;
 
@@ -38,15 +38,20 @@ public class InputDialogPane extends StackPane {
     private Label content;
     @FXML
     private Label lblCreationWarning;
+    @FXML
+    private SpinnerPane acceptPane;
 
     public InputDialogPane(String text, FutureCallback<String> onResult) {
         FXUtils.loadFXML(this, "/assets/fxml/input-dialog.fxml");
         content.setText(text);
         cancelButton.setOnMouseClicked(e -> fireEvent(new DialogCloseEvent()));
         acceptButton.setOnMouseClicked(e -> {
+            acceptPane.showSpinner();
             onResult.call(textField.getText(), () -> {
+                acceptPane.hideSpinner();
                 fireEvent(new DialogCloseEvent());
             }, msg -> {
+                acceptPane.hideSpinner();
                 lblCreationWarning.setText(msg);
             });
         });

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

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

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

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