Fixed #296

.github/ISSUE_TEMPLATE.md

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

.gitignore

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

HMCL/build.gradle

@@ -1,160 +1,163 @@
-plugins {
-    id 'com.github.johnrengelman.shadow' version '4.0.0'
-    id 'application'
-}
+import org.apache.tools.ant.filters.ReplaceTokens
+import proguard.gradle.ProGuardTask
 
-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
 
-import org.tukaani.xz.LZMA2Options
-import org.tukaani.xz.XZOutputStream
+if (!hasProperty('mainClass')) {
+    ext.mainClass = 'org.jackhuang.hmcl.Main'
+}
 
-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
+def buildnumber = System.getenv("TRAVIS_BUILD_NUMBER")
+if (buildnumber == null)
+    buildnumber = System.getenv("BUILD_NUMBER")
+if (buildnumber == null)
+    buildnumber = "SNAPSHOT"
 
-mainClassName = 'org.jackhuang.hmcl.Main'
+def versionroot = System.getenv("VERSION_ROOT")
+if (versionroot == null)
+    versionroot = "3.1"
+
+String mavenVersion = versionroot + '.' + buildnumber
+version = mavenVersion
 
 dependencies {
     compile project(":HMCLCore")
     compile rootProject.files("lib/JFoenix.jar")
 }
 
-def digest(String algorithm, byte[] bytes) {
-    return MessageDigest.getInstance(algorithm).digest(bytes)
+task generateSources(type: Sync) {
+    from 'src/main/java'
+    into "$buildDir/generated-src"
+    filter(ReplaceTokens, tokens: [
+            'HELLO_MINECRAFT_LAUNCHER_VERSION_FOR_GRADLE_REPLACING': mavenVersion
+    ])
 }
 
-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"
-}
+compileJava.setSource "$buildDir/generated-src"
+compileJava.dependsOn generateSources
 
-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) }
+configurations {
+    coreCompile.extendsFrom compile
+    coreRuntime.extendsFrom runtime
 }
 
 jar {
+    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
+
     manifest {
-        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'))
+        attributes 'Created-By'        : 'Copyright(c) 2013-2017 huangyuhui.',
+                'Main-Class'        : mainClass,
+                'Multi-Release': "true"
     }
 
     doLast {
-        repack(jar.archivePath)
-        attachSignature(jar.archivePath)
-        createChecksum(jar.archivePath)
-    }
-}
+        new File("build/signed").mkdirs()
+        ant.signjar(signedjar: archivePath, jar: archivePath,
+                keystore: "HMCL.keystore", storepass: "123456",
+                alias: "HMCL")
 
-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)
+        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
+    }
 }
 
 processResources {
-    ext.convertToBSS = { String resource ->
-        // exclude resource
-        doFirst {
-            def cssFile = new File(this.projectDir, "src/main/resources/" + resource)
-            def bssFile = new File(this.projectDir, "build/compiled-resources/" + resource[0..-4] + "bss")
-            bssFile.parentFile.mkdirs()
-            exec {
-                commandLine 'javapackager', '-createbss', '-outdir', bssFile.parent, '-srcfiles', cssFile.path
-            }
-        }
-    }
-    from "build/compiled-resources"
-
-    convertToBSS "assets/css/root.css"
-    convertToBSS "assets/css/blue.css"
-}
-
-task makePack(dependsOn: jar) {
-    ext.outputPath = new File(jar.archivePath.parentFile, jar.archivePath.name[0..-4] + "pack")
-    doLast {
-        outputPath.newOutputStream().withCloseable { out ->
-            new JarFile(jar.archivePath).withCloseable { jarFile -> packer.pack(jarFile, out) }
-        }
-        createChecksum(outputPath)
+    from(sourceSets.main.resources.srcDirs) {
+        exclude 'icon.icns'
     }
 }
 
-task makePackXz(dependsOn: makePack) doLast {
-    def packXz = new File(makePack.outputPath.parentFile, makePack.outputPath.name + ".xz")
-    new XZOutputStream(packXz.newOutputStream(), new LZMA2Options(5)).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)
+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 proguard(type: ProGuardTask, dependsOn: jar) {
+    ext {
+        def re = jar.classifier
+        injar = jar.archivePath
+        jar.classifier = 'optimized'
+        outjar = jar.archivePath
+        jar.classifier = re
+    }
 
-task makeExecutables(dependsOn: jar) doLast {
-    createExecutable("exe", "src/main/resources/assets/HMCLauncher.exe")
+    injars(/*["filter": "!META-INF/**,**"], */injar)
+    String javaHome = System.getProperty("java.home")
+    if (!javaHome.endsWith("jre"))
+        javaHome += File.separator + "jre"
+    libraryjars javaHome + "/lib/rt.jar"
+    libraryjars javaHome + "/lib/jce.jar"
+    libraryjars javaHome + "/lib/jsse.jar"
+    libraryjars javaHome + "/lib/ext/jfxrt.jar"
+    outjars outjar
+
+    configuration 'proguard.pro'
 }
 
-build.dependsOn makePackXz
-build.dependsOn makePackGz
-build.dependsOn makeExecutables
+task combineMETA_INF(type: Jar) {
+    ext {
+        def re = jar.classifier
+        injar = jar.archivePath
+        jar.classifier = 'optimized'
+        outjar = jar.archivePath
+        jar.classifier = re
+    }
+    from zipTree(outjar)
+    from zipTree(injar).matching {
+        include "META-INF/"
+    }
+}
+
+build.dependsOn makeExecutable
+build.dependsOn makePackGZ

HMCL/proguard.pro

@@ -0,0 +1,15 @@
+-target 1.8
+-dontoptimize
+-dontobfuscate
+
+# JFoenix
+-keep class com.jfoenix.** {
+    <fields>;
+    <methods>;
+}
+
+# HMCL
+-keep class org.jackhuang.** {
+    <fields>;
+    <methods>;
+}

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2017  huangyuhui <[email protected]>
  *
  * This 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,36 +13,34 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl;
 
+import com.jfoenix.concurrency.JFXUtilities;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.stage.Stage;
-import org.jackhuang.hmcl.setting.ConfigHolder;
+import org.jackhuang.hmcl.setting.Settings;
 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.CrashReporter;
-import org.jackhuang.hmcl.util.Lang;
-import org.jackhuang.hmcl.util.StringUtils;
-import org.jackhuang.hmcl.util.platform.OperatingSystem;
+import org.jackhuang.hmcl.util.*;
 
 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.nio.file.Paths;
+import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.ResourceBundle;
 import java.util.concurrent.TimeUnit;
-
-import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
-import static org.jackhuang.hmcl.util.Logging.LOG;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import java.util.logging.Level;
 
 public final class Launcher extends Application {
 
@@ -51,25 +49,21 @@ public final class Launcher extends Application {
         Thread.currentThread().setUncaughtExceptionHandler(CRASH_REPORTER);
 
         try {
-            try {
-                ConfigHolder.init();
-            } catch (IOException e) {
-                Main.showErrorAndExit(i18n("fatal.config_loading_failure", Paths.get("").toAbsolutePath().normalize()));
-            }
+            // 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());
 
-            // 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());
+            UPDATE_CHECKER.process(false)
+                    .then(Task.of(Schedulers.javafx(), () -> {
+                        if (UPDATE_CHECKER.isOutOfDate())
+                            Controllers.showUpdate();
+                    }))
+                    .start();
 
-                UpdateChecker.init();
-
-                primaryStage.show();
-            });
+            primaryStage.show();
         } catch (Throwable e) {
             CRASH_REPORTER.uncaughtException(Thread.currentThread(), e);
         }
@@ -79,16 +73,13 @@ public final class Launcher extends Application {
         Thread.setDefaultUncaughtExceptionHandler(CRASH_REPORTER);
 
         try {
-            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"));
+            Logging.start();
+
+            // 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 + " ***");
 
             launch(args);
         } catch (Throwable e) { // Fucking JavaFX will suppress the exception and will break our crash reporter.
@@ -97,9 +88,9 @@ public final class Launcher extends Application {
     }
 
     public static void stopApplication() {
-        LOG.info("Stopping application.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
+        Logging.LOG.info("Stopping application.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
 
-        runInFX(() -> {
+        JFXUtilities.runInFX(() -> {
             if (Controllers.getStage() == null)
                 return;
             Controllers.getStage().close();
@@ -111,9 +102,9 @@ public final class Launcher extends Application {
     }
 
     public static void stopWithoutPlatform() {
-        LOG.info("Stopping application without JavaFX Toolkit.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
+        Logging.LOG.info("Stopping application without JavaFX Toolkit.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
 
-        runInFX(() -> {
+        JFXUtilities.runInFX(() -> {
             if (Controllers.getStage() == null)
                 return;
             Controllers.getStage().close();
@@ -123,6 +114,21 @@ public final class Launcher extends Application {
         });
     }
 
+    public static File getWorkingDirectory(String folder) {
+        String home = System.getProperty("user.home", ".");
+        switch (OperatingSystem.CURRENT_OS) {
+            case LINUX:
+                return new File(home, "." + folder + "/");
+            case WINDOWS:
+                String appdata = System.getenv("APPDATA");
+                return new File(Lang.nonNull(appdata, home), "." + folder + "/");
+            case OSX:
+                return new File(home, "Library/Application Support/" + folder);
+            default:
+                return new File(home, folder + "/");
+        }
+    }
+
     public static List<File> getCurrentJarFiles() {
         List<File> result = new LinkedList<>();
         if (Launcher.class.getClassLoader() instanceof URLClassLoader) {
@@ -142,5 +148,30 @@ public final class Launcher extends Application {
             return result;
     }
 
+    public static String i18n(String key) {
+        try {
+            return RESOURCE_BUNDLE.getString(key);
+        } catch (Exception e) {
+            Logging.LOG.log(Level.SEVERE, "Cannot find key " + key + " in resource bundle", e);
+            return key;
+        }
+    }
+
+    public static String i18n(String key, Object... formatArgs) {
+        return String.format(i18n(key), formatArgs);
+    }
+
+    public static final File MINECRAFT_DIRECTORY = getWorkingDirectory("minecraft");
+    public static final File HMCL_DIRECTORY = getWorkingDirectory("hmcl");
+
+    public static final String VERSION = "@HELLO_MINECRAFT_LAUNCHER_VERSION_FOR_GRADLE_REPLACING@";
+    public static final String NAME = "HMCL";
+    public static final String TITLE = NAME + " " + VERSION;
+    public static final ResourceBundle RESOURCE_BUNDLE = Settings.INSTANCE.getLocale().getResourceBundle();
+    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 CONTACT = "http://huangyuhui.duapp.com/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) 2019  huangyuhui <[email protected]> and contributors
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
  *
  * This 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,106 +13,28 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl;
 
-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;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.X509Certificate;
-import java.util.logging.Level;
-
-import static org.jackhuang.hmcl.util.Lang.thread;
-import static org.jackhuang.hmcl.util.Logging.LOG;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 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();
-
-        // 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);
-    }
-
-    private static void checkDirectoryPath() {
         String currentDirectory = new File("").getAbsolutePath();
         if (currentDirectory.contains("!")) {
+            System.err.println("Exclamation mark(!) is not allowed in the path where HMCL is in. Forcibly exit.");
+
             // No Chinese translation because both Swing and JavaFX cannot render Chinese character properly when exclamation mark exists in the path.
-            showErrorAndExit("Exclamation mark(!) is not allowed in the path where HMCL is in.\n"
-                    + "The path is " + currentDirectory);
-        }
-    }
-
-    private static void checkJavaFX() {
-        try {
-            Class.forName("javafx.application.Application");
-        } catch (ClassNotFoundException e) {
-            showErrorAndExit(i18n("fatal.missing_javafx"));
-        }
-    }
-
-    private static void checkDSTRootCAX3() {
-        TrustManagerFactory tmf;
-        try {
-            tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-            tmf.init((KeyStore) null);
-        } catch (NoSuchAlgorithmException | KeyStoreException e) {
-            LOG.log(Level.WARNING, "Failed to init TrustManagerFactory", e);
-            // don't know what to do here
-            return;
-        }
-        for (TrustManager tm : tmf.getTrustManagers()) {
-            if (tm instanceof X509TrustManager) {
-                for (X509Certificate cert : ((X509TrustManager) tm).getAcceptedIssuers()) {
-                    if ("CN=DST Root CA X3, O=Digital Signature Trust Co.".equals((cert.getSubjectDN().getName()))) {
-                        return;
-                    }
-                }
-            }
-        }
-        showWarningAndContinue(i18n("fatal.missing_dst_root_ca_x3"));
-    }
-
-    /**
-     * Indicates that a fatal error has occurred, and that the application cannot start.
-     */
-    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);
-        System.exit(1);
-    }
-
-    /**
-     * Indicates that potential issues have been detected, and that the application may not function properly (but it can still run).
-     */
-    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);
+            String message = "Exclamation mark(!) is not allowed in the path where HMCL is in.\nThe path is " + currentDirectory;
+            JOptionPane.showMessageDialog(null, message, "Error", JOptionPane.ERROR_MESSAGE);
+            System.exit(1);
+        } else
+            Launcher.main(args);
     }
 
 }

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

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

@@ -0,0 +1,61 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ *
+ * This 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.auth.Account;
+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 accounts.
+ * <br>
+ * This event is fired on the {@link org.jackhuang.hmcl.event.EventBus#EVENT_BUS}
+ *
+ * @author huangyuhui
+ */
+public class AccountLoadingEvent extends Event {
+
+    private final Collection<Account> accounts;
+
+    /**
+     * Constructor.
+     *
+     * @param source {@link org.jackhuang.hmcl.setting.Settings}
+     */
+    public AccountLoadingEvent(Object source, Collection<Account> accounts) {
+        super(source);
+        this.accounts = Collections.unmodifiableCollection(accounts);
+    }
+
+
+    public Collection<Account> getAccounts() {
+        return accounts;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .append("source", source)
+                .append("accounts", accounts)
+                .toString();
+    }
+}
+

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

@@ -0,0 +1,53 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
+ * This 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

@@ -0,0 +1,55 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
+ * This 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

@@ -0,0 +1,60 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
+ * This 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

@@ -0,0 +1,200 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
+ * This 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.Settings;
+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.net.Proxy;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Optional;
+
+public final class AccountHelper {
+    public static final AccountHelper INSTANCE = new AccountHelper();
+    private AccountHelper() {}
+
+    public static final File SKIN_DIR = new File(Launcher.HMCL_DIRECTORY, "skins");
+
+    public static void loadSkins() {
+        loadSkins(Proxy.NO_PROXY);
+    }
+
+    public static void loadSkins(Proxy proxy) {
+        for (Account account : Settings.INSTANCE.getAccounts()) {
+            if (account instanceof YggdrasilAccount) {
+                new SkinLoadTask((YggdrasilAccount) account, proxy, false).start();
+            }
+        }
+    }
+
+    public static Task loadSkinAsync(YggdrasilAccount account) {
+        return loadSkinAsync(account, Settings.INSTANCE.getProxy());
+    }
+
+    public static Task loadSkinAsync(YggdrasilAccount account, Proxy proxy) {
+        return new SkinLoadTask(account, proxy, false);
+    }
+
+    public static Task refreshSkinAsync(YggdrasilAccount account) {
+        return refreshSkinAsync(account, Settings.INSTANCE.getProxy());
+    }
+
+    public static Task refreshSkinAsync(YggdrasilAccount account, Proxy proxy) {
+        return new SkinLoadTask(account, proxy, true);
+    }
+
+    private static File getSkinFile(String name) {
+        return new File(SKIN_DIR, name + ".png");
+    }
+
+    public static Image getSkin(YggdrasilAccount account) {
+        return getSkin(account, 1);
+    }
+
+    public static Image getSkin(YggdrasilAccount account, double scaleRatio) {
+        if (account.getCharacter() == null)
+            return getDefaultSkin(account, scaleRatio);
+        File file = getSkinFile(account.getCharacter());
+        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(account, scaleRatio);
+    }
+
+    public static Image getSkinImmediately(YggdrasilAccount account, GameProfile profile, double scaleRatio, Proxy proxy) throws Exception {
+        String name = profile.getName();
+        File file = getSkinFile(name);
+        downloadSkin(account, profile, true, proxy);
+        if (!file.exists())
+            return getDefaultSkin(account, 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 Proxy proxy;
+        private final boolean refresh;
+        private final List<Task> dependencies = new LinkedList<>();
+
+        public SkinLoadTask(YggdrasilAccount account, Proxy proxy) {
+            this(account, proxy, false);
+        }
+
+        public SkinLoadTask(YggdrasilAccount account, Proxy proxy, boolean refresh) {
+            this.account = account;
+            this.proxy = proxy;
+            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, proxy);
+        }
+    }
+
+    private static void downloadSkin(YggdrasilAccount account, GameProfile profile, boolean refresh, Proxy proxy) throws Exception {
+        account.clearCache();
+
+        Optional<Texture> texture = account.getSkin(profile);
+        if (!texture.isPresent()) return;
+        String url = texture.get().getUrl();
+        File file = getSkinFile(profile.getName());
+        if (!refresh && file.exists())
+            return;
+        new FileDownloadTask(NetworkUtils.toURL(url), file, proxy).run();
+    }
+
+    private static void downloadSkin(YggdrasilAccount account, boolean refresh, Proxy proxy) 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.getCharacter());
+        if (!refresh && file.exists())
+            return;
+        new FileDownloadTask(NetworkUtils.toURL(url), file, proxy).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(Account account, double scaleRatio) {
+        if (account == null)
+            return getSteveSkin(scaleRatio);
+
+        int type = account.getUUID().hashCode() & 1;
+        if (type == 1)
+            return getAlexSkin(scaleRatio);
+        else
+            return getSteveSkin(scaleRatio);
+    }
+}

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

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

@@ -0,0 +1,47 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ *
+ * This 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;
+
+import java.net.Proxy;
+
+/**
+ * @author huangyuhui
+ */
+public class HMCLDependencyManager extends DefaultDependencyManager {
+    private final Profile profile;
+
+    public HMCLDependencyManager(Profile profile, DownloadProvider downloadProvider) {
+        this(profile, downloadProvider, Proxy.NO_PROXY);
+    }
+
+    public HMCLDependencyManager(Profile profile, DownloadProvider downloadProvider, Proxy proxy) {
+        super(profile.getRepository(), downloadProvider, proxy);
+
+        this.profile = profile;
+    }
+
+    @Override
+    public GameBuilder gameBuilder() {
+        return new HMCLGameBuilder(profile);
+    }
+}

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

@@ -0,0 +1,40 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ *
+ * This 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

@@ -0,0 +1,77 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ *
+ * This 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.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.logging.Level;
+
+/**
+ * @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);
+
+        File cache = new File(Settings.INSTANCE.getCommonPath(), "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,
+                profile.getDependency().getProxy(),
+                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) 2019  huangyuhui <[email protected]> and contributors
- *
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,16 +13,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.game;
 
-import org.jackhuang.hmcl.Metadata;
+import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.auth.AuthInfo;
 import org.jackhuang.hmcl.launch.DefaultLauncher;
 import org.jackhuang.hmcl.launch.ProcessListener;
 
-import java.util.Map;
+import java.util.List;
 
 /**
  * @author huangyuhui
@@ -42,10 +42,10 @@ public final class HMCLGameLauncher extends DefaultLauncher {
     }
 
     @Override
-    protected Map<String, String> getConfigurations() {
-        Map<String, String> res = super.getConfigurations();
-        res.put("${launcher_name}", Metadata.NAME);
-        res.put("${launcher_version}", Metadata.VERSION);
-        return res;
+    protected void appendJvmArgs(List<String> result) {
+        super.appendJvmArgs(result);
+
+        result.add("-Dminecraft.launcher.version=" + Launcher.VERSION);
+        result.add("-Dminecraft.launcher.brand=" + Launcher.NAME);
     }
 }

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
- *
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
  * This 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,22 @@
  * GNU General 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/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.game;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import javafx.scene.image.Image;
+import org.jackhuang.hmcl.event.EventBus;
+import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
+import org.jackhuang.hmcl.event.RefreshingVersionsEvent;
 import org.jackhuang.hmcl.setting.EnumGameDirectory;
 import org.jackhuang.hmcl.setting.Profile;
+import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.setting.VersionSetting;
+import org.jackhuang.hmcl.util.FileUtils;
+import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.Logging;
-import org.jackhuang.hmcl.util.io.FileUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -47,6 +51,19 @@ public class HMCLGameRepository extends DefaultGameRepository {
         return profile;
     }
 
+    private boolean useSelf(String version, String assetId) {
+        VersionSetting vs = profile.getVersionSetting(version);
+        return new File(getBaseDirectory(), "assets/indexes/" + assetId + ".json").exists() || vs.isNoCommon();
+    }
+
+    @Override
+    public File getAssetDirectory(String version, String assetId) {
+        if (useSelf(version, assetId))
+            return super.getAssetDirectory(version, assetId);
+        else
+            return new File(Settings.INSTANCE.getCommonPath(), "assets");
+    }
+
     @Override
     public File getRunDirectory(String id) {
         if (beingModpackVersions.contains(id) || isModpack(id))
@@ -62,6 +79,17 @@ 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 (self.exists() || vs.isNoCommon())
+            return self;
+        else
+            return new File(Settings.INSTANCE.getCommonPath(), "libraries/" + lib.getPath());
+    }
+
+
     @Override
     protected void refreshVersionsImpl() {
         versionSettings.clear();
@@ -77,21 +105,18 @@ 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");
     }
@@ -144,26 +169,10 @@ public class HMCLGameRepository extends DefaultGameRepository {
         return setting;
     }
 
-    public File getVersionIconFile(String id) {
+    public File getVersionIcon(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;
@@ -180,27 +189,6 @@ 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);
     }
@@ -218,8 +206,8 @@ public class HMCLGameRepository extends DefaultGameRepository {
         beingModpackVersions.remove(id);
     }
 
-    private static final Gson GSON = new GsonBuilder()
-            .setPrettyPrinting()
+    private static final Gson GSON = new GsonBuilder().setPrettyPrinting()
+            .registerTypeAdapter(VersionSetting.class, VersionSetting.Serializer.INSTANCE)
             .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) 2019  huangyuhui <[email protected]> and contributors
- *
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,15 +13,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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.game;
 
+
 import org.jackhuang.hmcl.mod.Modpack;
-import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.task.TaskResult;
+import org.jackhuang.hmcl.util.Constants;
 import org.jackhuang.hmcl.util.Logging;
-import org.jackhuang.hmcl.util.gson.JsonUtils;
-import org.jackhuang.hmcl.util.io.Zipper;
+import org.jackhuang.hmcl.util.ZipEngine;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -30,53 +31,67 @@ import java.util.List;
 /**
  * Export the game to a mod pack file.
  */
-public class HMCLModpackExportTask extends Task {
+public class HMCLModpackExportTask extends TaskResult<ZipEngine> {
     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) {
+    public HMCLModpackExportTask(DefaultGameRepository repository, String version, List<String> whitelist, Modpack modpack, File output, String id) {
         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 (Zipper zip = new Zipper(output.toPath())) {
-            zip.putDirectory(repository.getRunDirectory(version).toPath(), "minecraft", path -> {
-                if (path.isEmpty())
-                    return true;
+        try (ZipEngine zip = new ZipEngine(output)) {
+            zip.putDirectory(repository.getRunDirectory(version), (String pathName, Boolean isDirectory) -> {
                 for (String s : blackList)
-                    if (path.equals(s))
-                        return false;
+                    if (isDirectory) {
+                        if (pathName.startsWith(s + "/"))
+                            return null;
+                    } else if (pathName.equals(s))
+                        return null;
                 for (String s : whitelist)
-                    if (path.equals(s))
-                        return true;
-                return false;
+                    if (pathName.equals(s + (isDirectory ? "/" : "")))
+                        return "minecraft/" + pathName;
+                return null;
             });
 
             Version mv = repository.getResolvedVersion(version);
             String gameVersion = GameVersion.minecraftVersion(repository.getVersionJar(version))
                     .orElseThrow(() ->  new IllegalStateException("Cannot parse the version of " + version));
-            zip.putTextFile(JsonUtils.GSON.toJson(mv.setJar(gameVersion)), "minecraft/pack.json"); // Making "jar" to gameVersion is to be compatible with old HMCL.
-            zip.putTextFile(JsonUtils.GSON.toJson(modpack.setGameVersion(gameVersion)), "modpack.json"); // Newer HMCL only reads 'gameVersion' field.
+            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.
         }
     }
+
+    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) 2019  huangyuhui <[email protected]> and contributors
- *
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
  * This 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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.game;
 
@@ -27,14 +27,15 @@ 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.gson.JsonUtils;
-import org.jackhuang.hmcl.util.io.CompressingUtils;
-import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.CompressingUtils;
+import org.jackhuang.hmcl.util.Constants;
+import org.jackhuang.hmcl.util.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 {
     private final File zipFile;
@@ -65,7 +66,7 @@ public final class HMCLModpackInstallTask extends Task {
         ModpackConfiguration<Modpack> config = null;
         try {
             if (json.exists()) {
-                config = JsonUtils.GSON.fromJson(FileUtils.readText(json), new TypeToken<ModpackConfiguration<Modpack>>() {
+                config = Constants.GSON.fromJson(FileUtils.readText(json), new TypeToken<ModpackConfiguration<Modpack>>() {
                 }.getType());
 
                 if (!MODPACK_TYPE.equals(config.getType()))
@@ -73,7 +74,7 @@ public final class HMCLModpackInstallTask extends Task {
             }
         } catch (JsonParseException | IOException ignore) {
         }
-        dependents.add(new ModpackInstallTask<>(zipFile, run, modpack.getEncoding(), "/minecraft", it -> !"pack.json".equals(it), config));
+        dependents.add(new ModpackInstallTask<>(zipFile, run, "minecraft/", it -> !Objects.equals(it, "minecraft/pack.json"), config));
     }
 
     @Override
@@ -89,9 +90,9 @@ public final class HMCLModpackInstallTask extends Task {
     @Override
     public void execute() throws Exception {
         String json = CompressingUtils.readTextZipEntry(zipFile, "minecraft/pack.json");
-        Version version = JsonUtils.GSON.fromJson(json, Version.class).setId(name).setJar(null);
+        Version version = Constants.GSON.fromJson(json, Version.class).setJar(null);
         dependencies.add(new VersionJsonSaveTask(repository, version));
-        dependencies.add(new MinecraftInstanceTask<>(zipFile, modpack.getEncoding(), "/minecraft", modpack, MODPACK_TYPE, repository.getModpackConfiguration(name)));
+        dependencies.add(new MinecraftInstanceTask<>(zipFile, "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) 2019  huangyuhui <[email protected]> and contributors
- *
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
  * This 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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://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;
 
 /**
@@ -37,10 +36,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", "cache", // HMCL
+            "pack.json", "launcher.jar", "hmclmc.log", // HMCL
             "manifest.json", "minecraftinstance.json", ".curseclient", // Curse
             "minetweaker.log", // Mods
-            "jars", "logs", "versions", "assets", "libraries", "crash-reports", "NVIDIA", "AMD", "screenshots", "natives", "native", "$native", "server-resource-packs", // Minecraft
+            "logs", "versions", "assets", "libraries", "crash-reports", "NVIDIA", "AMD", "screenshots", "natives", "native", "$native", "server-resource-packs", // Minecraft
             "downloads", // Curse
             "asm", "backups", "TCNodeTracker", "CustomDISkins", "data" // Mods
     );
@@ -76,15 +75,14 @@ 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(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);
+    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");
         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) 2019  huangyuhui <[email protected]> and contributors
- *
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
  * This 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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://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) 2019  huangyuhui <[email protected]> and contributors
- *
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
  * This 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,188 +13,138 @@
  * GNU General 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/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.game;
 
+import com.jfoenix.concurrency.JFXUtilities;
 import javafx.application.Platform;
+import javafx.scene.layout.Region;
 import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.AuthInfo;
 import org.jackhuang.hmcl.auth.AuthenticationException;
-import org.jackhuang.hmcl.auth.CredentialExpiredException;
+import org.jackhuang.hmcl.auth.ServerDisconnectException;
 import org.jackhuang.hmcl.download.DefaultDependencyManager;
 import org.jackhuang.hmcl.download.MaintainTask;
-import org.jackhuang.hmcl.download.game.LibraryDownloadException;
 import org.jackhuang.hmcl.launch.*;
-import org.jackhuang.hmcl.mod.CurseCompletionException;
 import org.jackhuang.hmcl.mod.CurseCompletionTask;
-import org.jackhuang.hmcl.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.MessageDialogPane.MessageType;
+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.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 org.jackhuang.hmcl.util.*;
 
 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;
+import java.util.function.Consumer;
 
 public final class LauncherHelper {
+    public static final LauncherHelper INSTANCE = new LauncherHelper();
+    private LauncherHelper(){}
 
-    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();
-    }
-
+    public static final Queue<ManagedProcess> PROCESSES = new ConcurrentLinkedQueue<>();
     private final TaskExecutorDialogPane launchingStepsPane = new TaskExecutorDialogPane(it -> {});
 
-    public void setTestMode() {
-        launcherVisibility = LauncherVisibility.KEEP;
-        showLogs = true;
-    }
-
-    public void launch() {
-        Logging.LOG.info("Launching game version: " + selectedVersion);
+    public void launch(Profile profile, Account account, String selectedVersion, File scriptFile) {
+        if (account == null)
+            throw new IllegalArgumentException("No account");
 
         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(this::launch0);
+                    Schedulers.newThread().schedule(() -> launch0(profile, account, selectedVersion, scriptFile));
                 });
             } catch (InterruptedException ignore) {
             }
         });
     }
 
-    public void makeLaunchScript(File scriptFile) {
-        this.scriptFile = Objects.requireNonNull(scriptFile);
-
-        launch();
-    }
-
-    private void launch0() {
-        HMCLGameRepository repository = profile.getRepository();
+    private void launch0(Profile profile, Account account, String selectedVersion, File scriptFile) {
+        GameRepository 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(() -> {
+                .then(variables -> {
                     if (setting.isNotCheckGame())
                         return null;
                     else
                         return dependencyManager.checkGameCompletionAsync(version);
                 })
                 .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.MODS)))
-                .then(() -> {
-                    try {
-                        ModpackConfiguration<?> configuration = ModpackHelper.readModpackConfiguration(repository.getModpackConfiguration(selectedVersion));
-                        if ("Curse".equals(configuration.getType()))
-                            return new CurseCompletionTask(dependencyManager, selectedVersion);
-                        else
-                            return null;
-                    } catch (IOException e) {
-                        return null;
-                    }
-                })
+                .then(new CurseCompletionTask(dependencyManager, selectedVersion))
                 .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.LOGGING_IN)))
-                .thenCompose(() -> Task.ofResult(i18n("account.methods"), () -> {
+                .then(Task.of(Launcher.i18n("account.methods"), variables -> {
                     try {
-                        return account.logIn();
-                    } catch (CredentialExpiredException e) {
-                        LOG.info("Credential has expired: " + e);
-                        return DialogController.logIn(account);
+                        try {
+                            variables.set("account", account.logIn());
+                        } catch (ServerDisconnectException e) {
+                            if (account.canPlayOffline())
+                                variables.set("account", account.playOffline());
+                            else
+                                throw e;
+                        }
                     } catch (AuthenticationException e) {
-                        LOG.warning("Authentication failed, try playing offline: " + e);
-                        return account.playOffline().orElseThrow(() -> e);
+                        variables.set("account", DialogController.logIn(account));
                     }
                 }))
-                .thenApply(Schedulers.javafx(), authInfo -> {
-                    emitStatus(LoadingState.LAUNCHING);
-                    return authInfo;
-                })
-                .thenApply(authInfo -> new HMCLGameLauncher(
-                        repository,
-                        selectedVersion,
-                        authInfo,
-                        setting.toLaunchOptions(profile.getGameDir()),
-                        launcherVisibility == LauncherVisibility.CLOSE
-                                ? null // Unnecessary to start listening to game process output when close launcher immediately after game launched.
-                                : new HMCLProcessListener(authInfo, setting, gameVersion.isPresent())
-                ))
-                .thenCompose(launcher -> { // launcher is prev task's result
+                .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()), new HMCLProcessListener(variables.get("account"), setting, gameVersion.isPresent())
+                    ));
+                }))
+                .then(variables -> {
+                    DefaultLauncher launcher = variables.get("launcher");
                     if (scriptFile == null) {
-                        return new LaunchTask<>(launcher::launch).setName(i18n("version.launch"));
+                        return new LaunchTask<>(launcher::launch).setName(Launcher.i18n("version.launch"));
                     } else {
-                        return new LaunchTask<ManagedProcess>(() -> {
+                        return new LaunchTask<>(() -> {
                             launcher.makeLaunchScript(scriptFile);
                             return null;
-                        }).setName(i18n("version.launch_script"));
+                        }).setName(Launcher.i18n("version.launch_script"));
                     }
                 })
-                .thenAccept(process -> { // process is LaunchTask's result
+                .then(Task.of(variables -> {
                     if (scriptFile == null) {
+                        ManagedProcess process = variables.get(LaunchTask.LAUNCH_ID);
                         PROCESSES.add(process);
-                        if (launcherVisibility == LauncherVisibility.CLOSE)
+                        if (setting.getLauncherVisibility() == LauncherVisibility.CLOSE)
                             Launcher.stopApplication();
                         else
                             launchingStepsPane.setCancel(it -> {
                                 process.stop();
-                                it.fireEvent(new DialogCloseEvent());
+                                Controllers.closeDialog(it);
                             });
-                    } else {
+                    } else
                         Platform.runLater(() -> {
-                            launchingStepsPane.fireEvent(new DialogCloseEvent());
-                            Controllers.dialog(i18n("version.launch_script.success", scriptFile.getAbsolutePath()));
+                            Controllers.closeDialog(launchingStepsPane);
+                            Controllers.dialog(Launcher.i18n("version.launch_script.success", scriptFile.getAbsolutePath()));
                         });
-                    }
-                })
+
+                }))
                 .executor();
 
-        launchingStepsPane.setExecutor(executor, false);
+        launchingStepsPane.setExecutor(executor);
         executor.addTaskListener(new TaskListener() {
             final AtomicInteger finished = new AtomicInteger(0);
 
@@ -207,36 +157,13 @@ public final class LauncherHelper {
 
             @Override
             public void onStop(boolean success, TaskExecutor executor) {
-                if (!success && !Controllers.isStopped()) {
+                if (!success) {
                     Platform.runLater(() -> {
-                        // Check if the application has stopped
-                        // because onStop will be invoked if tasks fail when the executor service shut down.
-                        if (!Controllers.isStopped()) {
-                            launchingStepsPane.fireEvent(new DialogCloseEvent());
-                            Exception ex = executor.getLastException();
-                            if (ex != null) {
-                                String message;
-                                if (ex instanceof CurseCompletionException) {
-                                    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) {
-                                    message = i18n("launch.failed.creating_process") + ex.getLocalizedMessage();
-                                } else if (ex instanceof NotDecompressingNativesException) {
-                                    message = i18n("launch.failed.decompressing_natives") + ex.getLocalizedMessage();
-                                } else if (ex instanceof LibraryDownloadException) {
-                                    message = i18n("launch.failed.download_library", ((LibraryDownloadException) ex).getLibrary().getName()) + "\n" + StringUtils.getStackTrace(ex.getCause());
-                                } else {
-                                    message = StringUtils.getStackTrace(ex);
-                                }
-                                Controllers.dialog(message,
-                                        scriptFile == null ? i18n("launch.failed") : i18n("version.launch_script.failed"),
-                                        MessageType.ERROR);
-                            }
-                        }
+                        Controllers.closeDialog(launchingStepsPane);
+                        if (executor.getLastException() != null)
+                            Controllers.dialog(I18nException.getStackTrace(executor.getLastException()),
+                                    scriptFile == null ? Launcher.i18n("launch.failed") : Launcher.i18n("version.launch_script.failed"),
+                                    MessageBox.ERROR_MESSAGE);
                     });
                 }
                 launchingStepsPane.setExecutor(null);
@@ -247,156 +174,61 @@ 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.warning"), MessageType.WARNING, onAccept);
+            Controllers.dialog(Launcher.i18n("launch.wrong_javadir"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
             setting.setJava(null);
-            setting.setDefaultJavaPath(null);
             java = JavaVersion.fromCurrentEnvironment();
             flag = true;
         }
 
-        // 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 {
-                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;
-            }
+        if (!flag && java.getParsedVersion() < JavaVersion.JAVA_8) {
+            Controllers.dialog(Launcher.i18n("launch.advice.newer_java"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
+            flag = true;
         }
 
-        // LaunchWrapper 1.12 will crash because of assuming the system class loader is an instance of URLClassLoader.
-        if (!flag && java.getParsedVersion() >= JavaVersion.JAVA_9
-                && 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.getParsedVersion() >= JavaVersion.JAVA_9 && gameVersion.compareTo(VersionNumber.asVersion("1.12.5")) < 0 && version.getMainClass().contains("launchwrapper")) {
+            Controllers.dialog(Launcher.i18n("launch.advice.java9"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE, null);
+            flag = true;
         }
 
-        // Minecraft 1.13 may crash when generating world on Java 8 earlier than 1.8.0_51
-        VersionNumber JAVA_8 = VersionNumber.asVersion("1.8.0_51");
-        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 &&
+                org.jackhuang.hmcl.util.Platform.IS_64_BIT) {
+            Controllers.dialog(Launcher.i18n("launch.advice.different_platform"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
+            flag = true;
         }
-
-        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 &&
+        if (!flag && java.getPlatform() == org.jackhuang.hmcl.util.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"), MessageType.ERROR, onAccept);
+            Controllers.dialog(Launcher.i18n("launch.advice.too_large_memory_for_32bit"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE, 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"), MessageType.ERROR, onAccept);
+            Controllers.dialog(Launcher.i18n("launch.advice.not_enough_space", OperatingSystem.TOTAL_MEMORY), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE, 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());
-        }
+        if (state == LoadingState.DONE)
+            Controllers.closeDialog(launchingStepsPane);
 
         launchingStepsPane.setTitle(state.getLocalizedMessage());
         launchingStepsPane.setSubtitle((state.ordinal() + 1) + " / " + LoadingState.values().length);
     }
 
-    private void checkExit() {
-        switch (launcherVisibility) {
+    private void checkExit(LauncherVisibility v) {
+        switch (v) {
             case HIDE_AND_REOPEN:
                 Platform.runLater(Controllers.getStage()::show);
                 break;
@@ -425,8 +257,23 @@ public final class LauncherHelper {
 
         @Override
         public void execute() throws Exception {
-            setResult(supplier.get());
+            try {
+                setResult(supplier.get());
+            } catch (PermissionException e) {
+                throw new I18nException(Launcher.i18n("launch.failed.executable_permission"), e);
+            } catch (ProcessCreationException e) {
+                throw new I18nException(Launcher.i18n("launch.failed.creating_process") + e.getLocalizedMessage(), e);
+            } catch (NotDecompressingNativesException e) {
+                throw new I18nException(Launcher.i18n("launch.failed.decompressing_natives") + e.getLocalizedMessage(), e);
+            }
         }
+
+        @Override
+        public String getId() {
+            return LAUNCH_ID;
+        }
+
+        static final String LAUNCH_ID = "launch";
     }
 
     /**
@@ -438,6 +285,7 @@ public final class LauncherHelper {
 
         private final VersionSetting setting;
         private final Map<String, String> forbiddenTokens;
+        private final LauncherVisibility visibility;
         private ManagedProcess process;
         private boolean lwjgl;
         private LogWindow logWindow;
@@ -452,12 +300,13 @@ public final class LauncherHelper {
             if (authInfo == null)
                 forbiddenTokens = Collections.emptyMap();
             else
-                forbiddenTokens = mapOf(
-                        pair(authInfo.getAccessToken(), "<access token>"),
-                        pair(UUIDTypeAdapter.fromUUID(authInfo.getUUID()), "<uuid>"),
-                        pair(authInfo.getUsername(), "<player>")
+                forbiddenTokens = Lang.mapOf(
+                        new Pair<>(authInfo.getAccessToken(), "<access token>"),
+                        new Pair<>(authInfo.getUserId(), "<uuid>"),
+                        new Pair<>(authInfo.getUsername(), "<player>")
                 );
 
+            visibility = setting.getLauncherVisibility();
             logs = new LinkedList<>();
         }
 
@@ -465,7 +314,7 @@ public final class LauncherHelper {
         public void setProcess(ManagedProcess process) {
             this.process = process;
 
-            if (showLogs)
+            if (setting.isShowLogs())
                 Platform.runLater(() -> {
                     logWindow = new LogWindow();
                     logWindow.show();
@@ -473,39 +322,6 @@ 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;
@@ -517,25 +333,43 @@ public final class LauncherHelper {
             else
                 System.out.print(log);
 
-            logs.add(pair(log, level));
-            if (logs.size() > config().getLogLines())
+            logs.add(new Pair<>(log, level));
+            if (logs.size() > Settings.INSTANCE.getLogLines())
                 logs.removeFirst();
 
-            if (showLogs) {
-                try {
+            if (setting.isShowLogs()) {
+                Lang.invoke(() -> {
                     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;
-                finishLaunch();
+                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;
+                }
             }
         }
 
@@ -544,38 +378,29 @@ 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();
 
                     switch (exitType) {
                         case JVM_ERROR:
-                            logWindow.setTitle(i18n("launch.failed.cannot_create_jvm"));
+                            logWindow.setTitle(Launcher.i18n("launch.failed.cannot_create_jvm"));
                             break;
                         case APPLICATION_ERROR:
-                            logWindow.setTitle(i18n("launch.failed.exited_abnormally"));
+                            logWindow.setTitle(Launcher.i18n("launch.failed.exited_abnormally"));
                             break;
                     }
 
                     logWindow.show();
                     logWindow.onDone.register(() -> {
-                        logWindow.logLine("Command: " + new CommandBuilder().addAll(process.getCommands()).toString(), Log4jLevel.INFO);
+                        logWindow.logLine("Commands: " + StringUtils.makeCommand(process.getCommands()), Log4jLevel.INFO);
                         for (Map.Entry<String, Log4jLevel> entry : logs)
                             logWindow.logLine(entry.getKey(), entry.getValue());
                     });
                 });
 
-            checkExit();
+            checkExit(visibility);
         }
 
     }
-
-    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) 2019  huangyuhui <[email protected]> and contributors
- *
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,11 +13,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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.game;
 
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import org.jackhuang.hmcl.Launcher;
 
 public enum LoadingState {
     DEPENDENCIES("launch.state.dependencies"),
@@ -33,6 +33,6 @@ public enum LoadingState {
     }
 
     public String getLocalizedMessage() {
-        return i18n(key);
+        return Launcher.i18n(key);
     }
 }

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
- *
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
  * This 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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://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) 2019  huangyuhui <[email protected]> and contributors
- *
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
  * This 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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.game;
 
@@ -23,39 +23,35 @@ 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.Schedulers;
+import org.jackhuang.hmcl.task.FinalizedCallback;
 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(Path file, Charset charset) throws UnsupportedModpackException {
+    public static Modpack readModpackManifest(File file) throws UnsupportedModpackException {
         try {
-            return CurseManifest.readCurseForgeModpackManifest(file, charset);
+            return CurseManifest.readCurseForgeModpackManifest(file);
         } catch (Exception e) {
             // ignore it, not a valid CurseForge modpack.
         }
 
         try {
-            return HMCLModpackManager.readHMCLModpackManifest(file, charset);
+            return HMCLModpackManager.readHMCLModpackManifest(file);
         } catch (Exception e) {
             // ignore it, not a valid HMCL modpack.
         }
 
         try {
-            return MultiMCInstanceConfiguration.readMultiMCModpackManifest(file, charset);
+            return MultiMCInstanceConfiguration.readMultiMCModpackManifest(file);
         } catch (Exception e) {
             // ignore it, not a valid MultiMC modpack.
         }
@@ -63,12 +59,12 @@ public final class ModpackHelper {
         throw new UnsupportedModpackException(file.toString());
     }
 
-    public static ModpackConfiguration<?> readModpackConfiguration(File file) throws IOException {
+    public static <T> ModpackConfiguration<T> readModpackConfiguration(File file) throws IOException {
         if (!file.exists())
             throw new FileNotFoundException(file.getPath());
         else
             try {
-                return JsonUtils.GSON.fromJson(FileUtils.readText(file), new TypeToken<ModpackConfiguration<?>>() {
+                return Constants.GSON.fromJson(FileUtils.readText(file), new TypeToken<ModpackConfiguration<T>>() {
                 }.getType());
             } catch (JsonParseException e) {
                 throw new IOException("Malformed modpack configuration");
@@ -89,57 +85,46 @@ public final class ModpackHelper {
     public static Task getInstallTask(Profile profile, File zipFile, String name, Modpack modpack) {
         profile.getRepository().markVersionAsModpack(name);
 
-        ExceptionalRunnable<?> success = () -> {
-            HMCLGameRepository repository = profile.getRepository();
-            repository.refreshVersions();
-            VersionSetting vs = repository.specializeVersionSetting(name);
-            repository.undoMark(name);
+        FinalizedCallback finalizeTask = (variables, isDependentsSucceeded) -> {
+            profile.getRepository().refreshVersions();
+            VersionSetting vs = profile.specializeVersionSetting(name);
+            profile.getRepository().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, modpack, ((CurseManifest) modpack.getManifest()), name)
-                    .whenComplete(Schedulers.defaultScheduler(), success, failure);
+            return new CurseInstallTask(profile.getDependency(), zipFile, ((CurseManifest) modpack.getManifest()), name)
+                    .finalized(finalizeTask);
         else if (modpack.getManifest() instanceof HMCLModpackManifest)
             return new HMCLModpackInstallTask(profile, zipFile, modpack, name)
-                    .whenComplete(Schedulers.defaultScheduler(), success, failure);
+                    .finalized(finalizeTask);
         else if (modpack.getManifest() instanceof MultiMCInstanceConfiguration)
-            return new MultiMCModpackInstallTask(profile.getDependency(), zipFile, modpack, ((MultiMCInstanceConfiguration) modpack.getManifest()), name)
-                    .whenComplete(Schedulers.defaultScheduler(), success, failure)
-                    .then(new MultiMCInstallVersionSettingTask(profile, ((MultiMCInstanceConfiguration) modpack.getManifest()), name));
+            return new MultiMCModpackInstallTask(profile.getDependency(), zipFile, ((MultiMCInstanceConfiguration) modpack.getManifest()), name)
+                    .finalized(finalizeTask)
+                    .with(new MultiMCInstallVersionSettingTask(profile, ((MultiMCInstanceConfiguration) modpack.getManifest()), name));
         else throw new IllegalStateException("Unrecognized modpack: " + modpack);
     }
 
-    public static Task getUpdateTask(Profile profile, File zipFile, Charset charset, String name, ModpackConfiguration<?> configuration) throws UnsupportedModpackException, MismatchedModpackTypeException {
-        Modpack modpack = ModpackHelper.readModpackManifest(zipFile.toPath(), charset);
+    public static Task getUpdateTask(Profile profile, File zipFile, String name, ModpackConfiguration<?> configuration) throws UnsupportedModpackException, MismatchedModpackTypeException {
+        Modpack modpack = ModpackHelper.readModpackManifest(zipFile);
 
         switch (configuration.getType()) {
             case CurseInstallTask.MODPACK_TYPE:
                 if (!(modpack.getManifest() instanceof CurseManifest))
                     throw new MismatchedModpackTypeException(CurseInstallTask.MODPACK_TYPE, getManifestType(modpack.getManifest()));
 
-                return new ModpackUpdateTask(profile.getRepository(), name, new CurseInstallTask(profile.getDependency(), zipFile, modpack, (CurseManifest) modpack.getManifest(), name));
+                return new CurseInstallTask(profile.getDependency(), zipFile, (CurseManifest) modpack.getManifest(), name);
             case MultiMCModpackInstallTask.MODPACK_TYPE:
                 if (!(modpack.getManifest() instanceof MultiMCInstanceConfiguration))
                     throw new MismatchedModpackTypeException(MultiMCModpackInstallTask.MODPACK_TYPE, getManifestType(modpack.getManifest()));
 
-                return new ModpackUpdateTask(profile.getRepository(), name, new MultiMCModpackInstallTask(profile.getDependency(), zipFile, modpack, (MultiMCInstanceConfiguration) modpack.getManifest(), name));
+                return new MultiMCModpackInstallTask(profile.getDependency(), zipFile, (MultiMCInstanceConfiguration) modpack.getManifest(), name);
             case HMCLModpackInstallTask.MODPACK_TYPE:
                 if (!(modpack.getManifest() instanceof HMCLModpackManifest))
                     throw new MismatchedModpackTypeException(HMCLModpackInstallTask.MODPACK_TYPE, getManifestType(modpack.getManifest()));
 
-                return new ModpackUpdateTask(profile.getRepository(), name, new HMCLModpackInstallTask(profile, zipFile, modpack, name));
+                return 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) 2019  huangyuhui <[email protected]> and contributors
- *
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
  * This 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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.game;
 
@@ -44,7 +44,7 @@ public final class MultiMCInstallVersionSettingTask extends Task {
 
     @Override
     public void execute() {
-        VersionSetting vs = Objects.requireNonNull(profile.getRepository().specializeVersionSetting(version));
+        VersionSetting vs = Objects.requireNonNull(profile.specializeVersionSetting(version));
         ModpackHelper.toVersionSetting(manifest, vs);
     }
 }

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

@@ -1,221 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.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,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
- *
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
  * This 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,47 +13,32 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.setting;
 
-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.Launcher;
 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.authlibinjector.AuthlibInjectorBuildInfo;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServerResponse;
 import org.jackhuang.hmcl.auth.offline.OfflineAccount;
 import org.jackhuang.hmcl.auth.offline.OfflineAccountFactory;
+import org.jackhuang.hmcl.auth.yggdrasil.MojangYggdrasilProvider;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccountFactory;
-import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.FileDownloadTask;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.task.TaskResult;
+import org.jackhuang.hmcl.util.*;
 
+import java.io.File;
 import java.io.IOException;
-import java.nio.file.Paths;
+import java.net.URL;
 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.ui.FXUtils.onInvalidating;
-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;
 
 /**
  * @author huangyuhui
@@ -61,229 +46,60 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 public final class Accounts {
     private Accounts() {}
 
-    public static final OfflineAccountFactory FACTORY_OFFLINE = OfflineAccountFactory.INSTANCE;
-    public static final YggdrasilAccountFactory FACTORY_MOJANG = YggdrasilAccountFactory.MOJANG;
-    public static final AuthlibInjectorAccountFactory FACTORY_AUTHLIB_INJECTOR = new AuthlibInjectorAccountFactory(createAuthlibInjectorArtifactProvider(), Accounts::getOrCreateAuthlibInjectorServer);
+    public static final String OFFLINE_ACCOUNT_KEY = "offline";
+    public static final String YGGDRASIL_ACCOUNT_KEY = "yggdrasil";
+    public static final String AUTHLIB_INJECTOR_ACCOUNT_KEY = "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);
+    public static final Map<String, AccountFactory<?>> ACCOUNT_FACTORY = Lang.mapOf(
+            new Pair<>(OFFLINE_ACCOUNT_KEY, OfflineAccountFactory.INSTANCE),
+            new Pair<>(YGGDRASIL_ACCOUNT_KEY, new YggdrasilAccountFactory(MojangYggdrasilProvider.INSTANCE)),
+            new Pair<>(AUTHLIB_INJECTOR_ACCOUNT_KEY, new AuthlibInjectorAccountFactory(Accounts::downloadAuthlibInjector))
+    );
 
-        type2factory.forEach((type, factory) -> factory2type.put(factory, type));
+    private static final Map<String, String> AUTHLIB_INJECTOR_SERVER_NAMES = new HashMap<>();
+
+    public static String getAccountType(Account account) {
+        if (account instanceof OfflineAccount) return OFFLINE_ACCOUNT_KEY;
+        else if (account instanceof AuthlibInjectorAccount) return AUTHLIB_INJECTOR_ACCOUNT_KEY;
+        else if (account instanceof YggdrasilAccount) return YGGDRASIL_ACCOUNT_KEY;
+        else return YGGDRASIL_ACCOUNT_KEY;
     }
 
-    public static String getLoginType(AccountFactory<?> factory) {
-        return Optional.ofNullable(factory2type.get(factory))
-                .orElseThrow(() -> new IllegalArgumentException("Unrecognized account factory"));
+    static String getAccountId(Account account) {
+        return getAccountId(account.getUsername(), account.getCharacter());
     }
 
-    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 FACTORY_OFFLINE;
-        else if (account instanceof AuthlibInjectorAccount)
-            return FACTORY_AUTHLIB_INJECTOR;
-        else if (account instanceof YggdrasilAccount)
-            return FACTORY_MOJANG;
-        else
-            throw new IllegalArgumentException("Failed to determine account type: " + account);
+    static String getAccountId(String username, String character) {
+        return username + ":" + character;
     }
 
-    private static ObservableList<Account> accounts = observableArrayList(account -> new Observable[] { account });
-    private static ReadOnlyListWrapper<Account> accountsWrapper = new ReadOnlyListWrapper<>(Accounts.class, "accounts", accounts);
-
-    private static ObjectProperty<Account> selectedAccount = new SimpleObjectProperty<Account>(Accounts.class, "selectedAccount") {
-        {
-            accounts.addListener(onInvalidating(this::invalidated));
+    private static String downloadAuthlibInjector() throws Exception {
+        AuthlibInjectorBuildInfo buildInfo = AuthlibInjectorBuildInfo.requestBuildInfo();
+        File jar = new File(Launcher.HMCL_DIRECTORY, "authlib-injector.jar");
+        File local = new File(Launcher.HMCL_DIRECTORY, "authlib-injector.txt");
+        int buildNumber = 0;
+        try {
+            buildNumber = Integer.parseInt(FileUtils.readText(local));
+        } catch (IOException | NumberFormatException ignore) {
         }
-
-        @Override
-        protected void invalidated() {
-            // this methods first checks whether the current selection is valid
-            // if it's valid, the underlying storage will be updated
-            // otherwise, the first account will be selected as an alternative(or null if accounts is empty)
-            Account selected = get();
-            if (accounts.isEmpty()) {
-                if (selected == null) {
-                    // valid
-                } else {
-                    // the previously selected account is gone, we can only set it to null here
-                    set(null);
-                    return;
-                }
-            } else {
-                if (accounts.contains(selected)) {
-                    // valid
-                } else {
-                    // the previously selected account is gone
-                    set(accounts.get(0));
-                    return;
-                }
-            }
-            // selection is valid, store it
-            if (!initialized)
-                return;
-            updateAccountStorages();
+        if (buildNumber < buildInfo.getBuildNumber()) {
+            new FileDownloadTask(new URL(buildInfo.getUrl()), jar).run();
+            FileUtils.writeText(local, String.valueOf(buildInfo.getBuildNumber()));
         }
-    };
-
-    /**
-     * True if {@link #init()} hasn't been called.
-     */
-    private static boolean initialized = false;
-
-    static {
-        accounts.addListener(onInvalidating(Accounts::updateAccountStorages));
+        return jar.getAbsolutePath();
     }
 
-    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(Accounts::getAccountStorage).collect(toList()));
-    }
-
-    /**
-     * 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 -> {
-            AccountFactory<?> factory = type2factory.get(storage.get("type"));
-            if (factory == null) {
-                LOG.warning("Unrecognized account type: " + storage);
-                return;
-            }
-            Account account;
-            try {
-                account = factory.fromStorage(storage);
-            } catch (Exception e) {
-                LOG.log(Level.WARNING, "Failed to load account: " + storage, e);
-                return;
-            }
-            accounts.add(account);
-
-            if (Boolean.TRUE.equals(storage.get("selected"))) {
-                selectedAccount.set(account);
-            }
-        });
-
-        initialized = true;
-
-        config().getAuthlibInjectorServers().addListener(onInvalidating(Accounts::removeDanglingAuthlibInjectorAccounts));
-
-        Account selected = selectedAccount.get();
-        if (selected != null) {
-            Schedulers.io().schedule(() -> {
-                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().schedule(() -> {
-                try {
-                    server.fetchMetadataResponse();
-                } catch (IOException e) {
-                    LOG.log(Level.WARNING, "Failed to fetch authlib-injector server metdata: " + server, e);
-                }
-            });
+    public static String getAuthlibInjectorServerName(String serverIp) throws Exception {
+        if (AUTHLIB_INJECTOR_SERVER_NAMES.containsKey(serverIp))
+            return AUTHLIB_INJECTOR_SERVER_NAMES.get(serverIp);
+        else {
+            AuthlibInjectorServerResponse response = Constants.GSON.fromJson(NetworkUtils.doGet(NetworkUtils.toURL(serverIp)), AuthlibInjectorServerResponse.class);
+            AUTHLIB_INJECTOR_SERVER_NAMES.put(serverIp, response.getMeta().getServerName());
+            return response.getMeta().getServerName();
         }
     }
 
-    public static ObservableList<Account> getAccounts() {
-        return accounts;
+    public static TaskResult<String> getAuthlibInjectorServerNameAsync(AuthlibInjectorAccount account) {
+        return Task.ofResult("serverName", () -> Accounts.getAuthlibInjectorServerName(account.getServerBaseURL()));
     }
-
-    public static ReadOnlyListProperty<Account> accountsProperty() {
-        return accountsWrapper.getReadOnlyProperty();
-    }
-
-    public static Account getSelectedAccount() {
-        return selectedAccount.get();
-    }
-
-    public static void setSelectedAccount(Account selectedAccount) {
-        Accounts.selectedAccount.set(selectedAccount);
-    }
-
-    public static ObjectProperty<Account> selectedAccountProperty() {
-        return selectedAccount;
-    }
-
-    // ==== authlib-injector ====
-    private static AuthlibInjectorArtifactProvider createAuthlibInjectorArtifactProvider() {
-        String authlibinjectorLocation = System.getProperty("hmcl.authlibinjector.location");
-        if (authlibinjectorLocation == null) {
-            return new AuthlibInjectorDownloader(Metadata.HMCL_DIRECTORY, DownloadProviders::getDownloadProvider);
-        } else {
-            LOG.info("Using specified authlib-injector: " + authlibinjectorLocation);
-            return new SimpleAuthlibInjectorArtifactProvider(Paths.get(authlibinjectorLocation));
-        }
-    }
-
-    private static AuthlibInjectorServer getOrCreateAuthlibInjectorServer(String url) {
-        return config().getAuthlibInjectorServers().stream()
-                .filter(server -> url.equals(server.getUrl()))
-                .findFirst()
-                .orElseGet(() -> {
-                    AuthlibInjectorServer server = new AuthlibInjectorServer(url);
-                    config().getAuthlibInjectorServers().add(server);
-                    return server;
-                });
-    }
-
-    /**
-     * After an {@link AuthlibInjectorServer} is removed, the associated accounts should also be removed.
-     * This method performs a check and removes the dangling accounts.
-     */
-    private static void removeDanglingAuthlibInjectorAccounts() {
-        accounts.stream()
-                .filter(AuthlibInjectorAccount.class::isInstance)
-                .map(AuthlibInjectorAccount.class::cast)
-                .filter(it -> !config().getAuthlibInjectorServers().contains(it.getServer()))
-                .collect(toList())
-                .forEach(accounts::remove);
-    }
-    // ====
-
-    // ==== Login type name i18n ===
-    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 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) 2019  huangyuhui <[email protected]> and contributors
- *
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
  * This 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,451 +13,261 @@
  * GNU General 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/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.setting;
 
-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.*;
-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 org.jackhuang.hmcl.Launcher;
+import org.jackhuang.hmcl.util.JavaVersion;
 
-import java.io.File;
-import java.net.Proxy;
-import java.util.Map;
-import java.util.TreeMap;
+import java.util.*;
 
-public final class Config implements Cloneable, Observable {
-
-    public static final int CURRENT_UI_VERSION = 0;
-
-    private static final Gson CONFIG_GSON = new GsonBuilder()
-            .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(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 loaded = CONFIG_GSON.fromJson(json, Config.class);
-        if (loaded == null) {
-            return null;
-        }
-        Config instance = new Config();
-        PropertyUtils.copyProperties(loaded, instance);
-        return instance;
-    }
+public final class Config implements Cloneable {
 
     @SerializedName("last")
-    private StringProperty selectedProfile = new SimpleStringProperty("");
+    private String selectedProfile = "";
 
     @SerializedName("backgroundType")
-    private ObjectProperty<EnumBackgroundImage> backgroundImageType = new SimpleObjectProperty<>(EnumBackgroundImage.DEFAULT);
+    private int backgroundImageType = 0;
 
     @SerializedName("bgpath")
-    private StringProperty backgroundImage = new SimpleStringProperty();
-
-    @SerializedName("commonDirType")
-    private ObjectProperty<EnumCommonDirectory> commonDirType = new SimpleObjectProperty<>(EnumCommonDirectory.DEFAULT);
+    private String backgroundImage = null;
 
     @SerializedName("commonpath")
-    private StringProperty commonDirectory = new SimpleStringProperty(Metadata.MINECRAFT_DIRECTORY.toString());
+    private String commonDirectory = Launcher.MINECRAFT_DIRECTORY.getAbsolutePath();
 
     @SerializedName("hasProxy")
-    private BooleanProperty hasProxy = new SimpleBooleanProperty();
+    private boolean hasProxy = false;
 
     @SerializedName("hasProxyAuth")
-    private BooleanProperty hasProxyAuth = new SimpleBooleanProperty();
+    private boolean hasProxyAuth = false;
 
     @SerializedName("proxyType")
-    private ObjectProperty<Proxy.Type> proxyType = new SimpleObjectProperty<>(Proxy.Type.HTTP);
+    private int proxyType = 0;
 
     @SerializedName("proxyHost")
-    private StringProperty proxyHost = new SimpleStringProperty();
+    private String proxyHost = null;
 
     @SerializedName("proxyPort")
-    private IntegerProperty proxyPort = new SimpleIntegerProperty();
+    private String proxyPort = null;
 
     @SerializedName("proxyUserName")
-    private StringProperty proxyUser = new SimpleStringProperty();
+    private String proxyUser = null;
 
     @SerializedName("proxyPassword")
-    private StringProperty proxyPass = new SimpleStringProperty();
+    private String proxyPass = null;
 
     @SerializedName("theme")
-    private ObjectProperty<Theme> theme = new SimpleObjectProperty<>(Theme.BLUE);
+    private String theme = null;
+
+    @SerializedName("java")
+    private List<JavaVersion> java = null;
 
     @SerializedName("localization")
-    private ObjectProperty<SupportedLocale> localization = new SimpleObjectProperty<>(Locales.DEFAULT);
+    private String localization;
 
-    @SerializedName("downloadType")
-    private StringProperty downloadType = new SimpleStringProperty("bmclapi");
+    @SerializedName("downloadtype")
+    private int downloadType = 0;
 
     @SerializedName("configurations")
-    private ObservableMap<String, Profile> configurations = FXCollections.observableMap(new TreeMap<>());
+    private Map<String, Profile> configurations = new TreeMap<>();
 
     @SerializedName("accounts")
-    private ObservableList<Map<Object, Object>> accountStorages = FXCollections.observableArrayList();
+    private List<Map<Object, Object>> accounts = new LinkedList<>();
+
+    @SerializedName("selectedAccount")
+    private String selectedAccount = "";
 
     @SerializedName("fontFamily")
-    private StringProperty fontFamily = new SimpleStringProperty("Consolas");
+    private String fontFamily = "Consolas";
 
     @SerializedName("fontSize")
-    private DoubleProperty fontSize = new SimpleDoubleProperty(12);
+    private double fontSize = 12;
 
     @SerializedName("logLines")
-    private IntegerProperty logLines = new SimpleIntegerProperty(100);
+    private int logLines = 100;
 
-    @SerializedName("authlibInjectorServers")
-    private ObservableList<AuthlibInjectorServer> authlibInjectorServers = FXCollections.observableArrayList(server -> new Observable[] { server });
+    @SerializedName("authlibInjectorServerURLs")
+    private Set<String> authlibInjectorServerURLs = new HashSet<>();
 
-    @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() {
-        PropertyUtils.attachListener(this, helper);
-    }
-
-    @Override
-    public void addListener(InvalidationListener listener) {
-        helper.addListener(listener);
-    }
-
-    @Override
-    public void removeListener(InvalidationListener listener) {
-        helper.removeListener(listener);
-    }
-
-    public String toJson() {
-        return CONFIG_GSON.toJson(this);
-    }
-
-    @Override
-    public Config clone() {
-        return fromJson(this.toJson());
-    }
-
-    // Getters & Setters & Properties
     public String getSelectedProfile() {
-        return selectedProfile.get();
-    }
-
-    public void setSelectedProfile(String selectedProfile) {
-        this.selectedProfile.set(selectedProfile);
-    }
-
-    public StringProperty selectedProfileProperty() {
         return selectedProfile;
     }
 
-    public EnumBackgroundImage getBackgroundImageType() {
-        return backgroundImageType.get();
-    }
-
-    public void setBackgroundImageType(EnumBackgroundImage backgroundImageType) {
-        this.backgroundImageType.set(backgroundImageType);
-    }
-
-    public ObjectProperty<EnumBackgroundImage> backgroundImageTypeProperty() {
-        return backgroundImageType;
+    public void setSelectedProfile(String selectedProfile) {
+        this.selectedProfile = selectedProfile;
     }
 
     public String getBackgroundImage() {
-        return backgroundImage.get();
-    }
-
-    public void setBackgroundImage(String backgroundImage) {
-        this.backgroundImage.set(backgroundImage);
-    }
-
-    public StringProperty backgroundImageProperty() {
         return backgroundImage;
     }
 
-    public EnumCommonDirectory getCommonDirType() {
-        return commonDirType.get();
+    public void setBackgroundImage(String backgroundImage) {
+        this.backgroundImage = backgroundImage;
     }
 
-    public ObjectProperty<EnumCommonDirectory> commonDirTypeProperty() {
-        return commonDirType;
+    public int getBackgroundImageType() {
+        return backgroundImageType;
     }
 
-    public void setCommonDirType(EnumCommonDirectory commonDirType) {
-        this.commonDirType.set(commonDirType);
+    public void setBackgroundImageType(int backgroundImageType) {
+        this.backgroundImageType = backgroundImageType;
     }
 
     public String getCommonDirectory() {
-        return commonDirectory.get();
-    }
-
-    public void setCommonDirectory(String commonDirectory) {
-        this.commonDirectory.set(commonDirectory);
-    }
-
-    public StringProperty commonDirectoryProperty() {
         return commonDirectory;
     }
 
-    public boolean hasProxy() {
-        return hasProxy.get();
+    public void setCommonDirectory(String commonDirectory) {
+        this.commonDirectory = commonDirectory;
     }
 
-    public void setHasProxy(boolean hasProxy) {
-        this.hasProxy.set(hasProxy);
-    }
-
-    public BooleanProperty hasProxyProperty() {
+    public boolean isHasProxy() {
         return hasProxy;
     }
 
-    public boolean hasProxyAuth() {
-        return hasProxyAuth.get();
+    public void setHasProxy(boolean hasProxy) {
+        this.hasProxy = hasProxy;
     }
 
-    public void setHasProxyAuth(boolean hasProxyAuth) {
-        this.hasProxyAuth.set(hasProxyAuth);
-    }
-
-    public BooleanProperty hasProxyAuthProperty() {
+    public boolean isHasProxyAuth() {
         return hasProxyAuth;
     }
 
-    public Proxy.Type getProxyType() {
-        return proxyType.get();
+    public void setHasProxyAuth(boolean hasProxyAuth) {
+        this.hasProxyAuth = hasProxyAuth;
     }
 
-    public void setProxyType(Proxy.Type proxyType) {
-        this.proxyType.set(proxyType);
-    }
-
-    public ObjectProperty<Proxy.Type> proxyTypeProperty() {
+    public int getProxyType() {
         return proxyType;
     }
 
+    public void setProxyType(int proxyType) {
+        this.proxyType = proxyType;
+    }
+
     public String getProxyHost() {
-        return proxyHost.get();
-    }
-
-    public void setProxyHost(String proxyHost) {
-        this.proxyHost.set(proxyHost);
-    }
-
-    public StringProperty proxyHostProperty() {
         return proxyHost;
     }
 
-    public int getProxyPort() {
-        return proxyPort.get();
+    public void setProxyHost(String proxyHost) {
+        this.proxyHost = proxyHost;
     }
 
-    public void setProxyPort(int proxyPort) {
-        this.proxyPort.set(proxyPort);
-    }
-
-    public IntegerProperty proxyPortProperty() {
+    public String getProxyPort() {
         return proxyPort;
     }
 
+    public void setProxyPort(String proxyPort) {
+        this.proxyPort = proxyPort;
+    }
+
     public String getProxyUser() {
-        return proxyUser.get();
-    }
-
-    public void setProxyUser(String proxyUser) {
-        this.proxyUser.set(proxyUser);
-    }
-
-    public StringProperty proxyUserProperty() {
         return proxyUser;
     }
 
+    public void setProxyUser(String proxyUser) {
+        this.proxyUser = proxyUser;
+    }
+
     public String getProxyPass() {
-        return proxyPass.get();
-    }
-
-    public void setProxyPass(String proxyPass) {
-        this.proxyPass.set(proxyPass);
-    }
-
-    public StringProperty proxyPassProperty() {
         return proxyPass;
     }
 
-    public Theme getTheme() {
-        return theme.get();
+    public void setProxyPass(String proxyPass) {
+        this.proxyPass = proxyPass;
     }
 
-    public void setTheme(Theme theme) {
-        this.theme.set(theme);
-    }
-
-    public ObjectProperty<Theme> themeProperty() {
+    public String getTheme() {
         return theme;
     }
 
-    public SupportedLocale getLocalization() {
-        return localization.get();
+    public void setTheme(String theme) {
+        this.theme = theme;
     }
 
-    public void setLocalization(SupportedLocale localization) {
-        this.localization.set(localization);
+    public List<JavaVersion> getJava() {
+        return java;
     }
 
-    public ObjectProperty<SupportedLocale> localizationProperty() {
+    public void setJava(List<JavaVersion> java) {
+        this.java = java;
+    }
+
+    public String getLocalization() {
         return localization;
     }
 
-    public String getDownloadType() {
-        return downloadType.get();
+    public void setLocalization(String localization) {
+        this.localization = localization;
     }
 
-    public void setDownloadType(String downloadType) {
-        this.downloadType.set(downloadType);
-    }
-
-    public StringProperty downloadTypeProperty() {
+    public int getDownloadType() {
         return downloadType;
     }
 
-    public ObservableMap<String, Profile> getConfigurations() {
+    public void setDownloadType(int downloadType) {
+        this.downloadType = downloadType;
+    }
+
+    public Map<String, Profile> getConfigurations() {
         return configurations;
     }
 
-    public ObservableList<Map<Object, Object>> getAccountStorages() {
-        return accountStorages;
+    public void setConfigurations(Map<String, Profile> configurations) {
+        this.configurations = configurations;
+    }
+
+    public List<Map<Object, Object>> getAccounts() {
+        return accounts;
+    }
+
+    public void setAccounts(List<Map<Object, Object>> accounts) {
+        this.accounts = accounts;
+    }
+
+    public String getSelectedAccount() {
+        return selectedAccount;
+    }
+
+    public void setSelectedAccount(String selectedAccount) {
+        this.selectedAccount = selectedAccount;
     }
 
     public String getFontFamily() {
-        return fontFamily.get();
-    }
-
-    public void setFontFamily(String fontFamily) {
-        this.fontFamily.set(fontFamily);
-    }
-
-    public StringProperty fontFamilyProperty() {
         return fontFamily;
     }
 
+    public void setFontFamily(String fontFamily) {
+        this.fontFamily = fontFamily;
+    }
+
     public double getFontSize() {
-        return fontSize.get();
-    }
-
-    public void setFontSize(double fontSize) {
-        this.fontSize.set(fontSize);
-    }
-
-    public DoubleProperty fontSizeProperty() {
         return fontSize;
     }
 
+    public void setFontSize(double fontSize) {
+        this.fontSize = fontSize;
+    }
+
     public int getLogLines() {
-        return logLines.get();
-    }
-
-    public void setLogLines(int logLines) {
-        this.logLines.set(logLines);
-    }
-
-    public IntegerProperty logLinesProperty() {
         return logLines;
     }
 
-    public ObservableList<AuthlibInjectorServer> getAuthlibInjectorServers() {
-        return authlibInjectorServers;
+    public void setLogLines(int logLines) {
+        this.logLines = logLines;
     }
 
-    public UpdateChannel getUpdateChannel() {
-        return updateChannel.get();
+    public Set<String> getAuthlibInjectorServerURLs() {
+        return authlibInjectorServerURLs;
     }
 
-    public ObjectProperty<UpdateChannel> updateChannelProperty() {
-        return updateChannel;
+    public void setAuthlibInjectorServerURLs(Set<String> authlibInjectorServerURLs) {
+        this.authlibInjectorServerURLs = authlibInjectorServerURLs;
     }
 
-    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;
+    public Config clone() {
+        return Settings.GSON.fromJson(Settings.GSON.toJson(this), Config.class);
     }
 }

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

@@ -1,143 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.setting;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonParseException;
-import org.jackhuang.hmcl.util.InvocationDispatcher;
-import org.jackhuang.hmcl.util.Lang;
-import org.jackhuang.hmcl.util.io.FileUtils;
-import org.jackhuang.hmcl.util.platform.OperatingSystem;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Map;
-import java.util.logging.Level;
-
-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 String CONFIG_FILENAME_LINUX = ".hmcl.json";
-
-    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;
-    }
-
-    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);
-                }
-            }
-        }
-
-        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

@@ -1,129 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.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) 2019  huangyuhui <[email protected]> and contributors
- *
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
  * This 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,48 +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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://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 javafx.beans.binding.Bindings;
-import javafx.beans.binding.ObjectBinding;
-import javafx.beans.value.ObservableObjectValue;
+import java.util.List;
 
 public final class DownloadProviders {
     private DownloadProviders() {}
 
-    public static final Map<String, DownloadProvider> providersById = mapOf(
-            pair("mojang", new MojangDownloadProvider()),
-            pair("bmclapi", new BMCLAPIDownloadProvider()));
+    public static final List<DownloadProvider> DOWNLOAD_PROVIDERS = Lang.immutableListOf(new MojangDownloadProvider(), BMCLAPIDownloadProvider.INSTANCE, CurseCDNDownloadProvider.INSTANCE);
 
-    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;
+    public static DownloadProvider getDownloadProvider(int index) {
+        return Lang.get(DOWNLOAD_PROVIDERS, index).orElse(DOWNLOAD_PROVIDERS.get(0));
     }
 }

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
  *
  * This 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,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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.setting;
 
 public enum EnumBackgroundImage {
     DEFAULT,
-    CUSTOM
+    CUSTOM;
+
+    public static EnumBackgroundImage indexOf(int index) {
+        if (index >= values().length || index < 0)
+            return DEFAULT;
+        else
+            return values()[index];
+    }
 }

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
- *
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
  * This 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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.setting;
 

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
- *
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
  * This 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,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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.setting;
 
-public enum EnumCommonDirectory {
-    /**
-     * %appdata%/.minecraft or ~/.minecraft
-     */
-    DEFAULT,
-    /**
-     * user customized common directory.
-     */
-    CUSTOM
+import javafx.scene.text.Font;
+
+import java.util.List;
+
+public final class Fonts {
+    private Fonts() {}
+
+    public static final List<String> FONTS = Font.getFamilies();
 }

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
- *
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
  * This 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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.setting;
 

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
- *
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
  * This 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,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hmcl.util.i18n;
+package org.jackhuang.hmcl.setting;
 
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
+import org.jackhuang.hmcl.ui.construct.UTF8Control;
 import org.jackhuang.hmcl.util.Lang;
 
-import java.io.IOException;
 import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
@@ -56,7 +53,11 @@ public final class Locales {
      */
     public static final SupportedLocale RU = new SupportedLocale(new Locale("ru"));
 
-    public static final List<SupportedLocale> LOCALES = Lang.immutableListOf(DEFAULT, EN, ZH_CN, ZH);
+    public static final List<SupportedLocale> LOCALES = Lang.immutableListOf(DEFAULT, EN, ZH_CN);
+
+    public static SupportedLocale getLocale(int index) {
+        return Lang.get(LOCALES, index).orElse(DEFAULT);
+    }
 
     public static SupportedLocale getLocaleByName(String name) {
         if (name == null) return DEFAULT;
@@ -80,7 +81,6 @@ public final class Locales {
         else throw new IllegalArgumentException("Unknown locale: " + locale);
     }
 
-    @JsonAdapter(SupportedLocale.TypeAdapter.class)
     public static class SupportedLocale {
         private final Locale locale;
         private final String name;
@@ -108,17 +108,5 @@ public final class Locales {
             if (name == null) return resourceBundle.getString("lang");
             else return newResourceBundle.getString(name);
         }
-
-        public static class TypeAdapter extends com.google.gson.TypeAdapter<SupportedLocale> {
-            @Override
-            public void write(JsonWriter out, SupportedLocale value) throws IOException {
-                out.value(getNameByLocale(value));
-            }
-
-            @Override
-            public SupportedLocale read(JsonReader in) throws IOException {
-                return getLocaleByName(in.nextString());
-            }
-        }
     }
 }

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui
  *
  * This 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,107 +13,78 @@
  * GNU General 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/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.setting;
 
 import com.google.gson.*;
-import com.google.gson.annotations.JsonAdapter;
-import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
-import javafx.beans.Observable;
-import javafx.beans.property.*;
-import org.jackhuang.hmcl.download.DefaultDependencyManager;
-import org.jackhuang.hmcl.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.HMCLDependencyManager;
 import org.jackhuang.hmcl.game.HMCLGameRepository;
-import org.jackhuang.hmcl.game.Version;
-import org.jackhuang.hmcl.ui.WeakListenerHolder;
+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.util.javafx.ObservableHelper;
 
 import java.io.File;
 import java.lang.reflect.Type;
 import java.util.Optional;
 
-import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
-import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
-
 /**
  *
  * @author huangyuhui
  */
-@JsonAdapter(Profile.Serializer.class)
-public final class Profile implements Observable {
-    private final WeakListenerHolder listenerHolder = new WeakListenerHolder();
+public final class Profile {
+
     private final HMCLGameRepository repository;
+    private final ModManager modManager;
 
-    private final StringProperty selectedVersion = new SimpleStringProperty();
+    private final ImmediateObjectProperty<File> 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 ImmediateObjectProperty<File> gameDirProperty() {
+        return gameDirProperty;
     }
 
     public File getGameDir() {
-        return gameDir.get();
+        return gameDirProperty.get();
     }
 
     public void setGameDir(File gameDir) {
-        this.gameDir.set(gameDir);
+        gameDirProperty.set(gameDir);
     }
 
-    private final ReadOnlyObjectWrapper<VersionSetting> global = new ReadOnlyObjectWrapper<>(this, "global");
+    private final ImmediateObjectProperty<VersionSetting> globalProperty = new ImmediateObjectProperty<>(this, "global", new VersionSetting());
 
-    public ReadOnlyObjectProperty<VersionSetting> globalProperty() {
-        return global.getReadOnlyProperty();
+    public ImmediateObjectProperty<VersionSetting> globalProperty() {
+        return globalProperty;
     }
 
     public VersionSetting getGlobal() {
-        return global.get();
+        return globalProperty.get();
     }
 
-    private final SimpleStringProperty name;
+    public void setGlobal(VersionSetting global) {
+        if (global == null)
+            global = new VersionSetting();
+        globalProperty.set(global);
+    }
 
-    public StringProperty nameProperty() {
-        return name;
+    private final ImmediateStringProperty nameProperty;
+
+    public ImmediateStringProperty nameProperty() {
+        return nameProperty;
     }
 
     public String getName() {
-        return name.get();
+        return nameProperty.get();
     }
 
     public void setName(String name) {
-        this.name.set(name);
+        nameProperty.set(name);
     }
 
-    private BooleanProperty useRelativePath = new SimpleBooleanProperty(this, "useRelativePath", false);
-
-    public BooleanProperty useRelativePathProperty() {
-        return useRelativePath;
-    }
-
-    public boolean isUseRelativePath() {
-        return useRelativePath.get();
-    }
-
-    public void setUseRelativePath(boolean useRelativePath) {
-        this.useRelativePath.set(useRelativePath);
+    public Profile() {
+        this("Default");
     }
 
     public Profile(String name) {
@@ -121,95 +92,81 @@ public final class Profile implements Observable {
     }
 
     public Profile(String name, File initialGameDir) {
-        this(name, initialGameDir, new VersionSetting());
-    }
-
-    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);
+        nameProperty = new ImmediateStringProperty(this, "name", name);
+        gameDirProperty = new ImmediateObjectProperty<>(this, "gameDir", initialGameDir);
         repository = new HMCLGameRepository(this, initialGameDir);
-        this.global.set(global == null ? new VersionSetting() : global);
-        this.selectedVersion.set(selectedVersion);
-        this.useRelativePath.set(useRelativePath);
+        modManager = new ModManager(repository);
 
-        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() {
-        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);
-            }
-        });
+        gameDirProperty.addListener((a, b, newValue) -> repository.changeDirectory(newValue));
     }
 
     public HMCLGameRepository getRepository() {
         return repository;
     }
 
-    public DefaultDependencyManager getDependency() {
-        return new DefaultDependencyManager(repository, DownloadProviders.getDownloadProvider(), HMCLCacheRepository.REPOSITORY);
+    public ModManager getModManager() {
+        return modManager;
+    }
+
+    public HMCLDependencyManager getDependency() {
+        return new HMCLDependencyManager(this, Settings.INSTANCE.getDownloadProvider(), Settings.INSTANCE.getProxy());
     }
 
     public VersionSetting getVersionSetting(String id) {
         VersionSetting vs = repository.getVersionSetting(id);
         if (vs == null || vs.isUsesGlobal()) {
             getGlobal().setGlobal(true); // always keep global.isGlobal = true
-            getGlobal().setUsesGlobal(true);
             return getGlobal();
         } else
             return vs;
     }
 
+    public boolean isVersionGlobal(String id) {
+        VersionSetting vs = repository.getVersionSetting(id);
+        return vs == null || vs.isUsesGlobal();
+    }
+
+    /**
+     * Make version use self version settings instead of the global one.
+     * @param id the version id.
+     * @return specialized version setting, null if given version does not exist.
+     */
+    public VersionSetting specializeVersionSetting(String id) {
+        VersionSetting vs = repository.getVersionSetting(id);
+        if (vs == null)
+            vs = repository.createVersionSetting(id);
+        if (vs == null)
+            return null;
+        vs.setUsesGlobal(false);
+        return vs;
+    }
+
+    public void globalizeVersionSetting(String id) {
+        VersionSetting vs = repository.getVersionSetting(id);
+        if (vs != null)
+            vs.setUsesGlobal(true);
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this)
                 .append("gameDir", getGameDir())
                 .append("name", getName())
-                .append("useRelativePath", isUseRelativePath())
                 .toString();
     }
 
-    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 void addPropertyChangedListener(InvalidationListener listener) {
+        nameProperty.addListener(listener);
+        globalProperty.addListener(listener);
+        gameDirProperty.addListener(listener);
     }
 
     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)
@@ -218,8 +175,6 @@ public final class Profile implements Observable {
             JsonObject jsonObject = new JsonObject();
             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;
         }
@@ -230,11 +185,9 @@ public final class Profile implements Observable {
             JsonObject obj = (JsonObject) json;
             String gameDir = Optional.ofNullable(obj.get("gameDir")).map(JsonElement::getAsString).orElse("");
 
-            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));
+            Profile profile = new Profile("Default", new File(gameDir));
+            profile.setGlobal(context.deserialize(obj.get("global"), VersionSetting.class));
+            return profile;
         }
 
     }

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
  *
  * This 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,203 +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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.setting;
 
-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.ui.FXUtils.runInFX;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import org.jackhuang.hmcl.Launcher;
 
 public final class Profiles {
-
-    public static final String DEFAULT_PROFILE = "Default";
-    public static final String HOME_PROFILE = "Home";
-
     private Profiles() {
     }
 
     public static String getProfileDisplayName(Profile profile) {
         switch (profile.getName()) {
-            case Profiles.DEFAULT_PROFILE:
-                return i18n("profile.default");
-            case Profiles.HOME_PROFILE:
-                return i18n("profile.home");
+            case Settings.DEFAULT_PROFILE:
+                return Launcher.i18n("profile.default");
+            case Settings.HOME_PROFILE:
+                return Launcher.i18n("profile.home");
             default:
                 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 -> {
-            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/Proxies.java

@@ -0,0 +1,36 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
+ * This 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.setting;
+
+import org.jackhuang.hmcl.util.Lang;
+
+import java.net.Proxy;
+import java.util.List;
+
+/**
+ * @author huangyuhui
+ */
+public final class Proxies {
+    private Proxies() {}
+
+    public static final List<Proxy.Type> PROXIES = Lang.immutableListOf(Proxy.Type.DIRECT, Proxy.Type.HTTP, Proxy.Type.SOCKS);
+
+    public static Proxy.Type getProxyType(int index) {
+        return Lang.get(PROXIES, index).orElse(null);
+    }
+}

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

@@ -1,116 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.setting;
-
-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;
-import java.net.PasswordAuthentication;
-import java.net.Proxy;
-import java.net.Proxy.Type;
-
-import static org.jackhuang.hmcl.setting.ConfigHolder.config;
-import static org.jackhuang.hmcl.util.Logging.LOG;
-
-public final class ProxyManager {
-    private ProxyManager() {
-    }
-
-    private static ObjectBinding<Proxy> proxyProperty;
-
-    public static Proxy getProxy() {
-        return proxyProperty.get();
-    }
-
-    public static ObservableObjectValue<Proxy> proxyProperty() {
-        return proxyProperty;
-    }
-
-    static void init() {
-        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 (username != null && password != null) {
-                        return new PasswordAuthentication(username, password.toCharArray());
-                    }
-                }
-                return null;
-            }
-        });
-    }
-
-    private static void updateSystemProxy() {
-        Proxy proxy = proxyProperty.get();
-        if (proxy.type() == Proxy.Type.DIRECT) {
-            System.clearProperty("http.proxyHost");
-            System.clearProperty("http.proxyPort");
-            System.clearProperty("https.proxyHost");
-            System.clearProperty("https.proxyPort");
-            System.clearProperty("socksProxyHost");
-            System.clearProperty("socksProxyPort");
-        } else {
-            InetSocketAddress address = (InetSocketAddress) proxy.address();
-            String host = address.getHostString();
-            String port = String.valueOf(address.getPort());
-            if (proxy.type() == Type.HTTP) {
-                System.clearProperty("socksProxyHost");
-                System.clearProperty("socksProxyPort");
-                System.setProperty("http.proxyHost", host);
-                System.setProperty("http.proxyPort", port);
-                System.setProperty("https.proxyHost", host);
-                System.setProperty("https.proxyPort", port);
-            } else if (proxy.type() == Type.SOCKS) {
-                System.clearProperty("http.proxyHost");
-                System.clearProperty("http.proxyPort");
-                System.clearProperty("https.proxyHost");
-                System.clearProperty("https.proxyPort");
-                System.setProperty("socksProxyHost", host);
-                System.setProperty("socksProxyPort", port);
-            }
-        }
-    }
-}

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
- *
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
  * This 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,64 +13,577 @@
  * GNU General 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/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.setting;
 
-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 com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.StringProperty;
+import javafx.beans.value.ObservableValue;
+import javafx.scene.text.Font;
+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.download.DownloadProvider;
+import org.jackhuang.hmcl.event.AccountLoadingEvent;
+import org.jackhuang.hmcl.event.EventBus;
+import org.jackhuang.hmcl.event.ProfileChangedEvent;
+import org.jackhuang.hmcl.event.ProfileLoadingEvent;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.util.*;
 
-import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import java.io.File;
+import java.io.IOException;
+import java.net.Authenticator;
+import java.net.InetSocketAddress;
+import java.net.PasswordAuthentication;
+import java.net.Proxy;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.stream.Collectors;
 
 public class Settings {
+    public static final Gson GSON = new GsonBuilder()
+            .registerTypeAdapter(VersionSetting.class, VersionSetting.Serializer.INSTANCE)
+            .registerTypeAdapter(Profile.class, Profile.Serializer.INSTANCE)
+            .registerTypeAdapter(File.class, FileTypeAdapter.INSTANCE)
+            .setPrettyPrinting().create();
 
-    private static Settings instance;
+    public static final String DEFAULT_PROFILE = "Default";
+    public static final String HOME_PROFILE = "Home";
 
-    public static Settings instance() {
-        if (instance == null) {
-            throw new IllegalStateException("Settings hasn't been initialized");
+    public static final String SETTINGS_FILE_NAME = "hmcl.json";
+    public static final File SETTINGS_FILE = new File(SETTINGS_FILE_NAME).getAbsoluteFile();
+
+    public static final Settings INSTANCE = new Settings();
+
+    private Settings() {}
+
+    private final Config SETTINGS = initSettings();
+
+    private final Map<String, Account> accounts = new HashMap<>();
+
+    {
+        loadProxy();
+
+        for (Iterator<Map<Object, Object>> iterator = SETTINGS.getAccounts().iterator(); iterator.hasNext(); ) {
+            Map<Object, Object> settings = iterator.next();
+            AccountFactory<?> factory = Accounts.ACCOUNT_FACTORY.get(Lang.get(settings, "type", String.class).orElse(""));
+            if (factory == null) {
+                // unrecognized account type, so remove it.
+                iterator.remove();
+                continue;
+            }
+
+            Account account;
+            try {
+                account = factory.fromStorage(settings, getProxy());
+            } catch (Exception e) {
+                // storage is malformed, delete.
+                iterator.remove();
+                continue;
+            }
+
+            accounts.put(Accounts.getAccountId(account), account);
         }
-        return instance;
+
+        checkAuthlibInjectorServerURLs();
+        checkAuthlibInjectorAccounts();
+        checkProfileMap();
+
+        save();
+
+        for (Map.Entry<String, Profile> entry2 : getProfileMap().entrySet()) {
+            entry2.getValue().setName(entry2.getKey());
+            entry2.getValue().nameProperty().setChangedListener(this::profileNameChanged);
+            entry2.getValue().addPropertyChangedListener(e -> save());
+        }
+
+        Lang.ignoringException(() -> Runtime.getRuntime().addShutdownHook(new Thread(this::save)));
+    }
+
+    private Config initSettings() {
+        Config c = new Config();
+        if (SETTINGS_FILE.exists())
+            try {
+                String str = FileUtils.readText(SETTINGS_FILE);
+                if (StringUtils.isBlank(str))
+                    Logging.LOG.finer("Settings file is empty, use the default settings.");
+                else {
+                    Config d = GSON.fromJson(str, Config.class);
+                    if (d != null)
+                        c = d;
+                }
+                Logging.LOG.finest("Initialized settings.");
+            } catch (Exception e) {
+                Logging.LOG.log(Level.WARNING, "Something happened wrongly when load settings.", e);
+            }
+        return c;
+    }
+
+    public void save() {
+        try {
+            SETTINGS.getAccounts().clear();
+            for (Account account : accounts.values()) {
+                Map<Object, Object> storage = account.toStorage();
+                storage.put("type", Accounts.getAccountType(account));
+                SETTINGS.getAccounts().add(storage);
+            }
+
+            FileUtils.writeText(SETTINGS_FILE, GSON.toJson(SETTINGS));
+        } catch (IOException ex) {
+            Logging.LOG.log(Level.SEVERE, "Failed to save config", ex);
+        }
+    }
+
+    private final StringProperty commonPath = new ImmediateStringProperty(this, "commonPath", SETTINGS.getCommonDirectory()) {
+        @Override
+        public void invalidated() {
+            super.invalidated();
+
+            SETTINGS.setCommonDirectory(get());
+            save();
+        }
+    };
+
+    public String getCommonPath() {
+        return commonPath.get();
+    }
+
+    public StringProperty commonPathProperty() {
+        return commonPath;
+    }
+
+    public void setCommonPath(String commonPath) {
+        this.commonPath.set(commonPath);
+    }
+
+    private Locales.SupportedLocale locale = Locales.getLocaleByName(SETTINGS.getLocalization());
+
+    public Locales.SupportedLocale getLocale() {
+        return locale;
+    }
+
+    public void setLocale(Locales.SupportedLocale locale) {
+        this.locale = locale;
+        SETTINGS.setLocalization(Locales.getNameByLocale(locale));
+        save();
+    }
+
+    private Proxy proxy = Proxy.NO_PROXY;
+
+    public Proxy getProxy() {
+        return proxy;
+    }
+
+    private Proxy.Type proxyType = Proxies.getProxyType(SETTINGS.getProxyType());
+
+    public Proxy.Type getProxyType() {
+        return proxyType;
+    }
+
+    public void setProxyType(Proxy.Type proxyType) {
+        this.proxyType = proxyType;
+        SETTINGS.setProxyType(Proxies.PROXIES.indexOf(proxyType));
+        save();
+        loadProxy();
+    }
+
+    public String getProxyHost() {
+        return SETTINGS.getProxyHost();
+    }
+
+    public void setProxyHost(String proxyHost) {
+        SETTINGS.setProxyHost(proxyHost);
+        save();
+    }
+
+    public String getProxyPort() {
+        return SETTINGS.getProxyPort();
+    }
+
+    public void setProxyPort(String proxyPort) {
+        SETTINGS.setProxyPort(proxyPort);
+        save();
+    }
+
+    public String getProxyUser() {
+        return SETTINGS.getProxyUser();
+    }
+
+    public void setProxyUser(String proxyUser) {
+        SETTINGS.setProxyUser(proxyUser);
+        save();
+    }
+
+    public String getProxyPass() {
+        return SETTINGS.getProxyPass();
+    }
+
+    public void setProxyPass(String proxyPass) {
+        SETTINGS.setProxyPass(proxyPass);
+        save();
+    }
+
+    public boolean hasProxy() { return SETTINGS.isHasProxy(); }
+
+    public void setHasProxy(boolean hasProxy) {
+        SETTINGS.setHasProxy(hasProxy);
+        save();
+    }
+
+    public boolean hasProxyAuth() { return SETTINGS.isHasProxyAuth(); }
+
+    public void setHasProxyAuth(boolean hasProxyAuth) {
+        SETTINGS.setHasProxyAuth(hasProxyAuth);
+        save();
+    }
+
+    private void loadProxy() {
+        String host = getProxyHost();
+        Integer port = Lang.toIntOrNull(getProxyPort());
+        if (!hasProxy() || StringUtils.isBlank(host) || port == null || getProxyType() == Proxy.Type.DIRECT)
+            proxy = Proxy.NO_PROXY;
+        else {
+            System.setProperty("http.proxyHost", getProxyHost());
+            System.setProperty("http.proxyPort", getProxyPort());
+            proxy = new Proxy(proxyType, new InetSocketAddress(host, port));
+
+            String user = getProxyUser();
+            String pass = getProxyPass();
+            if (hasProxyAuth() && StringUtils.isNotBlank(user) && StringUtils.isNotBlank(pass)) {
+                System.setProperty("http.proxyUser", user);
+                System.setProperty("http.proxyPassword", pass);
+
+                Authenticator.setDefault(new Authenticator() {
+                    @Override
+                    public PasswordAuthentication getPasswordAuthentication() {
+                        return new PasswordAuthentication(user, pass.toCharArray());
+                    }
+                });
+            }
+        }
+    }
+
+    public Font getFont() {
+        return Font.font(SETTINGS.getFontFamily(), SETTINGS.getFontSize());
+    }
+
+    public void setFont(Font font) {
+        SETTINGS.setFontFamily(font.getFamily());
+        SETTINGS.setFontSize(font.getSize());
+        save();
+    }
+
+    public int getLogLines() {
+        return Math.max(SETTINGS.getLogLines(), 100);
+    }
+
+    public void setLogLines(int logLines) {
+        SETTINGS.setLogLines(logLines);
+        save();
+    }
+
+    /****************************************
+     *           AUTHLIB INJECTORS          *
+     ****************************************/
+
+    public Set<String> getAuthlibInjectorServerURLs() {
+        return SETTINGS.getAuthlibInjectorServerURLs();
+    }
+
+    public void removeAuthlibInjectorServerURL(String serverURL) {
+        checkAuthlibInjectorServerURLs();
+
+        SETTINGS.getAuthlibInjectorServerURLs().remove(serverURL);
+
+        checkAuthlibInjectorAccounts();
+        save();
+    }
+
+    public void addAuthlibInjectorServerURL(String serverURL) {
+        checkAuthlibInjectorServerURLs();
+
+        SETTINGS.getAuthlibInjectorServerURLs().add(serverURL);
+        save();
+    }
+
+    private void checkAuthlibInjectorServerURLs() {
+        if (SETTINGS.getAuthlibInjectorServerURLs() == null) {
+            SETTINGS.setAuthlibInjectorServerURLs(new HashSet<>());
+            save();
+        }
+    }
+
+    private void checkAuthlibInjectorAccounts() {
+        for (Account account : getAccounts()) {
+            if (account instanceof AuthlibInjectorAccount) {
+                AuthlibInjectorAccount injectorAccount = (AuthlibInjectorAccount) account;
+                if (!SETTINGS.getAuthlibInjectorServerURLs().contains(injectorAccount.getServerBaseURL()))
+                    deleteAccount(account);
+            }
+        }
+    }
+
+    /****************************************
+     *        DOWNLOAD PROVIDERS            *
+     ****************************************/
+
+    public DownloadProvider getDownloadProvider() {
+        return DownloadProviders.getDownloadProvider(SETTINGS.getDownloadType());
+    }
+
+    public void setDownloadProvider(DownloadProvider downloadProvider) {
+        int index = DownloadProviders.DOWNLOAD_PROVIDERS.indexOf(downloadProvider);
+        if (index == -1)
+            throw new IllegalArgumentException("Unknown download provider: " + downloadProvider);
+        SETTINGS.setDownloadType(index);
+        save();
+    }
+
+    /****************************************
+     *               ACCOUNTS               *
+     ****************************************/
+
+    private final ImmediateObjectProperty<Account> selectedAccount = new ImmediateObjectProperty<Account>(this, "selectedAccount", accounts.get(SETTINGS.getSelectedAccount())) {
+        @Override
+        public Account get() {
+            Account a = super.get();
+            if (a == null || !accounts.containsKey(Accounts.getAccountId(a))) {
+                Account acc = accounts.values().stream().findAny().orElse(null);
+                set(acc);
+                return acc;
+            } else return a;
+        }
+
+        @Override
+        public void set(Account newValue) {
+            if (newValue == null || accounts.containsKey(Accounts.getAccountId(newValue))) {
+                super.set(newValue);
+            }
+        }
+
+        @Override
+        public void invalidated() {
+            super.invalidated();
+
+            SETTINGS.setSelectedAccount(getValue() == null ? "" : Accounts.getAccountId(getValue()));
+            save();
+        }
+    };
+
+    public Account getSelectedAccount() {
+        return selectedAccount.get();
+    }
+
+    public ObjectProperty<Account> selectedAccountProperty() {
+        return selectedAccount;
+    }
+
+    public void setSelectedAccount(Account selectedAccount) {
+        this.selectedAccount.set(selectedAccount);
+    }
+
+    public void addAccount(Account account) {
+        accounts.put(Accounts.getAccountId(account), account);
+        onAccountLoading();
+    }
+
+    public Account getAccount(String name, String character) {
+        return accounts.get(Accounts.getAccountId(name, character));
+    }
+
+    public Collection<Account> getAccounts() {
+        return Collections.unmodifiableCollection(accounts.values());
+    }
+
+    public void deleteAccount(String name, String character) {
+        accounts.remove(Accounts.getAccountId(name, character));
+
+        onAccountLoading();
+        selectedAccount.get();
+    }
+
+    public void deleteAccount(Account account) {
+        accounts.remove(Accounts.getAccountId(account));
+
+        onAccountLoading();
+        selectedAccount.get();
+    }
+
+    /****************************************
+     *              BACKGROUND              *
+     ****************************************/
+
+    private final ImmediateStringProperty backgroundImage = new ImmediateStringProperty(this, "backgroundImage", SETTINGS.getBackgroundImage()) {
+        @Override
+        public void invalidated() {
+            super.invalidated();
+
+            SETTINGS.setBackgroundImage(get());
+            save();
+        }
+    };
+
+    public String getBackgroundImage() {
+        return backgroundImage.get();
+    }
+
+    public ImmediateStringProperty backgroundImageProperty() {
+        return backgroundImage;
+    }
+
+    public void setBackgroundImage(String backgroundImage) {
+        this.backgroundImage.set(backgroundImage);
+    }
+
+    private final ImmediateObjectProperty<EnumBackgroundImage> backgroundImageType = new ImmediateObjectProperty<EnumBackgroundImage>(this, "backgroundImageType", EnumBackgroundImage.indexOf(SETTINGS.getBackgroundImageType())) {
+        @Override
+        public void invalidated() {
+            super.invalidated();
+
+            SETTINGS.setBackgroundImageType(get().ordinal());
+            save();
+        }
+    };
+
+    public EnumBackgroundImage getBackgroundImageType() {
+        return backgroundImageType.get();
+    }
+
+    public ImmediateObjectProperty<EnumBackgroundImage> backgroundImageTypeProperty() {
+        return backgroundImageType;
+    }
+
+    public void setBackgroundImageType(EnumBackgroundImage backgroundImageType) {
+        this.backgroundImageType.set(backgroundImageType);
+    }
+
+    /****************************************
+     *                THEME                 *
+     ****************************************/
+
+    private final ImmediateObjectProperty<Theme> theme = new ImmediateObjectProperty<Theme>(this, "theme", Theme.getTheme(SETTINGS.getTheme()).orElse(Theme.BLUE)) {
+        @Override
+        public void invalidated() {
+            super.invalidated();
+
+            SETTINGS.setTheme(get().getName().toLowerCase());
+            save();
+        }
+    };
+
+    public Theme getTheme() {
+        return theme.get();
+    }
+
+    public void setTheme(Theme theme) {
+        this.theme.set(theme);
+    }
+
+    public ImmediateObjectProperty<Theme> themeProperty() {
+        return theme;
+    }
+
+    /****************************************
+     *               PROFILES               *
+     ****************************************/
+
+    public Profile getSelectedProfile() {
+        checkProfileMap();
+
+        if (!hasProfile(SETTINGS.getSelectedProfile())) {
+            getProfileMap().keySet().stream().findFirst().ifPresent(selectedProfile -> {
+                SETTINGS.setSelectedProfile(selectedProfile);
+                save();
+            });
+            Schedulers.computation().schedule(this::onProfileChanged);
+        }
+        return getProfile(SETTINGS.getSelectedProfile());
+    }
+
+    public void setSelectedProfile(Profile selectedProfile) {
+        if (hasProfile(selectedProfile.getName()) && !Objects.equals(selectedProfile.getName(), SETTINGS.getSelectedProfile())) {
+            SETTINGS.setSelectedProfile(selectedProfile.getName());
+            save();
+            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 SETTINGS.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);
+
+        save();
+    }
+
+    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()) {
+            getProfileMap().put(DEFAULT_PROFILE, new Profile(DEFAULT_PROFILE));
+            getProfileMap().put(HOME_PROFILE, new Profile(HOME_PROFILE, Launcher.MINECRAFT_DIRECTORY));
+        }
+    }
+
+    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));
     }
 
     /**
-     * Should be called from {@link ConfigHolder#init()}.
+     * Start profiles loading process.
+     * Invoked by loading GUI phase.
      */
-    static void init() {
-        instance = new Settings();
+    public void onProfileLoading() {
+        EventBus.EVENT_BUS.fireEvent(new ProfileLoadingEvent(this, getProfiles()));
+        onProfileChanged();
     }
 
-    private Settings() {
-        DownloadProviders.init();
-        ProxyManager.init();
-        Accounts.init();
-        Profiles.init();
-
-        CacheRepository.setInstance(HMCLCacheRepository.REPOSITORY);
-        HMCLCacheRepository.REPOSITORY.directoryProperty().bind(Bindings.createStringBinding(() -> {
-            if (FileUtils.canCreateDirectory(getCommonDirectory())) {
-                return getCommonDirectory();
-            } else {
-                return getDefaultCommonDirectory();
-            }
-        }, config().commonDirectoryProperty(), config().commonDirTypeProperty()));
+    public void onAccountLoading() {
+        EventBus.EVENT_BUS.fireEvent(new AccountLoadingEvent(this, getAccounts()));
     }
 
-    public static String getDefaultCommonDirectory() {
-        return Metadata.MINECRAFT_DIRECTORY.toString();
-    }
-
-    public String getCommonDirectory() {
-        switch (config().getCommonDirType()) {
-            case DEFAULT:
-                return getDefaultCommonDirectory();
-            case CUSTOM:
-                return config().getCommonDirectory();
-            default:
-                return null;
-        }
+    public Config getRawConfig() {
+        return SETTINGS.clone();
     }
 }

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
  *
  * This 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,41 +13,31 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.setting;
 
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.ObjectBinding;
 import javafx.scene.paint.Color;
-
+import org.jackhuang.hmcl.util.FileUtils;
+import org.jackhuang.hmcl.util.IOUtils;
 import org.jackhuang.hmcl.util.Logging;
-import org.jackhuang.hmcl.util.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");
+    public static final Theme DARK_BLUE = new Theme("dark_blue", "#283593");
+    public static final Theme GREEN = new Theme("green", "#43A047");
+    public static final Theme ORANGE = new Theme("orange", "#E67E22");
+    public static final Theme PURPLE = new Theme("purple", "#9C27B0");
+    public static final Theme RED = new Theme("red", "#F44336");
 
-    public static final Color[] SUGGESTED_COLORS = new Color[]{
-            Color.web("#5C6BC0"), // blue
-            Color.web("#283593"), // dark blue
-            Color.web("#43A047"), // green
-            Color.web("#E67E22"), // orange
-            Color.web("#9C27B0"), // purple
-            Color.web("#B71C1C")  // red
-    };
+    public static final Theme[] VALUES = new Theme[]{BLUE, DARK_BLUE, GREEN, ORANGE, PURPLE, RED};
 
     private final String color;
     private final String name;
@@ -78,21 +68,23 @@ public class Theme {
     }
 
     public String[] getStylesheets() {
-        String css;
+        String name = isCustom() ? BLUE.getName() : this.name;
+        String css = Theme.class.getResource("/assets/css/" + name + ".css").toExternalForm();
         try {
             File temp = File.createTempFile("hmcl", ".css");
             FileUtils.writeText(temp, IOUtils.readFullyAsString(Theme.class.getResourceAsStream("/assets/css/custom.css"))
                     .replace("%base-color%", color)
                     .replace("%font-color%", getColorDisplayName(getForegroundColor())));
             css = temp.toURI().toString();
-        } catch (IOException | NullPointerException e) {
-            Logging.LOG.log(Level.SEVERE, "Unable to create theme stylesheet. Fallback to blue theme.", e);
-            css = "/assets/css/blue.css";
+        } catch (IOException e) {
+            Logging.LOG.log(Level.SEVERE, "Unable to create theme stylesheet", e);
         }
 
         return new String[]{
+                Theme.class.getResource("/css/jfoenix-fonts.css").toExternalForm(),
+                Theme.class.getResource("/css/jfoenix-design.css").toExternalForm(),
                 css,
-                "/assets/css/root.css"
+                Theme.class.getResource("/assets/css/root.css").toExternalForm()
         };
     }
 
@@ -105,18 +97,10 @@ 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"));
+
+        for (Theme theme : VALUES)
+            if (theme.name.equalsIgnoreCase(name))
+                return Optional.of(theme);
 
         if (name.startsWith("#"))
             try {
@@ -133,8 +117,7 @@ public class Theme {
     }
 
     public static ObjectBinding<Color> foregroundFillBinding() {
-        return BindingMapping.of(config().themeProperty())
-                .map(Theme::getForegroundColor);
+        return Bindings.createObjectBinding(() -> Settings.INSTANCE.getTheme().getForegroundColor(), Settings.INSTANCE.themeProperty());
     }
 
     public static ObjectBinding<Color> blackFillBinding() {
@@ -144,16 +127,4 @@ public class Theme {
     public static ObjectBinding<Color> whiteFillBinding() {
         return Bindings.createObjectBinding(() -> Color.WHITE);
     }
-
-    public static class TypeAdapter extends com.google.gson.TypeAdapter<Theme> {
-        @Override
-        public void write(JsonWriter out, Theme value) throws IOException {
-            out.value(value.getName().toLowerCase());
-        }
-
-        @Override
-        public Theme read(JsonReader in) throws IOException {
-            return getTheme(in.nextString()).orElse(Theme.BLUE);
-        }
-    }
 }

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
  *
  * This 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,44 +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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.setting;
 
 import com.google.gson.*;
-import com.google.gson.annotations.JsonAdapter;
-
 import javafx.beans.InvalidationListener;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.IntegerProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleIntegerProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-
-import org.jackhuang.hmcl.Metadata;
+import org.jackhuang.hmcl.Launcher;
 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;
 
 /**
  *
  * @author huangyuhui
  */
-@JsonAdapter(VersionSetting.Serializer.class)
 public final class VersionSetting {
 
     public transient String id;
@@ -65,9 +46,9 @@ public final class VersionSetting {
         this.global = global;
     }
 
-    private final BooleanProperty usesGlobalProperty = new SimpleBooleanProperty(this, "usesGlobal", false);
+    private final ImmediateBooleanProperty usesGlobalProperty = new ImmediateBooleanProperty(this, "usesGlobal", false);
 
-    public BooleanProperty usesGlobalProperty() {
+    public ImmediateBooleanProperty usesGlobalProperty() {
         return usesGlobalProperty;
     }
 
@@ -89,14 +70,14 @@ public final class VersionSetting {
 
     // java
 
-    private final StringProperty javaProperty = new SimpleStringProperty(this, "java", "");
+    private final ImmediateStringProperty javaProperty = new ImmediateStringProperty(this, "java", "");
 
-    public StringProperty javaProperty() {
+    public ImmediateStringProperty javaProperty() {
         return javaProperty;
     }
 
     /**
-     * Java version or "Custom" if user customizes java directory, "Default" if the jvm that this app relies on.
+     * Java version or null if user customizes java directory.
      */
     public String getJava() {
         return javaProperty.get();
@@ -106,32 +87,9 @@ public final class VersionSetting {
         javaProperty.set(java);
     }
 
-    public boolean isUsesCustomJavaDir() {
-        return "Custom".equals(getJava());
-    }
+    private final ImmediateStringProperty javaDirProperty = new ImmediateStringProperty(this, "javaDir", "");
 
-    public void setUsesCustomJavaDir() {
-        setJava("Custom");
-        setDefaultJavaPath(null);
-    }
-
-    private final StringProperty defaultJavaPathProperty = new SimpleStringProperty(this, "defaultJavaPath", "");
-
-    /**
-     * Path to Java executable, or null if user customizes java directory.
-     * It's used to determine which JRE to use when multiple JREs match the selected Java version.
-     */
-    public String getDefaultJavaPath() {
-        return defaultJavaPathProperty.get();
-    }
-
-    public void setDefaultJavaPath(String defaultJavaPath) {
-        defaultJavaPathProperty.set(defaultJavaPath);
-    }
-
-    private final StringProperty javaDirProperty = new SimpleStringProperty(this, "javaDir", "");
-
-    public StringProperty javaDirProperty() {
+    public ImmediateStringProperty javaDirProperty() {
         return javaDirProperty;
     }
 
@@ -146,9 +104,9 @@ public final class VersionSetting {
         javaDirProperty.set(javaDir);
     }
 
-    private final StringProperty wrapperProperty = new SimpleStringProperty(this, "wrapper", "");
+    private final ImmediateStringProperty wrapperProperty = new ImmediateStringProperty(this, "wrapper", "");
 
-    public StringProperty wrapperProperty() {
+    public ImmediateStringProperty wrapperProperty() {
         return wrapperProperty;
     }
 
@@ -163,9 +121,9 @@ public final class VersionSetting {
         wrapperProperty.set(wrapper);
     }
 
-    private final StringProperty permSizeProperty = new SimpleStringProperty(this, "permSize", "");
+    private final ImmediateStringProperty permSizeProperty = new ImmediateStringProperty(this, "permSize", "");
 
-    public StringProperty permSizeProperty() {
+    public ImmediateStringProperty permSizeProperty() {
         return permSizeProperty;
     }
 
@@ -180,9 +138,9 @@ public final class VersionSetting {
         permSizeProperty.set(permSize);
     }
 
-    private final IntegerProperty maxMemoryProperty = new SimpleIntegerProperty(this, "maxMemory", OperatingSystem.SUGGESTED_MEMORY);
+    private final ImmediateIntegerProperty maxMemoryProperty = new ImmediateIntegerProperty(this, "maxMemory", OperatingSystem.SUGGESTED_MEMORY);
 
-    public IntegerProperty maxMemoryProperty() {
+    public ImmediateIntegerProperty maxMemoryProperty() {
         return maxMemoryProperty;
     }
 
@@ -200,9 +158,9 @@ public final class VersionSetting {
     /**
      * The minimum memory that JVM can allocate for heap.
      */
-    private final ObjectProperty<Integer> minMemoryProperty = new SimpleObjectProperty<>(this, "minMemory", null);
+    private final ImmediateObjectProperty<Integer> minMemoryProperty = new ImmediateObjectProperty<>(this, "minMemory", null);
 
-    public ObjectProperty<Integer> minMemoryProperty() {
+    public ImmediateObjectProperty<Integer> minMemoryProperty() {
         return minMemoryProperty;
     }
 
@@ -214,9 +172,9 @@ public final class VersionSetting {
         minMemoryProperty.set(minMemory);
     }
 
-    private final StringProperty preLaunchCommandProperty = new SimpleStringProperty(this, "precalledCommand", "");
+    private final ImmediateStringProperty preLaunchCommandProperty = new ImmediateStringProperty(this, "precalledCommand", "");
 
-    public StringProperty preLaunchCommandProperty() {
+    public ImmediateStringProperty preLaunchCommandProperty() {
         return preLaunchCommandProperty;
     }
 
@@ -234,9 +192,9 @@ public final class VersionSetting {
 
     // options
 
-    private final StringProperty javaArgsProperty = new SimpleStringProperty(this, "javaArgs", "");
+    private final ImmediateStringProperty javaArgsProperty = new ImmediateStringProperty(this, "javaArgs", "");
 
-    public StringProperty javaArgsProperty() {
+    public ImmediateStringProperty javaArgsProperty() {
         return javaArgsProperty;
     }
 
@@ -251,9 +209,9 @@ public final class VersionSetting {
         javaArgsProperty.set(javaArgs);
     }
 
-    private final StringProperty minecraftArgsProperty = new SimpleStringProperty(this, "minecraftArgs", "");
+    private final ImmediateStringProperty minecraftArgsProperty = new ImmediateStringProperty(this, "minecraftArgs", "");
 
-    public StringProperty minecraftArgsProperty() {
+    public ImmediateStringProperty minecraftArgsProperty() {
         return minecraftArgsProperty;
     }
 
@@ -268,9 +226,9 @@ public final class VersionSetting {
         minecraftArgsProperty.set(minecraftArgs);
     }
 
-    private final BooleanProperty noJVMArgsProperty = new SimpleBooleanProperty(this, "noJVMArgs", false);
+    private final ImmediateBooleanProperty noJVMArgsProperty = new ImmediateBooleanProperty(this, "noJVMArgs", false);
 
-    public BooleanProperty noJVMArgsProperty() {
+    public ImmediateBooleanProperty noJVMArgsProperty() {
         return noJVMArgsProperty;
     }
 
@@ -285,26 +243,9 @@ public final class VersionSetting {
         noJVMArgsProperty.set(noJVMArgs);
     }
 
-    private final BooleanProperty notCheckJVMProperty = new SimpleBooleanProperty(this, "notCheckJVM", false);
+    private final ImmediateBooleanProperty notCheckGameProperty = new ImmediateBooleanProperty(this, "notCheckGame", false);
 
-    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() {
+    public ImmediateBooleanProperty notCheckGameProperty() {
         return notCheckGameProperty;
     }
 
@@ -319,9 +260,26 @@ public final class VersionSetting {
         notCheckGameProperty.set(notCheckGame);
     }
 
-    private final BooleanProperty showLogsProperty = new SimpleBooleanProperty(this, "showLogs", false);
+    private final ImmediateBooleanProperty noCommonProperty = new ImmediateBooleanProperty(this, "noCommon", false);
 
-    public BooleanProperty showLogsProperty() {
+    public ImmediateBooleanProperty noCommonProperty() {
+        return noCommonProperty;
+    }
+
+    /**
+     * True if HMCL does not find/download libraries in/to common path.
+     */
+    public boolean isNoCommon() {
+        return noCommonProperty.get();
+    }
+
+    public void setNoCommon(boolean noCommon) {
+        noCommonProperty.set(noCommon);
+    }
+
+    private final ImmediateBooleanProperty showLogsProperty = new ImmediateBooleanProperty(this, "showLogs", false);
+
+    public ImmediateBooleanProperty showLogsProperty() {
         return showLogsProperty;
     }
 
@@ -338,14 +296,14 @@ public final class VersionSetting {
 
     // Minecraft settings.
 
-    private final StringProperty serverIpProperty = new SimpleStringProperty(this, "serverIp", "");
+    private final ImmediateStringProperty serverIpProperty = new ImmediateStringProperty(this, "serverIp", "");
 
-    public StringProperty serverIpProperty() {
+    public ImmediateStringProperty serverIpProperty() {
         return serverIpProperty;
     }
 
     /**
-     * The server ip that will be entered after Minecraft successfully loaded ly.
+     * The server ip that will be entered after Minecraft successfully loaded immediately.
      *
      * Format: ip:port or without port.
      */
@@ -358,9 +316,9 @@ public final class VersionSetting {
     }
 
 
-    private final BooleanProperty fullscreenProperty = new SimpleBooleanProperty(this, "fullscreen", false);
+    private final ImmediateBooleanProperty fullscreenProperty = new ImmediateBooleanProperty(this, "fullscreen", false);
 
-    public BooleanProperty fullscreenProperty() {
+    public ImmediateBooleanProperty fullscreenProperty() {
         return fullscreenProperty;
     }
 
@@ -375,9 +333,9 @@ public final class VersionSetting {
         fullscreenProperty.set(fullscreen);
     }
 
-    private final IntegerProperty widthProperty = new SimpleIntegerProperty(this, "width", 854);
+    private final ImmediateIntegerProperty widthProperty = new ImmediateIntegerProperty(this, "width", 854);
 
-    public IntegerProperty widthProperty() {
+    public ImmediateIntegerProperty widthProperty() {
         return widthProperty;
     }
 
@@ -397,9 +355,9 @@ public final class VersionSetting {
     }
 
 
-    private final IntegerProperty heightProperty = new SimpleIntegerProperty(this, "height", 480);
+    private final ImmediateIntegerProperty heightProperty = new ImmediateIntegerProperty(this, "height", 480);
 
-    public IntegerProperty heightProperty() {
+    public ImmediateIntegerProperty heightProperty() {
         return heightProperty;
     }
 
@@ -422,9 +380,9 @@ public final class VersionSetting {
      * 0 - .minecraft<br/>
      * 1 - .minecraft/versions/&lt;version&gt;/<br/>
      */
-    private final ObjectProperty<EnumGameDirectory> gameDirTypeProperty = new SimpleObjectProperty<>(this, "gameDirType", EnumGameDirectory.ROOT_FOLDER);
+    private final ImmediateObjectProperty<EnumGameDirectory> gameDirTypeProperty = new ImmediateObjectProperty<>(this, "gameDirType", EnumGameDirectory.ROOT_FOLDER);
 
-    public ObjectProperty<EnumGameDirectory> gameDirTypeProperty() {
+    public ImmediateObjectProperty<EnumGameDirectory> gameDirTypeProperty() {
         return gameDirTypeProperty;
     }
 
@@ -439,9 +397,9 @@ public final class VersionSetting {
     /**
      * Your custom gameDir
      */
-    private final StringProperty gameDirProperty = new SimpleStringProperty(this, "gameDir", "");
+    private final ImmediateStringProperty gameDirProperty = new ImmediateStringProperty(this, "gameDir", "");
 
-    public StringProperty gameDirProperty() {
+    public ImmediateStringProperty gameDirProperty() {
         return gameDirProperty;
     }
 
@@ -460,9 +418,9 @@ public final class VersionSetting {
      * 1 - Hide the launcher when the game starts.<br/>
      * 2 - Keep the launcher open.<br/>
      */
-    private final ObjectProperty<LauncherVisibility> launcherVisibilityProperty = new SimpleObjectProperty<>(this, "launcherVisibility", LauncherVisibility.HIDE);
+    private final ImmediateObjectProperty<LauncherVisibility> launcherVisibilityProperty = new ImmediateObjectProperty<>(this, "launcherVisibility", LauncherVisibility.HIDE);
 
-    public ObjectProperty<LauncherVisibility> launcherVisibilityProperty() {
+    public ImmediateObjectProperty<LauncherVisibility> launcherVisibilityProperty() {
         return launcherVisibilityProperty;
     }
 
@@ -479,33 +437,22 @@ public final class VersionSetting {
         if (StringUtils.isBlank(getJava()))
             setJava(StringUtils.isBlank(getJavaDir()) ? "Default" : "Custom");
         if ("Default".equals(getJava())) return JavaVersion.fromCurrentEnvironment();
-        else if (isUsesCustomJavaDir()) {
+        else if ("Custom".equals(getJava())) {
             try {
-                return JavaVersion.fromExecutable(Paths.get(getJavaDir()));
+                return JavaVersion.fromExecutable(new File(getJavaDir()));
             } catch (IOException e) {
                 return null; // Custom Java Directory not found,
             }
         } else if (StringUtils.isNotBlank(getJava())) {
-            List<JavaVersion> matchedJava = JavaVersion.getJavas().stream()
-                    .filter(java -> java.getVersion().equals(getJava()))
-                    .collect(Collectors.toList());
-            if (matchedJava.isEmpty()) {
+            JavaVersion c = JavaVersion.getJREs().get(getJava());
+            if (c == null) {
                 setJava("Default");
                 return JavaVersion.fromCurrentEnvironment();
-            } else {
-                return matchedJava.stream()
-                        .filter(java -> java.getBinary().toString().equals(getDefaultJavaPath()))
-                        .findFirst()
-                        .orElse(matchedJava.get(0));
-            }
+            } else
+                return c;
         } else throw new Error();
     }
 
-    public void setJavaVersion(JavaVersion java) {
-        setJava(java.getVersion());
-        setDefaultJavaPath(java.getBinary().toString());
-    }
-
     public void addPropertyChangedListener(InvalidationListener listener) {
         usesGlobalProperty.addListener(listener);
         javaProperty.addListener(listener);
@@ -519,7 +466,7 @@ public final class VersionSetting {
         minecraftArgsProperty.addListener(listener);
         noJVMArgsProperty.addListener(listener);
         notCheckGameProperty.addListener(listener);
-        notCheckJVMProperty.addListener(listener);
+        noCommonProperty.addListener(listener);
         showLogsProperty.addListener(listener);
         serverIpProperty.addListener(listener);
         fullscreenProperty.addListener(listener);
@@ -528,16 +475,15 @@ public final class VersionSetting {
         gameDirTypeProperty.addListener(listener);
         gameDirProperty.addListener(listener);
         launcherVisibilityProperty.addListener(listener);
-        defaultJavaPathProperty.addListener(listener);
     }
 
     public LaunchOptions toLaunchOptions(File gameDir) throws InterruptedException {
         JavaVersion javaVersion = Optional.ofNullable(getJavaVersion()).orElse(JavaVersion.fromCurrentEnvironment());
-        LaunchOptions.Builder builder = new LaunchOptions.Builder()
+        return new LaunchOptions.Builder()
                 .setGameDir(gameDir)
                 .setJava(javaVersion)
-                .setVersionName(Metadata.TITLE)
-                .setProfileName(Metadata.TITLE)
+                .setVersionName(Launcher.TITLE)
+                .setProfileName(Launcher.TITLE)
                 .setMinecraftArgs(getMinecraftArgs())
                 .setJavaArgs(getJavaArgs())
                 .setMaxMemory(getMaxMemory())
@@ -548,20 +494,21 @@ public final class VersionSetting {
                 .setFullscreen(isFullscreen())
                 .setServerIp(getServerIp())
                 .setWrapper(getWrapper())
+                .setProxyHost(Settings.INSTANCE.getProxyHost())
+                .setProxyPort(Settings.INSTANCE.getProxyPort())
+                .setProxyUser(Settings.INSTANCE.getProxyUser())
+                .setProxyPass(Settings.INSTANCE.getProxyPass())
                 .setPrecalledCommand(getPreLaunchCommand())
-                .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();
+                .setNoGeneratedJVMArgs(isNoJVMArgs())
+                .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;
@@ -583,12 +530,11 @@ 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("noCommon", src.isNoCommon());
             obj.addProperty("showLogs", src.isShowLogs());
             obj.addProperty("gameDir", src.getGameDir());
             obj.addProperty("launcherVisibility", src.getLauncherVisibility().ordinal());
             obj.addProperty("gameDirType", src.getGameDirType().ordinal());
-            obj.addProperty("defaultJavaPath", src.getDefaultJavaPath());
 
             return obj;
         }
@@ -621,11 +567,10 @@ public final class VersionSetting {
             vs.setFullscreen(Optional.ofNullable(obj.get("fullscreen")).map(JsonElement::getAsBoolean).orElse(false));
             vs.setNoJVMArgs(Optional.ofNullable(obj.get("noJVMArgs")).map(JsonElement::getAsBoolean).orElse(false));
             vs.setNotCheckGame(Optional.ofNullable(obj.get("notCheckGame")).map(JsonElement::getAsBoolean).orElse(false));
-            vs.setNotCheckJVM(Optional.ofNullable(obj.get("notCheckJVM")).map(JsonElement::getAsBoolean).orElse(false));
+            vs.setNoCommon(Optional.ofNullable(obj.get("noCommon")).map(JsonElement::getAsBoolean).orElse(false));
             vs.setShowLogs(Optional.ofNullable(obj.get("showLogs")).map(JsonElement::getAsBoolean).orElse(false));
             vs.setLauncherVisibility(LauncherVisibility.values()[Optional.ofNullable(obj.get("launcherVisibility")).map(JsonElement::getAsInt).orElse(1)]);
             vs.setGameDirType(EnumGameDirectory.values()[Optional.ofNullable(obj.get("gameDirType")).map(JsonElement::getAsInt).orElse(0)]);
-            vs.setDefaultJavaPath(Optional.ofNullable(obj.get("defaultJavaPath")).map(JsonElement::getAsString).orElse(null));
 
             return vs;
         }
@@ -635,9 +580,7 @@ public final class VersionSetting {
         }
 
         private int parseJsonPrimitive(JsonPrimitive primitive, int defaultValue) {
-            if (primitive == null)
-                return defaultValue;
-            else if (primitive.isNumber())
+            if (primitive.isNumber())
                 return primitive.getAsInt();
             else
                 return Lang.parseInt(primitive.getAsString(), defaultValue);

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,42 +13,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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hmcl.ui.account;
+package org.jackhuang.hmcl.ui;
 
+import com.jfoenix.controls.JFXDialog;
 import com.jfoenix.controls.JFXPasswordField;
 import com.jfoenix.controls.JFXProgressBar;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
+import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.auth.Account;
 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.AddAccountPane;
 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;
+    private final Consumer<Region> closeConsumer;
 
-    @FXML private Label lblUsername;
+    @FXML
+    private Label lblUsername;
     @FXML private JFXPasswordField txtPassword;
     @FXML private Label lblCreationWarning;
     @FXML private JFXProgressBar progressBar;
 
-    public AccountLoginPane(Account oldAccount, Consumer<AuthInfo> success, Runnable failed) {
+    public AccountLoginPane(Account oldAccount, Consumer<Region> closeConsumer, Consumer<AuthInfo> success, Runnable failed) {
         this.oldAccount = oldAccount;
         this.success = success;
         this.failed = failed;
+        this.closeConsumer = closeConsumer;
 
         FXUtils.loadFXML(this, "/assets/fxml/account-login.fxml");
 
@@ -61,25 +63,30 @@ public class AccountLoginPane extends StackPane {
         String password = txtPassword.getText();
         progressBar.setVisible(true);
         lblCreationWarning.setText("");
-        Task.ofResult(() -> 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();
+        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));
+                closeConsumer.accept(this);
+            } else if (account instanceof NoSelectedCharacterException) {
+                closeConsumer.accept(this);
+            } else if (account instanceof Exception) {
+                lblCreationWarning.setText(AddAccountPane.accountException((Exception) account));
+            }
+
+            progressBar.setVisible(false);
+        });
     }
 
     @FXML
     private void onCancel() {
         failed.run();
-        fireEvent(new DialogCloseEvent());
+        closeConsumer.accept(this);
     }
 }

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

@@ -0,0 +1,152 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2017  huangyuhui <[email protected]>
+ *
+ * This 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.Launcher;
+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.game.AccountHelper;
+import org.jackhuang.hmcl.setting.Accounts;
+import org.jackhuang.hmcl.setting.Settings;
+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 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", Launcher.i18n("account") + " - " + account.getCharacter());
+
+        FXUtils.loadFXML(this, "/assets/fxml/account.fxml");
+
+        FXUtils.setLimitWidth(this, 300);
+        if (account instanceof AuthlibInjectorAccount) {
+            Accounts.getAuthlibInjectorServerNameAsync((AuthlibInjectorAccount) account)
+                    .subscribe(Schedulers.javafx(), variables -> lblServer.setText(variables.get("serverName")));
+            FXUtils.setLimitHeight(this, 182);
+        } else {
+            componentList.removeChildren(paneServer);
+
+            if (account instanceof OfflineAccount) {
+                componentList.removeChildren(paneEmail);
+                FXUtils.setLimitHeight(this, 110);
+            } else
+                FXUtils.setLimitHeight(this, 145);
+        }
+
+        btnDelete.setGraphic(SVG.delete(Theme.blackFillBinding(), 15, 15));
+        btnRefresh.setGraphic(SVG.refresh(Theme.blackFillBinding(), 15, 15));
+
+        lblCharacter.setText(account.getCharacter());
+        lblType.setText(AddAccountPane.accountType(account));
+        lblEmail.setText(account.getUsername());
+
+        btnRefresh.setVisible(account instanceof YggdrasilAccount);
+    }
+
+    @FXML
+    private void onDelete() {
+        Settings.INSTANCE.deleteAccount(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/AddAccountPane.java

@@ -0,0 +1,270 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2017  huangyuhui <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
+package org.jackhuang.hmcl.ui;
+
+import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.controls.*;
+import javafx.fxml.FXML;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+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.Region;
+import javafx.scene.layout.StackPane;
+import org.jackhuang.hmcl.Launcher;
+import org.jackhuang.hmcl.auth.*;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
+import org.jackhuang.hmcl.auth.offline.OfflineAccount;
+import org.jackhuang.hmcl.auth.yggdrasil.GameProfile;
+import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
+import org.jackhuang.hmcl.game.AccountHelper;
+import org.jackhuang.hmcl.setting.Accounts;
+import org.jackhuang.hmcl.setting.Settings;
+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.IconedItem;
+import org.jackhuang.hmcl.ui.construct.Validator;
+import org.jackhuang.hmcl.util.Logging;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CountDownLatch;
+import java.util.function.Consumer;
+import java.util.logging.Level;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class AddAccountPane extends StackPane {
+
+    @FXML private JFXTextField txtUsername;
+    @FXML private JFXPasswordField txtPassword;
+    @FXML private Label lblCreationWarning;
+    @FXML private Label lblPassword;
+    @FXML private JFXComboBox<String> cboType;
+    @FXML private JFXComboBox<TwoLineListItem> cboServers;
+    @FXML private JFXProgressBar progressBar;
+    @FXML private Label lblAddInjectorServer;
+    @FXML private Hyperlink linkAddInjectorServer;
+    @FXML private JFXDialogLayout layout;
+    @FXML private JFXButton btnAccept;
+    private final Consumer<Region> finalization;
+
+    public AddAccountPane(Consumer<Region> finalization) {
+        this.finalization = finalization;
+
+        FXUtils.loadFXML(this, "/assets/fxml/account-add.fxml");
+
+        loadServers();
+
+        cboType.getItems().setAll(Launcher.i18n("account.methods.offline"), Launcher.i18n("account.methods.yggdrasil"), Launcher.i18n("account.methods.authlib_injector"));
+        cboType.getSelectionModel().selectedIndexProperty().addListener((a, b, newValue) -> {
+            txtPassword.setVisible(newValue.intValue() != 0);
+            lblPassword.setVisible(newValue.intValue() != 0);
+            cboServers.setVisible(newValue.intValue() == 2);
+            linkAddInjectorServer.setVisible(newValue.intValue() == 2);
+            lblAddInjectorServer.setVisible(newValue.intValue() == 2);
+            validateAcceptButton();
+        });
+        cboType.getSelectionModel().select(0);
+
+        // These two lines can eliminate black, don't know why.
+        cboServers.getItems().setAll(new TwoLineListItem("", ""));
+        cboServers.getSelectionModel().select(0);
+
+        txtPassword.setOnAction(e -> onCreationAccept());
+        txtUsername.setOnAction(e -> onCreationAccept());
+        txtUsername.getValidators().add(new Validator(Launcher.i18n("input.email"), str -> !txtPassword.isVisible() || str.contains("@")));
+
+        txtUsername.textProperty().addListener(it -> validateAcceptButton());
+        txtPassword.textProperty().addListener(it -> validateAcceptButton());
+    }
+
+    private void validateAcceptButton() {
+        btnAccept.setDisable(!txtUsername.validate() || (cboType.getSelectionModel().getSelectedIndex() != 0 && !txtPassword.validate()));
+    }
+
+    private void loadServers() {
+        Task.ofResult("list", () -> Settings.INSTANCE.getAuthlibInjectorServerURLs().parallelStream()
+                .flatMap(serverURL -> {
+                    try {
+                        return Stream.of(new TwoLineListItem(Accounts.getAuthlibInjectorServerName(serverURL), serverURL));
+                    } catch (Exception e) {
+                        Logging.LOG.log(Level.WARNING, "Authlib-injector server root " + serverURL + " cannot be recognized.", e);
+                        return Stream.empty();
+                    }
+                })
+                .collect(Collectors.toList()))
+                .subscribe(Task.of(Schedulers.javafx(), variables -> {
+                    cboServers.getItems().setAll(variables.<Collection<TwoLineListItem>>get("list"));
+                    if (!cboServers.getItems().isEmpty())
+                        cboServers.getSelectionModel().select(0);
+                }));
+    }
+
+    @FXML
+    private void onCreationAccept() {
+        int type = cboType.getSelectionModel().getSelectedIndex();
+        String username = txtUsername.getText();
+        String password = txtPassword.getText();
+        String apiRoot = Optional.ofNullable(cboServers.getSelectionModel().getSelectedItem()).map(TwoLineListItem::getSubtitle).orElse(null);
+        progressBar.setVisible(true);
+        lblCreationWarning.setText("");
+        Task.ofResult("create_account", () -> {
+            AccountFactory<?> factory;
+            switch (type) {
+                case 0: factory = Accounts.ACCOUNT_FACTORY.get(Accounts.OFFLINE_ACCOUNT_KEY); break;
+                case 1: factory = Accounts.ACCOUNT_FACTORY.get(Accounts.YGGDRASIL_ACCOUNT_KEY); break;
+                case 2: factory = Accounts.ACCOUNT_FACTORY.get(Accounts.AUTHLIB_INJECTOR_ACCOUNT_KEY); break;
+                default: throw new Error();
+            }
+
+            return factory.create(new Selector(), username, password, apiRoot, Settings.INSTANCE.getProxy());
+        }).finalized(Schedulers.javafx(), variables -> {
+            Settings.INSTANCE.addAccount(variables.get("create_account"));
+            progressBar.setVisible(false);
+            finalization.accept(this);
+        }, exception -> {
+            if (exception instanceof NoSelectedCharacterException) {
+                finalization.accept(this);
+            } else {
+                lblCreationWarning.setText(accountException(exception));
+            }
+            progressBar.setVisible(false);
+        }).start();
+    }
+
+    @FXML
+    private void onCreationCancel() {
+        finalization.accept(this);
+    }
+
+    @FXML
+    private void onAddInjecterServer() {
+        finalization.accept(this);
+        Controllers.navigate(Controllers.getServersPage());
+    }
+
+    private void showSelector(Node node) {
+        getChildren().setAll(node);
+    }
+
+    private void closeSelector() {
+        getChildren().setAll(layout);
+    }
+
+    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;
+
+        {
+            setStyle("-fx-padding: 8px;");
+
+            cancel.setText(Launcher.i18n("button.cancel"));
+            StackPane.setAlignment(cancel, Pos.BOTTOM_RIGHT);
+            cancel.setOnMouseClicked(e -> latch.countDown());
+
+            listBox.startCategory(Launcher.i18n("account.choose"));
+
+            setCenter(listBox);
+
+            HBox hbox = new HBox();
+            hbox.setAlignment(Pos.CENTER_RIGHT);
+            hbox.getChildren().add(cancel);
+            setBottom(hbox);
+        }
+
+        @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;
+
+            for (GameProfile profile : names) {
+                Image image;
+                try {
+                    image = AccountHelper.getSkinImmediately(yggdrasilAccount, profile, 4, Settings.INSTANCE.getProxy());
+                } catch (Exception e) {
+                    image = FXUtils.DEFAULT_ICON;
+                }
+                ImageView portraitView = new ImageView();
+                portraitView.setSmooth(false);
+                if (image == FXUtils.DEFAULT_ICON)
+                    portraitView.setImage(FXUtils.DEFAULT_ICON);
+                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(() -> showSelector(this));
+
+            try {
+                latch.await();
+
+                if (selectedProfile == null)
+                    throw new NoSelectedCharacterException(account);
+
+                JFXUtilities.runInFX(AddAccountPane.this::closeSelector);
+
+                return selectedProfile;
+            } catch (InterruptedException ignore) {
+                throw new NoSelectedCharacterException(account);
+            }
+        }
+    }
+
+    public static String accountException(Exception exception) {
+        if (exception instanceof InvalidCredentialsException) {
+            return Launcher.i18n("account.failed.invalid_credentials");
+        } else if (exception instanceof NoCharacterException) {
+            return Launcher.i18n("account.failed.no_charactor");
+        } else if (exception instanceof ServerDisconnectException) {
+            return Launcher.i18n("account.failed.connect_authentication_server");
+        } else if (exception instanceof InvalidTokenException) {
+            return Launcher.i18n("account.failed.invalid_token");
+        } else if (exception instanceof InvalidPasswordException) {
+            return Launcher.i18n("account.failed.invalid_password");
+        } else {
+            return exception.getClass() + ": " + exception.getLocalizedMessage();
+        }
+    }
+
+    public static String accountType(Account account) {
+        if (account instanceof OfflineAccount) return Launcher.i18n("account.methods.offline");
+        else if (account instanceof AuthlibInjectorAccount) return Launcher.i18n("account.methods.authlib_injector");
+        else if (account instanceof YggdrasilAccount) return Launcher.i18n("account.methods.yggdrasil");
+        else throw new Error(Launcher.i18n("account.methods.no_method") + ": " + account);
+    }
+}

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
- *
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -13,39 +13,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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hmcl.ui.account;
+package org.jackhuang.hmcl.ui;
 
 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.auth.authlibinjector.AuthlibInjectorServerInfo;
 import org.jackhuang.hmcl.setting.Theme;
-import org.jackhuang.hmcl.ui.SVG;
 
 import java.util.function.Consumer;
 
 public final class AuthlibInjectorServerItem extends BorderPane {
-    private final AuthlibInjectorServer server;
+    private final AuthlibInjectorServerInfo info;
 
     private final Label lblServerName = new Label();
-    private final Label lblServerUrl = new Label();
+    private final Label lblServerIp = new Label();
 
-    public AuthlibInjectorServerItem(AuthlibInjectorServer server, Consumer<AuthlibInjectorServerItem> deleteCallback) {
-        this.server = server;
+    public AuthlibInjectorServerItem(AuthlibInjectorServerInfo info, Consumer<AuthlibInjectorServerItem> deleteCallback) {
+        this.info = info;
 
         lblServerName.setStyle("-fx-font-size: 15;");
-        lblServerUrl.setStyle("-fx-font-size: 10;");
+        lblServerIp.setStyle("-fx-font-size: 10;");
 
         VBox center = new VBox();
         BorderPane.setAlignment(center, Pos.CENTER);
-        center.getChildren().addAll(lblServerName, lblServerUrl);
+        center.getChildren().addAll(lblServerName, lblServerIp);
         setCenter(center);
 
         JFXButton right = new JFXButton();
@@ -57,11 +54,11 @@ public final class AuthlibInjectorServerItem extends BorderPane {
 
         setStyle("-fx-background-radius: 2; -fx-background-color: white; -fx-padding: 8;");
         JFXDepthManager.setDepth(this, 1);
-        lblServerName.textProperty().bind(Bindings.createStringBinding(server::getName, server));
-        lblServerUrl.setText(server.getUrl());
+        lblServerName.setText(info.getServerName());
+        lblServerIp.setText(info.getServerIp());
     }
 
-    public AuthlibInjectorServer getServer() {
-        return server;
+    public AuthlibInjectorServerInfo getInfo() {
+        return info;
     }
 }

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

@@ -0,0 +1,170 @@
+package org.jackhuang.hmcl.ui;
+
+import com.jfoenix.controls.*;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.fxml.FXML;
+import javafx.scene.Node;
+import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+import org.jackhuang.hmcl.Launcher;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServerInfo;
+import org.jackhuang.hmcl.setting.Accounts;
+import org.jackhuang.hmcl.setting.Settings;
+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.URLValidator;
+import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
+import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.NetworkUtils;
+
+import java.util.Collection;
+import java.util.logging.Level;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class AuthlibInjectorServersPage extends StackPane implements DecoratorPage {
+    private final StringProperty title = new SimpleStringProperty(this, "title", Launcher.i18n("account.injector.server"));
+
+    @FXML private ScrollPane scrollPane;
+    @FXML private StackPane addServerContainer;
+    @FXML private Label lblServerIp;
+    @FXML private Label lblServerName;
+    @FXML private Label lblCreationWarning;
+    @FXML private Label lblServerWarning;
+    @FXML private VBox listPane;
+    @FXML private JFXTextField txtServerIp;
+    @FXML private JFXDialogLayout addServerPane;
+    @FXML private JFXDialogLayout confirmServerPane;
+    @FXML private JFXDialog dialog;
+    @FXML private StackPane contentPane;
+    @FXML private JFXSpinner spinner;
+    @FXML private JFXProgressBar progressBar;
+    @FXML private JFXButton btnAddNext;
+
+    @FXML private URLValidator validatorURL;
+    @FXML private URLValidator validatorHttp;
+
+    private final TransitionHandler transitionHandler;
+
+    {
+        FXUtils.loadFXML(this, "/assets/fxml/authlib-injector-servers.fxml");
+        FXUtils.smoothScrolling(scrollPane);
+        transitionHandler = new TransitionHandler(addServerContainer);
+
+        getChildren().remove(dialog);
+        dialog.setDialogContainer(this);
+
+        validatorURL.setMessage(Launcher.i18n("input.url"));
+        validatorHttp.setMessage(Launcher.i18n("input.url.http"));
+
+        txtServerIp.textProperty().addListener((a, b, newValue) ->
+                btnAddNext.setDisable(!txtServerIp.validate()));
+
+        loading();
+    }
+
+    private void removeServer(AuthlibInjectorServerItem item) {
+        Settings.INSTANCE.removeAuthlibInjectorServerURL(item.getInfo().getServerIp());
+        loading();
+    }
+
+    private void loading() {
+        getChildren().remove(contentPane);
+        spinner.setVisible(true);
+
+        Task.ofResult("list", () -> Settings.INSTANCE.getAuthlibInjectorServerURLs().parallelStream()
+                .flatMap(serverURL -> {
+                    try {
+                        return Stream.of(new AuthlibInjectorServerItem(new AuthlibInjectorServerInfo(serverURL, Accounts.getAuthlibInjectorServerName(serverURL)), this::removeServer));
+                    } catch (Exception e) {
+                        Logging.LOG.log(Level.WARNING, "Authlib-injector server root " + serverURL + " cannot be recognized.", e);
+                        return Stream.empty();
+                    }
+                })
+                .collect(Collectors.toList()))
+                .subscribe(Task.of(Schedulers.javafx(), variables -> {
+                    listPane.getChildren().setAll(variables.<Collection<? extends Node>>get("list"));
+                    loadingCompleted();
+                }));
+    }
+
+    private void loadingCompleted() {
+        getChildren().add(contentPane);
+        spinner.setVisible(false);
+
+        if (Settings.INSTANCE.getAuthlibInjectorServerURLs().isEmpty())
+            onAdd();
+    }
+
+    @FXML
+    private void onAdd() {
+        transitionHandler.setContent(addServerPane, ContainerAnimations.NONE.getAnimationProducer());
+        txtServerIp.setText("");
+        addServerPane.setDisable(false);
+        progressBar.setVisible(false);
+        dialog.show();
+    }
+
+    @FXML
+    private void onAddCancel() {
+        dialog.close();
+    }
+
+    @FXML
+    private void onAddNext() {
+        String serverIp = txtServerIp.getText();
+        progressBar.setVisible(true);
+        addServerPane.setDisable(true);
+
+        Task.ofResult("serverName", () -> Accounts.getAuthlibInjectorServerName(serverIp))
+                .finalized(Schedulers.javafx(), (variables, isDependentsSucceeded) -> {
+                    progressBar.setVisible(false);
+                    addServerPane.setDisable(false);
+
+                    if (isDependentsSucceeded) {
+                        lblServerName.setText(variables.get("serverName"));
+                        lblServerIp.setText(txtServerIp.getText());
+
+                        lblServerWarning.setVisible("http".equals(NetworkUtils.toURL(serverIp).getProtocol()));
+
+                        transitionHandler.setContent(confirmServerPane, ContainerAnimations.SWIPE_LEFT.getAnimationProducer());
+                    } else
+                        lblCreationWarning.setText(variables.<Exception>get("lastException").getLocalizedMessage());
+                }).start();
+
+
+    }
+
+    @FXML
+    private void onAddPrev() {
+        transitionHandler.setContent(addServerPane, ContainerAnimations.SWIPE_RIGHT.getAnimationProducer());
+    }
+
+    @FXML
+    private void onAddFinish() {
+        String ip = txtServerIp.getText();
+        if (!ip.endsWith("/"))
+            ip += "/";
+        Settings.INSTANCE.addAuthlibInjectorServerURL(ip);
+        loading();
+        dialog.close();
+    }
+
+    public String getTitle() {
+        return title.get();
+    }
+
+    @Override
+    public StringProperty titleProperty() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title.set(title);
+    }
+}

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
- *
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
  * This 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,55 +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 <https://www.gnu.org/licenses/>.
+ * 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.JFXDialog;
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.image.Image;
 import javafx.scene.layout.Region;
 import javafx.stage.Stage;
 import org.jackhuang.hmcl.Launcher;
-import org.jackhuang.hmcl.Metadata;
-import org.jackhuang.hmcl.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.setting.Settings;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
-import org.jackhuang.hmcl.ui.account.AccountList;
-import org.jackhuang.hmcl.ui.account.AuthlibInjectorServersPage;
 import org.jackhuang.hmcl.ui.construct.InputDialogPane;
+import org.jackhuang.hmcl.ui.construct.MessageBox;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
-import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
-import org.jackhuang.hmcl.ui.construct.PopupMenu;
 import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane;
-import org.jackhuang.hmcl.ui.decorator.DecoratorController;
-import org.jackhuang.hmcl.ui.download.ModpackInstallWizardProvider;
-import org.jackhuang.hmcl.ui.profile.ProfileList;
-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.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 org.jackhuang.hmcl.util.JavaVersion;
+import org.jackhuang.hmcl.util.Lang;
 
-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.ui.FXUtils.runInFX;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class Controllers {
 
@@ -70,12 +44,9 @@ 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 DecoratorController decorator;
+    private static Decorator decorator;
 
     public static Scene getScene() {
         return scene;
@@ -92,40 +63,6 @@ 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)
@@ -141,49 +78,13 @@ public final class Controllers {
     }
 
     // FXThread
-    public static DecoratorController getDecorator() {
+    public static Decorator getDecorator() {
         return decorator;
     }
 
     public static MainPage getMainPage() {
-        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());
-                runInFX(() -> {
-                    if (profile == Profiles.getSelectedProfile())
-                        mainPage.getVersions().setAll(children);
-                });
-            });
-            Controllers.mainPage = mainPage;
-        }
+        if (mainPage == null)
+            mainPage = new MainPage();
         return mainPage;
     }
 
@@ -192,34 +93,32 @@ 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 DecoratorController(stage, getMainPage());
-        leftPaneController = new LeftPaneController();
-        decorator.getDecorator().drawerProperty().setAll(leftPaneController);
-
-        if (config().getCommonDirType() == EnumCommonDirectory.CUSTOM &&
-                !FileUtils.canCreateDirectory(config().getCommonDirectory())) {
-            config().setCommonDirType(EnumCommonDirectory.DEFAULT);
-            dialog(i18n("launcher.cache_directory.invalid"));
-        }
+        decorator = new Decorator(stage, getMainPage(), Launcher.TITLE, false, true);
+        decorator.showPage(null);
+        leftPaneController = new LeftPaneController(decorator.getLeftPane());
 
+        Settings.INSTANCE.onProfileLoading();
         Task.of(JavaVersion::initialize).start();
 
-        scene = new Scene(decorator.getDecorator(), 800, 519);
-        scene.getStylesheets().setAll(config().getTheme().getStylesheets());
+        decorator.setCustomMaximize(false);
+
+        scene = new Scene(decorator, 804, 521);
+        scene.getStylesheets().setAll(Settings.INSTANCE.getTheme().getStylesheets());
+        stage.setMinWidth(804);
+        stage.setMaxWidth(804);
+        stage.setMinHeight(521);
+        stage.setMaxHeight(521);
 
         stage.getIcons().add(new Image("/assets/img/icon.png"));
-        stage.setTitle(Metadata.TITLE);
+        stage.setTitle(Launcher.TITLE);
     }
 
     public static void dialog(Region content) {
-        if (decorator != null)
-            decorator.showDialog(content);
+        decorator.showDialog(content);
     }
 
     public static void dialog(String text) {
@@ -227,29 +126,23 @@ public final class Controllers {
     }
 
     public static void dialog(String text, String title) {
-        dialog(text, title, MessageType.INFORMATION);
+        dialog(text, title, MessageBox.INFORMATION_MESSAGE);
     }
 
-    public static void dialog(String text, String title, MessageType type) {
+    public static void dialog(String text, String title, int type) {
         dialog(text, title, type, null);
     }
 
-    public static void dialog(String text, String title, MessageType type, Runnable onAccept) {
-        dialog(new MessageDialogPane(text, title, type, onAccept));
+    public static void dialog(String text, String title, int type, Runnable onAccept) {
+        dialog(new MessageDialogPane(text, title, Controllers::closeDialog, type, onAccept));
     }
 
     public static void confirmDialog(String text, String title, Runnable onAccept, Runnable onCancel) {
-        dialog(new MessageDialogPane(text, title, onAccept, onCancel));
+        dialog(new MessageDialogPane(text, title, Controllers::closeDialog, onAccept, onCancel));
     }
 
-    public static InputDialogPane inputDialog(String text, FutureCallback<String> onResult) {
-        InputDialogPane pane = new InputDialogPane(text, onResult);
-        dialog(pane);
-        return pane;
-    }
-
-    public static Region taskDialog(TaskExecutor executor, String title) {
-        return taskDialog(executor, title, "");
+    public static void inputDialog(String text, Consumer<String> onResult) {
+        dialog(new InputDialogPane(text, Controllers::closeDialog, onResult));
     }
 
     public static Region taskDialog(TaskExecutor executor, String title, String subtitle) {
@@ -265,12 +158,20 @@ public final class Controllers {
         return pane;
     }
 
-    public static void navigate(Node node) {
-        decorator.getNavigator().navigate(node);
+    public static void closeDialog(Region content) {
+
+        decorator.closeDialog(content);
     }
 
-    public static boolean isStopped() {
-        return decorator == null;
+    public static void navigate(Node node) {
+        if (decorator.getNowPage() == node)
+            decorator.showPage(null);
+        else
+            decorator.showPage(node);
+    }
+
+    public static void showUpdate() {
+        getLeftPaneController().showUpdate();
     }
 
     public static void shutdown() {
@@ -281,8 +182,5 @@ 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) 2019  huangyuhui <[email protected]> and contributors
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
  *
  * This 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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.ui;
 
@@ -27,10 +27,7 @@ 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,10 +36,10 @@ public class CrashWindow extends Stage {
 
     public CrashWindow(String text) {
         Label lblCrash = new Label();
-        if (UpdateChecker.isOutdated())
-            lblCrash.setText(i18n("launcher.crash_out_dated"));
+        if (Launcher.UPDATE_CHECKER.isOutOfDate())
+            lblCrash.setText(Launcher.i18n("launcher.crash_out_dated"));
         else
-            lblCrash.setText(i18n("launcher.crash"));
+            lblCrash.setText(Launcher.i18n("launcher.crash"));
         lblCrash.setWrapText(true);
 
         TextArea textArea = new TextArea();
@@ -50,8 +47,8 @@ public class CrashWindow extends Stage {
         textArea.setEditable(false);
 
         Button btnContact = new Button();
-        btnContact.setText(i18n("launcher.contact"));
-        btnContact.setOnMouseClicked(event -> FXUtils.openLink(Metadata.CONTACT_URL));
+        btnContact.setText(Launcher.i18n("launcher.contact"));
+        btnContact.setOnMouseClicked(event -> FXUtils.openLink(Launcher.CONTACT));
         HBox box = new HBox();
         box.setStyle("-fx-padding: 8px;");
         box.getChildren().add(btnContact);
@@ -68,7 +65,7 @@ public class CrashWindow extends Stage {
         Scene scene = new Scene(pane, 800, 480);
         setScene(scene);
         getIcons().add(new Image("/assets/img/icon.png"));
-        setTitle(i18n("message.error"));
+        setTitle(Launcher.i18n("message.error"));
 
         setOnCloseRequest(e -> System.exit(1));
     }

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

@@ -0,0 +1,652 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ *
+ * This 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.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.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.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 org.jackhuang.hmcl.Launcher;
+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.StackContainerPane;
+import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogWizardDisplayer;
+import org.jackhuang.hmcl.ui.wizard.*;
+import org.jackhuang.hmcl.util.FileUtils;
+import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.StringUtils;
+
+import java.io.File;
+import java.util.Queue;
+import java.util.Random;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+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 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 final JFXDialog dialog;
+
+    private double xOffset, yOffset, newX, newY, initX, initY;
+    private boolean allowMove, isDragging, maximized;
+    private BoundingBox originalBox, maximizedBox;
+    private final TransitionHandler animationHandler;
+    private final StackContainerPane dialogPane = new StackContainerPane();
+
+    @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;
+
+    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();
+        });
+
+        dialog = new JFXDialog();
+        dialog.setOverlayClose(false);
+        drawerWrapper.getChildren().add(0, dialog);
+        dialog.setDialogContainer(drawerWrapper);
+        dialog.setContent(dialogPane);
+
+        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);
+
+        loadBackground();
+    }
+
+    private void loadBackground() {
+        try {
+            Image background;
+
+            if (Settings.INSTANCE.getBackgroundImageType() == EnumBackgroundImage.DEFAULT)
+                background = searchBackgroundImage(new Image("/assets/img/background.jpg"), "");
+            else
+                background = searchBackgroundImage(new Image("/assets/img/background.jpg"), Settings.INSTANCE.getBackgroundImage());
+
+            drawerWrapper.setBackground(new Background(new BackgroundImage(background, BackgroundRepeat.NO_REPEAT, BackgroundRepeat.NO_REPEAT, BackgroundPosition.DEFAULT, new BackgroundSize(800, 480, false, false, true, true))));
+        } catch (IllegalArgumentException ignore) {
+        }
+    }
+
+    private static Image searchBackgroundImage(Image def, String customPath) {
+        Random random = new Random();
+        boolean loaded = false;
+        Image background = def;
+
+        // custom path
+        if (StringUtils.isNotBlank(customPath)) {
+            try {
+                background = new Image("file:" + customPath);
+                loaded = true;
+            } catch (IllegalArgumentException ignore) {
+            }
+        }
+
+        // images in ./bg
+        if (!loaded) {
+            File backgroundImageFile = new File("bg");
+            if (backgroundImageFile.isDirectory()) {
+                File[] backgroundPath = backgroundImageFile.listFiles(file -> StringUtils.containsOne(FileUtils.getExtension(file), "png", "jpg"));
+                if (backgroundPath != null && backgroundPath.length > 0) {
+                    int index = random.nextInt(backgroundPath.length);
+                    try {
+                        background = new Image("file:" + backgroundPath[index].getAbsolutePath());
+                        loaded = true;
+                    } catch (IllegalArgumentException ignore) {
+                    }
+                }
+            }
+        }
+
+        // background.png
+        if (!loaded) {
+            File backgroundImageFile = new File("background.png");
+            if (backgroundImageFile.exists()) {
+                try {
+                    background = new Image("file:" + backgroundImageFile.getAbsolutePath());
+                    loaded = true;
+                } catch (IllegalArgumentException ignore) {
+                }
+            }
+        }
+
+        // background.jpg
+        if (!loaded) {
+            File backgroundImageFile = new File("background.jpg");
+            if (backgroundImageFile.exists()) {
+                try {
+                    background = new Image("file:" + backgroundImageFile.getAbsolutePath());
+                    loaded = true;
+                } catch (IllegalArgumentException ignore) {
+                }
+            }
+        }
+
+        return background;
+    }
+
+    @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 (dialogPane.isEmpty())
+            dialog.show();
+        dialogPane.push(node);
+    }
+
+    public void closeDialog(Node node) {
+        FXUtils.checkFxUserThread();
+
+        dialogPane.pop(node);
+        if (dialogPane.getChildren().isEmpty())
+            Platform.runLater(() -> {
+                if (dialogPane.getChildren().isEmpty())
+                    dialog.close();
+            });
+    }
+
+    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;
+    }
+}

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
- *
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
  * This 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,38 +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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.ui;
 
+import com.jfoenix.concurrency.JFXUtilities;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.AuthInfo;
-import org.jackhuang.hmcl.auth.AuthenticationException;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
-import org.jackhuang.hmcl.ui.account.AccountLoginPane;
+import org.jackhuang.hmcl.task.SilentException;
 
 import java.util.Optional;
-import java.util.concurrent.CancellationException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
-
 public final class DialogController {
 
-    public static AuthInfo logIn(Account account) throws CancellationException, AuthenticationException, InterruptedException {
+    public static AuthInfo logIn(Account account) throws Exception {
         if (account instanceof YggdrasilAccount) {
             CountDownLatch latch = new CountDownLatch(1);
             AtomicReference<AuthInfo> res = new AtomicReference<>(null);
-            runInFX(() -> {
-                AccountLoginPane pane = new AccountLoginPane(account, it -> {
+            JFXUtilities.runInFX(() -> {
+                AccountLoginPane pane = new AccountLoginPane(account, Controllers::closeDialog, it -> {
                         res.set(it);
                         latch.countDown();
                 }, latch::countDown);
                 Controllers.dialog(pane);
             });
             latch.await();
-            return Optional.ofNullable(res.get()).orElseThrow(CancellationException::new);
+            return Optional.ofNullable(res.get()).orElseThrow(SilentException::new);
         }
         return account.logIn();
     }

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
  *
  * This 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,76 +13,55 @@
  * GNU General 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/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.ui;
 
+import com.jfoenix.adapters.ReflectionHelper;
 import com.jfoenix.controls.*;
 import javafx.animation.Animation;
 import javafx.animation.Interpolator;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
 import javafx.application.Platform;
-import javafx.beans.InvalidationListener;
 import javafx.beans.property.Property;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.beans.value.WeakChangeListener;
 import javafx.event.EventHandler;
 import javafx.fxml.FXMLLoader;
-import javafx.geometry.Insets;
-import javafx.geometry.Pos;
 import javafx.scene.Node;
-import javafx.scene.control.*;
+import javafx.scene.control.ListView;
+import javafx.scene.control.ScrollBar;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.Tooltip;
+import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.input.ScrollEvent;
-import javafx.scene.input.TransferMode;
 import javafx.scene.layout.Region;
-import javafx.scene.layout.StackPane;
 import javafx.scene.shape.Rectangle;
-import javafx.util.Callback;
 import javafx.util.Duration;
-import javafx.util.StringConverter;
-import org.jackhuang.hmcl.util.Logging;
-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 org.jackhuang.hmcl.Launcher;
+import org.jackhuang.hmcl.util.*;
 
 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;
+import static org.jackhuang.hmcl.util.ReflectionHelper.call;
+import static org.jackhuang.hmcl.util.ReflectionHelper.construct;
 
 public final class FXUtils {
     private FXUtils() {
     }
 
-    public static void runInFX(Runnable runnable) {
-        if (Platform.isFxApplicationThread()) {
-            runnable.run();
-        } else {
-            Platform.runLater(runnable);
-        }
-    }
-
     public static void checkFxUserThread() {
         if (!Platform.isFxApplicationThread()) {
             throw new IllegalStateException("Not on FX application thread; currentThread = "
@@ -90,10 +69,6 @@ public final class FXUtils {
         }
     }
 
-    public static InvalidationListener onInvalidating(Runnable action) {
-        return arg -> action.run();
-    }
-
     public static <T> void onChange(ObservableValue<T> value, Consumer<T> consumer) {
         value.addListener((a, b, c) -> consumer.accept(c));
     }
@@ -103,18 +78,13 @@ public final class FXUtils {
     }
 
     public static <T> void onChangeAndOperate(ObservableValue<T> value, Consumer<T> consumer) {
-        consumer.accept(value.getValue());
         onChange(value, consumer);
+        consumer.accept(value.getValue());
     }
 
     public static <T> void onWeakChangeAndOperate(ObservableValue<T> value, Consumer<T> 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();
+        consumer.accept(value.getValue());
     }
 
     public static void limitSize(ImageView imageView, double maxWidth, double maxHeight) {
@@ -155,27 +125,13 @@ public final class FXUtils {
     }
 
     public static void removeListener(Node node, String key) {
-        tryCast(node.getProperties().get(key), ListenerPair.class)
+        Lang.cast(node.getProperties().get(key), ListenerPair.class)
                 .ifPresent(info -> {
                     info.unbind();
                     node.getProperties().remove(key);
                 });
     }
 
-    public static <K, T> void setupCellValueFactory(JFXTreeTableColumn<K, T> column, Function<K, ObservableValue<T>> mapper) {
-        column.setCellValueFactory(param -> {
-            if (column.validateValue(param))
-                return mapper.apply(param.getValue().getValue());
-            else
-                return column.getComputedValue(param);
-        });
-    }
-
-    public static Node wrapMargin(Node node, Insets insets) {
-        StackPane.setMargin(node, insets);
-        return new StackPane(node);
-    }
-
     public static void setValidateWhileTextChanged(Node field, boolean validate) {
         if (field instanceof JFXTextField) {
             if (validate) {
@@ -234,69 +190,44 @@ 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);
     }
 
     public static void loadFXML(Node node, String absolutePath) {
-        FXMLLoader loader = new FXMLLoader(node.getClass().getResource(absolutePath), I18n.getResourceBundle());
+        FXMLLoader loader = new FXMLLoader(node.getClass().getResource(absolutePath), Launcher.RESOURCE_BUNDLE);
         loader.setRoot(node);
         loader.setController(node);
-        try {
-            loader.load();
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
+        Lang.invoke((ExceptionalSupplier<Object, IOException>) loader::load);
     }
 
-    public static void installFastTooltip(Node node, Tooltip tooltip) {
-        installTooltip(node, 50, 5000, 0, tooltip);
+    public static void resetChildren(JFXMasonryPane pane, List<Node> children) {
+        // Fixes mis-repositioning.
+        ReflectionHelper.setFieldContent(JFXMasonryPane.class, pane, "oldBoxes", null);
+        pane.getChildren().setAll(children);
     }
 
-    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, String tooltip) {
+        installTooltip(node, 0, 5000, 0, new Tooltip(tooltip));
     }
 
     public static void installTooltip(Node node, double openDelay, double visibleDelay, double closeDelay, Tooltip tooltip) {
-        runInFX(() -> {
+        try {
+            // Java 8
+            call(construct(Class.forName("javafx.scene.control.Tooltip$TooltipBehavior"), new Duration(openDelay), new Duration(visibleDelay), new Duration(closeDelay), false),
+                    "install", node, tooltip);
+        } catch (Throwable e) {
             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) {
-                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);
+                // Java 9
+                call(tooltip, "setShowDelay", new Duration(openDelay));
+                call(tooltip, "setShowDuration", new Duration(visibleDelay));
+                call(tooltip, "setHideDelay", new Duration(closeDelay));
+            } catch (Throwable e2) {
+                e.addSuppressed(e2);
+                Logging.LOG.log(Level.SEVERE, "Cannot install tooltip by reflection", e);
             }
-        });
+            Tooltip.install(node, tooltip);
+        }
     }
 
     public static void openFolder(File file) {
@@ -316,15 +247,11 @@ public final class FXUtils {
                 }
                 break;
             default:
-                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);
-                        }
-                    }
-                });
+                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);
+                }
         }
     }
 
@@ -336,25 +263,21 @@ public final class FXUtils {
     public static void openLink(String link) {
         if (link == null)
             return;
-        thread(() -> {
-            if (java.awt.Desktop.isDesktopSupported()) {
+        try {
+            java.awt.Desktop.getDesktop().browse(new URI(link));
+        } catch (Throwable e) {
+            if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX)
                 try {
-                    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);
+                    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);
+        }
     }
 
     public static void bindInt(JFXTextField textField, Property<Number> property) {
-        textField.textProperty().bindBidirectional(property, SafeStringConverter.fromInteger());
+        textField.textProperty().bindBidirectional(property, SafeIntStringConverter.INSTANCE);
     }
 
     public static void unbindInt(JFXTextField textField, Property<Number> property) {
@@ -391,10 +314,8 @@ 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")
-    @Deprecated
     public static void bindEnum(JFXComboBox<?> comboBox, Property<? extends Enum> property) {
         unbindEnum(comboBox);
         ChangeListener<Number> listener = (a, b, newValue) ->
@@ -411,9 +332,8 @@ 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);
+        ChangeListener listener = Lang.get(comboBox.getProperties(), "FXUtils.bindEnum.listener", ChangeListener.class).orElse(null);
         if (listener == null) return;
         comboBox.getSelectionModel().selectedIndexProperty().removeListener(listener);
     }
@@ -484,61 +404,7 @@ 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>() {
-
-            @Override
-            public String toString(T object) {
-                return object == null ? "" : func.apply(object);
-            }
-
-            @Override
-            public T fromString(String string) {
-                throw new UnsupportedOperationException();
-            }
-        };
-    }
-
-    public static <T> Callback<ListView<T>, ListCell<T>> jfxListCellFactory(Function<T, Node> graphicBuilder) {
-        return view -> new JFXListCell<T>() {
-            @Override
-            public void updateItem(T item, boolean empty) {
-                super.updateItem(item, empty);
-                if (!empty) {
-                    setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-                    setGraphic(graphicBuilder.apply(item));
-                }
-            }
-        };
-    }
+    public static final Image DEFAULT_ICON = new Image("/assets/img/icon.png");
 
     public static final Interpolator SINE = new Interpolator() {
         @Override
@@ -551,11 +417,4 @@ 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

@@ -0,0 +1,97 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
+ * This 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.Launcher;
+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 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(Launcher.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) 2019  huangyuhui <[email protected]> and contributors
- *
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ * 
  * This 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,57 +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 <https://www.gnu.org/licenses/>.
+ * 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.effects.JFXDepthManager;
-import javafx.geometry.Pos;
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
 import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.HBox;
-import org.jackhuang.hmcl.setting.Theme;
-import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
+import org.jackhuang.hmcl.Launcher;
 
 import java.util.function.Consumer;
 
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
 /**
  * @author huangyuhui
  */
 public class InstallerItem extends BorderPane {
+    private final Consumer<InstallerItem> deleteCallback;
+
+    @FXML
+    private Label lblInstallerArtifact;
+
+    @FXML
+    private Label lblInstallerVersion;
+
+    public InstallerItem(String artifact, String version, Consumer<InstallerItem> deleteCallback) {
+        this.deleteCallback = deleteCallback;
+        FXUtils.loadFXML(this, "/assets/fxml/version/installer-item.fxml");
 
-    public InstallerItem(String artifact, String version, Runnable upgrade, Consumer<InstallerItem> deleteCallback) {
-        getStyleClass().add("two-line-list-item");
         setStyle("-fx-background-radius: 2; -fx-background-color: white; -fx-padding: 8;");
         JFXDepthManager.setDepth(this, 1);
-
-        {
-            TwoLineListItem item = new TwoLineListItem();
-            item.setTitle(artifact);
-            item.setSubtitle(i18n("archive.version") + ": " + version);
-            setCenter(item);
-        }
-
-        {
-            HBox hBox = new HBox();
-
-            JFXButton upgradeButton = new JFXButton();
-            upgradeButton.setGraphic(SVG.update(Theme.blackFillBinding(), -1, -1));
-            upgradeButton.getStyleClass().add("toggle-icon4");
-            FXUtils.installFastTooltip(upgradeButton, i18n("install.change_version"));
-            upgradeButton.setOnMouseClicked(e -> upgrade.run());
-
-            JFXButton deleteButton = new JFXButton();
-            deleteButton.setGraphic(SVG.close(Theme.blackFillBinding(), -1, -1));
-            deleteButton.getStyleClass().add("toggle-icon4");
-            deleteButton.setOnMouseClicked(e -> deleteCallback.accept(this));
-
-            hBox.setAlignment(Pos.CENTER_RIGHT);
-            hBox.getChildren().setAll(upgradeButton, deleteButton);
-            setRight(hBox);
-        }
+        lblInstallerArtifact.setText(artifact);
+        lblInstallerVersion.setText(Launcher.i18n("archive.version") + ": " + version);
     }
 
+    @FXML
+    private void onDelete() {
+        deleteCallback.accept(this);
+    }
 }

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
  *
  * This 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,125 +13,225 @@
  * GNU General 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/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.ui;
 
+import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXPopup;
 import javafx.application.Platform;
+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 org.jackhuang.hmcl.event.EventBus;
-import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
+import javafx.scene.layout.VBox;
+import javafx.scene.paint.Color;
+import org.jackhuang.hmcl.Launcher;
+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.game.HMCLGameRepository;
 import org.jackhuang.hmcl.game.ModpackHelper;
-import org.jackhuang.hmcl.setting.Accounts;
-import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.setting.Profiles;
+import org.jackhuang.hmcl.mod.Modpack;
+import org.jackhuang.hmcl.mod.UnsupportedModpackException;
+import org.jackhuang.hmcl.setting.*;
 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.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 org.jackhuang.hmcl.ui.construct.ClassTitle;
+import org.jackhuang.hmcl.ui.construct.IconedItem;
+import org.jackhuang.hmcl.ui.construct.RipplerContainer;
+import org.jackhuang.hmcl.util.Lang;
 
 import java.io.File;
+import java.util.LinkedList;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+public final class LeftPaneController {
+    private final AdvancedListBox leftPane;
+    private final VBox profilePane = new VBox();
+    private final VBox accountPane = new VBox();
+    private final IconedItem launcherSettingsItem;
+    private final VersionListItem missingAccountItem = new VersionListItem(Launcher.i18n("account.missing"), Launcher.i18n("message.unknown"));
 
-public final class LeftPaneController extends AdvancedListBox {
+    public LeftPaneController(AdvancedListBox leftPane) {
+        this.leftPane = leftPane;
 
-    public LeftPaneController() {
-
-        AccountAdvancedListItem accountListItem = new AccountAdvancedListItem();
-        accountListItem.setOnAction(e -> Controllers.navigate(Controllers.getAccountListPage()));
-        accountListItem.accountProperty().bind(Accounts.selectedAccountProperty());
-
-        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);        	
-        	}
+        this.launcherSettingsItem = Lang.apply(new IconedItem(SVG.gear(Theme.blackFillBinding(), 20, 20), Launcher.i18n("settings.launcher")), iconedItem -> {
+            iconedItem.prefWidthProperty().bind(leftPane.widthProperty());
+            iconedItem.setOnMouseClicked(e -> Controllers.navigate(Controllers.getSettingsPage()));
         });
 
-        ProfileAdvancedListItem profileListItem = new ProfileAdvancedListItem();
-        profileListItem.setOnAction(e -> Controllers.navigate(Controllers.getProfileListPage()));
-        profileListItem.profileProperty().bind(Profiles.selectedProfileProperty());
+        leftPane
+                .add(new ClassTitle(Launcher.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)
+                .startCategory(Launcher.i18n("launcher").toUpperCase())
+                .add(launcherSettingsItem)
+                .add(new ClassTitle(Launcher.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);
 
-        AdvancedListItem gameItem = new AdvancedListItem();
-        gameItem.setImage(new Image("/assets/img/bookshelf.png"));
-        gameItem.setTitle(i18n("version.manage"));
-        gameItem.setOnAction(e -> Controllers.navigate(Controllers.getGameListPage()));
+        EventBus.EVENT_BUS.channel(AccountLoadingEvent.class).register(this::onAccountsLoading);
+        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);
 
-        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);
-
-        EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).register(event -> onRefreshedVersions((HMCLGameRepository) event.getSource()));
-
-        Profile profile = Profiles.getSelectedProfile();
-        if (profile != null && profile.getRepository().isLoaded())
-            onRefreshedVersions(Profiles.selectedProfileProperty().get().getRepository());
-    }
-
-    // ==== Accounts ====
-    public void checkAccount() {
-        if (Accounts.getAccounts().isEmpty())
-            Platform.runLater(this::addNewAccount);
+        FXUtils.onChangeAndOperate(Settings.INSTANCE.selectedAccountProperty(), this::onSelectedAccountChanged);
+        onAccountsLoading();
     }
 
     private void addNewAccount() {
-        Controllers.dialog(new AddAccountPane());
+        Controllers.dialog(new AddAccountPane(Controllers::closeDialog));
+    }
+
+    private void onSelectedAccountChanged(Account newAccount) {
+        Platform.runLater(() -> {
+            for (Node node : accountPane.getChildren()) {
+                if (node instanceof RipplerContainer && node.getProperties().get("account") instanceof Account) {
+                    boolean current = Objects.equals(node.getProperties().get("account"), newAccount);
+                    ((RipplerContainer) node).setSelected(current);
+                }
+            }
+        });
+    }
+
+    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 ? Launcher.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));
+    }
+
+    private static String accountType(Account account) {
+        if (account instanceof OfflineAccount) return Launcher.i18n("account.methods.offline");
+        else if (account instanceof YggdrasilAccount) return account.getUsername();
+        else throw new Error(Launcher.i18n("account.methods.no_method") + ": " + account);
+    }
+
+    private void onAccountsLoading() {
+        LinkedList<RipplerContainer> list = new LinkedList<>();
+        Account selectedAccount = Settings.INSTANCE.getSelectedAccount();
+        for (Account account : Settings.INSTANCE.getAccounts()) {
+            VersionListItem item = new VersionListItem(account.getCharacter(), accountType(account));
+            RipplerContainer ripplerContainer = 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());
+            });
+            ripplerContainer.setOnMouseClicked(e -> {
+                if (e.getButton() == MouseButton.PRIMARY)
+                    Settings.INSTANCE.setSelectedAccount(account);
+            });
+            ripplerContainer.getProperties().put("account", account);
+            ripplerContainer.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, 4), AccountHelper.getViewport(4));
+
+            if (account instanceof AuthlibInjectorAccount)
+                Accounts.getAuthlibInjectorServerNameAsync((AuthlibInjectorAccount) account)
+                    .subscribe(Schedulers.javafx(), variables -> FXUtils.installTooltip(ripplerContainer, 500, 5000, 0, new Tooltip(variables.get("serverName"))));
+
+            if (selectedAccount == account)
+                ripplerContainer.setSelected(true);
+
+            list.add(ripplerContainer);
+        }
+
+        if (Settings.INSTANCE.getAccounts().isEmpty()) {
+            RipplerContainer container = new RipplerContainer(missingAccountItem);
+            missingAccountItem.setOnSettingsButtonClicked(e -> addNewAccount());
+            container.setOnMouseClicked(e -> addNewAccount());
+            list.add(container);
+        }
+
+        Platform.runLater(() -> accountPane.getChildren().setAll(list));
+    }
+
+    public void showUpdate() {
+        launcherSettingsItem.setText(Launcher.i18n("update.found"));
+        launcherSettingsItem.setTextFill(Color.RED);
     }
-    // ====
 
     private boolean checkedModpack = false;
+    private static boolean showNewAccount = true;
 
-    private void onRefreshedVersions(HMCLGameRepository repository) {
-        runInFX(() -> {
+    private void onRefreshedVersions(RefreshedVersionsEvent event) {
+        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()) {
-                        Task.ofResult(() -> 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)
-                                            .with(Task.of(Schedulers.javafx(), this::checkAccount)).executor();
-                                    region.set(Controllers.taskDialog(executor, i18n("modpack.installing")));
-                                    executor.start();
-                                }).start();
+                        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(), () -> {
+                                        Controllers.closeDialog(region.get());
+                                        checkAccount();
+                                    })).executor();
+                            region.set(Controllers.taskDialog(executor, Launcher.i18n("modpack.installing"), ""));
+                            executor.start();
+                            showNewAccount = false;
+                        } catch (UnsupportedModpackException ignore) {
+                        }
                     }
                 }
             }
 
-            checkAccount();
+            if (showNewAccount) {
+                showNewAccount = false;
+                checkAccount();
+            }
         });
     }
+
+    public void checkAccount() {
+        if (Settings.INSTANCE.getAccounts().isEmpty())
+            addNewAccount();
+    }
 }

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

@@ -1,49 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.ui;
-
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.scene.Node;
-import javafx.scene.control.Skin;
-
-public abstract class ListPage<T extends Node> extends ListPageBase<T> {
-    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 boolean isRefreshable() {
-        return refreshable.get();
-    }
-
-    public BooleanProperty refreshableProperty() {
-        return refreshable;
-    }
-
-    public void setRefreshable(boolean refreshable) {
-        this.refreshable.set(refreshable);
-    }
-}

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

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

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

@@ -1,109 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.ui;
-
-import 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) 2019  huangyuhui <[email protected]> and contributors
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
  *
  * This 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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.ui;
 
@@ -30,22 +30,21 @@ import javafx.scene.layout.StackPane;
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebView;
 import javafx.stage.Stage;
+import org.jackhuang.hmcl.Launcher;
 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 java.util.concurrent.CountDownLatch;
 
-import static org.jackhuang.hmcl.setting.ConfigHolder.config;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
 /**
  *
  * @author huangyuhui
@@ -63,8 +62,8 @@ public final class LogWindow extends Stage {
 
     public LogWindow() {
         setScene(new Scene(impl, 800, 480));
-        getScene().getStylesheets().addAll(config().getTheme().getStylesheets());
-        setTitle(i18n("logwindow.title"));
+        getScene().getStylesheets().addAll(Settings.INSTANCE.getTheme().getStylesheets());
+        setTitle(Launcher.i18n("logwindow.title"));
         getIcons().add(new Image("/assets/img/icon.png"));
     }
 
@@ -175,12 +174,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}", config().getFontSize() + "px \"" + config().getFontFamily() + "\""));
+                    .replace("${FONT}", Settings.INSTANCE.getFont().getSize() + "px \"" + Settings.INSTANCE.getFont().getFamily() + "\""));
             engine.getLoadWorker().stateProperty().addListener((a, b, newValue) -> {
                 if (newValue == Worker.State.SUCCEEDED) {
                     document = engine.getDocument();
                     body = document.getElementsByTagName("body").item(0);
-                    engine.executeScript("limitedLogs=" + config().getLogLines());
+                    engine.executeScript("limitedLogs=" + Settings.INSTANCE.getLogLines());
                     latch.countDown();
                     onDone.fireEvent(new Event(LogWindow.this));
                 }
@@ -188,24 +187,24 @@ public final class LogWindow extends Stage {
 
             boolean flag = false;
             for (String i : cboLines.getItems())
-                if (Integer.toString(config().getLogLines()).equals(i)) {
+                if (Integer.toString(Settings.INSTANCE.getLogLines()).equals(i)) {
                     cboLines.getSelectionModel().select(i);
                     flag = true;
                 }
 
             cboLines.getSelectionModel().selectedItemProperty().addListener((a, b, newValue) -> {
-                config().setLogLines(newValue == null ? 100 : Integer.parseInt(newValue));
-                engine.executeScript("limitedLogs=" + config().getLogLines());
+                Settings.INSTANCE.setLogLines(newValue == null ? 100 : Integer.parseInt(newValue));
+                engine.executeScript("limitedLogs=" + Settings.INSTANCE.getLogLines());
             });
 
             if (!flag)
                 cboLines.getSelectionModel().select(0);
 
-            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.textProperty().bind(Bindings.createStringBinding(() -> Integer.toString(fatal.get()) + " fatals", fatal));
+            btnErrors.textProperty().bind(Bindings.createStringBinding(() -> Integer.toString(error.get()) + " errors", error));
+            btnWarns.textProperty().bind(Bindings.createStringBinding(() -> Integer.toString(warn.get()) + " warns", warn));
+            btnInfos.textProperty().bind(Bindings.createStringBinding(() -> Integer.toString(info.get()) + " infos", info));
+            btnDebugs.textProperty().bind(Bindings.createStringBinding(() -> Integer.toString(debug.get()) + " debugs", debug));
 
             btnFatals.selectedProperty().addListener(o -> specificChanged());
             btnErrors.selectedProperty().addListener(o -> specificChanged());

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <[email protected]> and contributors
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
  *
  * This 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,193 +13,228 @@
  * GNU General 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/>.
+ * 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.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 com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.controls.*;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.fxml.FXML;
 import javafx.scene.Node;
-import javafx.scene.control.Label;
-import javafx.scene.layout.HBox;
+import javafx.scene.image.Image;
+import javafx.scene.input.MouseButton;
+import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
-import javafx.scene.paint.Color;
-import javafx.scene.shape.Rectangle;
-import javafx.util.Duration;
+import javafx.stage.FileChooser;
+import org.jackhuang.hmcl.Launcher;
+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.Profile;
-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 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.MessageBox;
+import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane;
+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.StringUtils;
 
-import static org.jackhuang.hmcl.ui.FXUtils.SINE;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.jackhuang.hmcl.util.StringUtils.removePrefix;
+import static org.jackhuang.hmcl.util.StringUtils.removeSuffix;
 
 public final class MainPage extends StackPane implements DecoratorPage {
-    private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper(this, "title", i18n("main_page"));
 
-    private final PopupMenu menu = new PopupMenu();
-    private final JFXPopup popup = new JFXPopup(menu);
+    private final StringProperty title = new SimpleStringProperty(this, "title", Launcher.i18n("main_page"));
 
-    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();
+    private Profile profile;
 
-    private StackPane updatePane;
-    private JFXButton menuButton;
+    @FXML
+    private JFXButton btnRefresh;
+    @FXML
+    private StackPane contentPane;
+    @FXML
+    private JFXButton btnAdd;
+    @FXML
+    private JFXSpinner spinner;
+    @FXML
+    private JFXMasonryPane masonryPane;
 
     {
-        setPadding(new Insets(25));
+        FXUtils.loadFXML(this, "/assets/fxml/main.fxml");
 
-        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);
+        loadingVersions();
 
-        {
-            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));
+        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())
+                JFXUtilities.runInFXAndWait(this::loadingVersions);
+        });
+        EventBus.EVENT_BUS.channel(ProfileChangedEvent.class).register(event -> {
+            this.profile = event.getProfile();
+        });
 
-                TwoLineListItem prompt = new TwoLineListItem();
-                prompt.setSubtitle(i18n("update.bubble.subtitle"));
-                prompt.setPickOnBounds(false);
-                prompt.titleProperty().bind(latestVersionProperty());
+        btnAdd.setOnMouseClicked(e -> Controllers.getDecorator().startWizard(new DownloadWizardProvider(), Launcher.i18n("install")));
+        FXUtils.installTooltip(btnAdd, Launcher.i18n("install"));
+        btnRefresh.setOnMouseClicked(e -> Settings.INSTANCE.getSelectedProfile().getRepository().refreshVersionsAsync().start());
+        FXUtils.installTooltip(btnRefresh, Launcher.i18n("button.refresh"));
+    }
 
-                hBox.getChildren().setAll(lblIcon, prompt);
+    private String modifyVersion(String gameVersion, String version) {
+        return removeSuffix(removePrefix(removeSuffix(removePrefix(version.replace(gameVersion, "").trim(), "-"), "-"), "_"), "_");
+    }
+
+    private Node buildNode(HMCLGameRepository repository, Version version, String game) {
+        Profile profile = repository.getProfile();
+        String id = version.getId();
+        VersionItem item = new VersionItem();
+        item.setUpdate(repository.isModpack(id));
+        item.setGameVersion(game);
+        item.setVersionName(id);
+
+        StringBuilder libraries = new StringBuilder();
+        for (Library library : version.getLibraries()) {
+            if (library.getGroupId().equalsIgnoreCase("net.minecraftforge") && library.getArtifactId().equalsIgnoreCase("forge")) {
+                libraries.append(Launcher.i18n("install.installer.forge")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)forge", ""))).append("\n");
             }
-
-            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);
+            if (library.getGroupId().equalsIgnoreCase("com.mumfrey") && library.getArtifactId().equalsIgnoreCase("liteloader")) {
+                libraries.append(Launcher.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(Launcher.i18n("install.installer.optifine")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)optifine", ""))).append("\n");
             }
-
-            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);
+        item.setLibraries(libraries.toString());
+        item.setOnLaunchButtonClicked(e -> {
+            if (Settings.INSTANCE.getSelectedAccount() == null)
+                Controllers.getLeftPaneController().checkAccount();
+            else
+                LauncherHelper.INSTANCE.launch(profile, Settings.INSTANCE.getSelectedAccount(), id, null);
+        });
+        item.setOnScriptButtonClicked(e -> {
+            if (Settings.INSTANCE.getSelectedAccount() == null)
+                Controllers.dialog(Launcher.i18n("login.empty_username"));
+            else {
+                FileChooser chooser = new FileChooser();
+                if (repository.getRunDirectory(id).isDirectory())
+                    chooser.setInitialDirectory(repository.getRunDirectory(id));
+                chooser.setTitle(Launcher.i18n("version.launch_script.save"));
+                chooser.getExtensionFilters().add(OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS
+                        ? new FileChooser.ExtensionFilter(Launcher.i18n("extension.bat"), "*.bat")
+                        : new FileChooser.ExtensionFilter(Launcher.i18n("extension.sh"), "*.sh"));
+                File file = chooser.showSaveDialog(Controllers.getStage());
+                if (file != null)
+                    LauncherHelper.INSTANCE.launch(profile, Settings.INSTANCE.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(Launcher.i18n("modpack.choose"));
+            chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(Launcher.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(), () -> Controllers.closeDialog(region.get()))).executor();
+                    region.set(Controllers.taskDialog(executor, Launcher.i18n("modpack.update"), ""));
+                    executor.start();
+                } catch (UnsupportedModpackException e) {
+                    Controllers.closeDialog(region.get());
+                    Controllers.dialog(Launcher.i18n("modpack.unsupported"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE);
+                } catch (MismatchedModpackTypeException e) {
+                    Controllers.closeDialog(region.get());
+                    Controllers.dialog(Launcher.i18n("modpack.mismatched_type"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE);
+                } catch (IOException e)  {
+                    Controllers.closeDialog(region.get());
+                    Controllers.dialog(Launcher.i18n("modpack.invalid"), Launcher.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(
+                        Launcher.i18n("version.manage.rename"),
+                        Launcher.i18n("version.manage.remove"),
+                        Launcher.i18n("modpack.export"),
+                        Launcher.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 (Settings.INSTANCE.getSelectedAccount() == null)
+                    Controllers.dialog(Launcher.i18n("login.empty_username"));
+                else
+                    LauncherHelper.INSTANCE.launch(profile, Settings.INSTANCE.getSelectedAccount(), id, null);
+            }
+        });
+        File iconFile = repository.getVersionIcon(id);
+        if (iconFile.exists())
+            item.setImage(new Image("file:" + iconFile.getAbsolutePath()));
+        return item;
     }
 
-    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 void loadingVersions() {
+        getChildren().setAll(spinner);
+        FXUtils.resetChildren(masonryPane, Collections.emptyList());
     }
 
-    private void launch() {
-        Profile profile = Profiles.getSelectedProfile();
-        Versions.launch(profile, profile.getSelectedVersion());
-    }
-
-    private void onMenu() {
-        popup.show(menuButton, JFXPopup.PopupVPosition.BOTTOM, JFXPopup.PopupHPosition.RIGHT, 0, -menuButton.getHeight());
-    }
-
-    private void onUpgrade() {
-        RemoteVersion target = UpdateChecker.getLatestVersion();
-        if (target == null) {
-            return;
+    private void loadVersions(HMCLGameRepository repository) {
+        List<Node> children = new LinkedList<>();
+        for (Version version : repository.getVersions()) {
+            children.add(buildNode(repository, version, GameVersion.minecraftVersion(repository.getVersionJar(version.getId())).orElse("Unknown")));
         }
-        UpdateHandler.updateFrom(target);
-    }
-
-    private void closeUpdateBubble() {
-        showUpdate.unbind();
-        showUpdate.set(false);
+        JFXUtilities.runInFX(() -> {
+            if (profile == repository.getProfile()) {
+                getChildren().setAll(contentPane);
+                FXUtils.resetChildren(masonryPane, children);
+            }
+        });
     }
 
     public String getTitle() {
@@ -207,51 +242,11 @@ public final class MainPage extends StackPane implements DecoratorPage {
     }
 
     @Override
-    public ReadOnlyStringProperty titleProperty() {
-        return title.getReadOnlyProperty();
+    public StringProperty titleProperty() {
+        return title;
     }
 
     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

@@ -0,0 +1,174 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ *
+ * This 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.Launcher;
+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 java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.stream.Stream;
+
+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> mods = event.getDragboard().getFiles();
+            Stream<File> stream = null;
+            if (mods != null)
+                stream = mods.stream()
+                        .filter(it -> Arrays.asList("jar", "zip", "litemod").contains(FileUtils.getExtension(it)));
+            if (stream != null && stream.findAny().isPresent()) {
+                stream.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(Launcher.i18n("mods.choose_mod"));
+        chooser.getExtensionFilters().setAll(new FileChooser.ExtensionFilter(Launcher.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(Launcher.i18n("mods.add.success", String.join(", ", succeeded)));
+            if (!failed.isEmpty())
+                prompt.add(Launcher.i18n("mods.add.failed", String.join(", ", failed)));
+            Controllers.dialog(String.join("\n", prompt), Launcher.i18n("mods.add"));
+            loadMods(modManager, versionId);
+        })).start();
+    }
+
+    public void setParentTab(JFXTabPane parentTab) {
+        this.parentTab = parentTab;
+    }
+}

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

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

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ * 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
@@ -13,45 +13,38 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hmcl.ui.profile;
+package org.jackhuang.hmcl.ui;
 
 import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXCheckBox;
 import com.jfoenix.controls.JFXTextField;
-import com.jfoenix.validation.base.ValidatorBase;
-import javafx.beans.property.ReadOnlyStringProperty;
-import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.fxml.FXML;
-import javafx.scene.Node;
 import javafx.scene.layout.StackPane;
+import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
-import org.jackhuang.hmcl.ui.Controllers;
-import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.ui.construct.FileItem;
-import org.jackhuang.hmcl.ui.construct.PageCloseEvent;
-import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
+import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
 import org.jackhuang.hmcl.util.StringUtils;
 
 import java.io.File;
-import java.nio.file.Paths;
 import java.util.Optional;
 
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
 public final class ProfilePage extends StackPane implements DecoratorPage {
-    private final ReadOnlyStringWrapper title;
+    private final StringProperty title;
     private final StringProperty location;
     private final Profile profile;
 
-    @FXML private JFXTextField txtProfileName;
-    @FXML private FileItem gameDir;
+    @FXML
+    private JFXTextField txtProfileName;
+    @FXML
+    private FileItem gameDir;
     @FXML private JFXButton btnSave;
-    @FXML private JFXCheckBox toggleUseRelativePath;
+    @FXML private JFXButton btnDelete;
 
     /**
      * @param profile null if creating a new profile.
@@ -60,37 +53,31 @@ public final class ProfilePage extends StackPane implements DecoratorPage {
         this.profile = profile;
         String profileDisplayName = Optional.ofNullable(profile).map(Profiles::getProfileDisplayName).orElse("");
 
-        title = new ReadOnlyStringWrapper(this, "title",
-                profile == null ? i18n("profile.new") : i18n("profile") + " - " + profileDisplayName);
+        title = new SimpleStringProperty(this, "title",
+                profile == null ? Launcher.i18n("profile.new") : Launcher.i18n("profile") + " - " + profileDisplayName);
         location = new SimpleStringProperty(this, "location",
-                Optional.ofNullable(profile).map(Profile::getGameDir).map(File::getAbsolutePath).orElse(".minecraft"));
+                Optional.ofNullable(profile).map(Profile::getGameDir).map(File::getAbsolutePath).orElse(""));
 
         FXUtils.loadFXML(this, "/assets/fxml/profile.fxml");
 
         txtProfileName.setText(profileDisplayName);
-        txtProfileName.getValidators().add(new ValidatorBase() {
-            {
-                setMessage(i18n("profile.already_exists"));
-            }
-            @Override
-            protected void eval() {
-                JFXTextField control = (JFXTextField) this.getSrcControl();
-                if (Profiles.getProfiles().stream().anyMatch(profile -> profile.getName().equals(control.getText())))
-                    hasErrors.set(true);
-                else
-                    hasErrors.set(false);
-            }
-        });
         FXUtils.onChangeAndOperate(txtProfileName.textProperty(), it -> {
             btnSave.setDisable(!txtProfileName.validate() || StringUtils.isBlank(getLocation()));
         });
-        gameDir.pathProperty().bindBidirectional(location);
+        gameDir.setProperty(location);
         FXUtils.onChangeAndOperate(location, it -> {
             btnSave.setDisable(!txtProfileName.validate() || StringUtils.isBlank(getLocation()));
         });
-        gameDir.convertToRelativePathProperty().bind(toggleUseRelativePath.selectedProperty());
+
+        if (profile == null)
+            btnDelete.setVisible(false);
+    }
+
+    @FXML
+    private void onDelete() {
         if (profile != null) {
-            toggleUseRelativePath.setSelected(profile.isUseRelativePath());
+            Settings.INSTANCE.deleteProfile(profile);
+            Controllers.navigate(null);
         }
     }
 
@@ -98,20 +85,17 @@ public final class ProfilePage extends StackPane implements DecoratorPage {
     private void onSave() {
         if (profile != null) {
             profile.setName(txtProfileName.getText());
-            profile.setUseRelativePath(toggleUseRelativePath.isSelected());
-            if (StringUtils.isNotBlank(getLocation())) {
+            if (StringUtils.isNotBlank(getLocation()))
                 profile.setGameDir(new File(getLocation()));
-            }
         } else {
             if (StringUtils.isBlank(getLocation())) {
                 gameDir.onExplore();
             }
-            Profile newProfile = new Profile(txtProfileName.getText(), new File(getLocation()));
-            newProfile.setUseRelativePath(toggleUseRelativePath.isSelected());
-            Profiles.getProfiles().add(newProfile);
+            Settings.INSTANCE.putProfile(new Profile(txtProfileName.getText(), new File(getLocation())));
         }
 
-        fireEvent(new PageCloseEvent());
+        Settings.INSTANCE.onProfileLoading();
+        Controllers.navigate(null);
     }
 
     public String getTitle() {
@@ -119,8 +103,8 @@ public final class ProfilePage extends StackPane implements DecoratorPage {
     }
 
     @Override
-    public ReadOnlyStringProperty titleProperty() {
-        return title.getReadOnlyProperty();
+    public StringProperty titleProperty() {
+        return title;
     }
 
     public void setTitle(String title) {

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ * 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
@@ -13,15 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://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;
 
@@ -29,22 +27,12 @@ public final class SVG {
     private SVG() {
     }
 
-    public interface SVGIcon {
-        Node createIcon(ObjectBinding<? extends Paint> fill, double width, double height);
-    }
-
     private static Node createSVGPath(String d, ObjectBinding<? extends Paint> fill, double width, double height) {
         SVGPath path = new SVGPath();
         path.getStyleClass().add("svg");
         path.setContent(d);
         path.fillProperty().bind(fill);
 
-        if (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);
@@ -95,10 +83,6 @@ 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);
     }
@@ -143,31 +127,4 @@ 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

@@ -0,0 +1,43 @@
+/*
+ * 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) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ * 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
@@ -13,186 +13,213 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.ui;
 
-import com.jfoenix.controls.JFXColorPicker;
+import com.jfoenix.controls.*;
 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.ReadOnlyStringProperty;
-import javafx.beans.property.ReadOnlyStringWrapper;
+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.scene.control.Toggle;
 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.Metadata;
+import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.setting.*;
-import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
+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.Validator;
-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 org.jackhuang.hmcl.ui.wizard.DecoratorPage;
+import org.jackhuang.hmcl.util.Lang;
 
-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.Optional;
-import java.util.logging.Level;
+import java.util.stream.Collectors;
 
-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;
+public final class SettingsPage extends StackPane implements DecoratorPage {
+    private final StringProperty title = new SimpleStringProperty(this, "title", Launcher.i18n("settings.launcher"));
 
-public final class SettingsPage extends SettingsView implements DecoratorPage {
-    private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper(this, "title", i18n("settings.launcher"));
+    @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 FileItem fileCommonLocation;
+    @FXML
+    private Label lblDisplay;
+    @FXML
+    private Label lblUpdate;
+    @FXML
+    private Label lblUpdateSub;
+    @FXML
+    private JFXButton btnUpdate;
+    @FXML
+    private ScrollPane scroll;
+    @FXML
+    private MultiFileItem backgroundItem;
+    @FXML
+    private StackPane themeColorPickerContainer;
+    @FXML
+    private JFXRadioButton chkNoProxy;
+    @FXML
+    private JFXRadioButton chkManualProxy;
+    @FXML
+    private JFXRadioButton chkProxyHttp;
+    @FXML
+    private JFXRadioButton chkProxySocks;
+    @FXML
+    private JFXCheckBox chkProxyAuthentication;
+    @FXML
+    private GridPane authPane;
+    @FXML
+    private Pane proxyPane;
 
-    private InvalidationListener updateListener;
+    {
+        FXUtils.loadFXML(this, "/assets/fxml/setting.fxml");
 
-    public SettingsPage() {
         FXUtils.smoothScrolling(scroll);
 
-        // ==== Download sources ====
-        cboDownloadSource.getItems().setAll(DownloadProviders.providersById.keySet());
-        selectedItemPropertyFor(cboDownloadSource).bindBidirectional(config().downloadTypeProperty());
-        // ====
+        txtProxyHost.setText(Settings.INSTANCE.getProxyHost());
+        txtProxyHost.textProperty().addListener((a, b, newValue) -> Settings.INSTANCE.setProxyHost(newValue));
 
-        // ==== Font ====
-        cboFont.valueProperty().bindBidirectional(config().fontFamilyProperty());
+        txtProxyPort.setText(Settings.INSTANCE.getProxyPort());
+        txtProxyPort.textProperty().addListener((a, b, newValue) -> Settings.INSTANCE.setProxyPort(newValue));
 
-        txtFontSize.textProperty().bindBidirectional(config().fontSizeProperty(),
-                SafeStringConverter.fromFiniteDouble()
-                        .restrict(it -> it > 0)
-                        .fallbackTo(12.0)
-                        .asPredicate(Validator.addTo(txtFontSize)));
+        txtProxyUsername.setText(Settings.INSTANCE.getProxyUser());
+        txtProxyUsername.textProperty().addListener((a, b, newValue) -> Settings.INSTANCE.setProxyUser(newValue));
 
-        lblDisplay.fontProperty().bind(Bindings.createObjectBinding(
-                () -> Font.font(config().getFontFamily(), config().getFontSize()),
-                config().fontFamilyProperty(), config().fontSizeProperty()));
-        // ====
+        txtProxyPassword.setText(Settings.INSTANCE.getProxyPass());
+        txtProxyPassword.textProperty().addListener((a, b, newValue) -> Settings.INSTANCE.setProxyPass(newValue));
 
-        // ==== Languages ====
-        cboLanguage.getItems().setAll(Locales.LOCALES);
-        selectedItemPropertyFor(cboLanguage).bindBidirectional(config().localizationProperty());
-        // ====
+        cboDownloadSource.getSelectionModel().select(DownloadProviders.DOWNLOAD_PROVIDERS.indexOf(Settings.INSTANCE.getDownloadProvider()));
+        cboDownloadSource.getSelectionModel().selectedIndexProperty().addListener((a, b, newValue) -> Settings.INSTANCE.setDownloadProvider(DownloadProviders.getDownloadProvider(newValue.intValue())));
 
-        // ==== Proxy ====
-        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());
+        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() + "\";");
+        });
 
-        proxyPane.disableProperty().bind(chkDisableProxy.selectedProperty());
-        authPane.disableProperty().bind(chkProxyAuthentication.selectedProperty().not());
+        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() + "\";");
+            }
+        });
+
+        lblDisplay.setStyle("-fx-font: " + Settings.INSTANCE.getFont().getSize() + " \"" + Settings.INSTANCE.getFont().getFamily() + "\";");
+
+        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())));
 
-        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);
-        selectedItemPropertyFor(proxyConfigurationGroup, Proxy.Type.class).bindBidirectional(config().proxyTypeProperty());
-        // ====
 
-        fileCommonLocation.loadChildren(Arrays.asList(
-                fileCommonLocation.createChildren(i18n("launcher.cache_directory.default"), EnumCommonDirectory.DEFAULT)
-        ), EnumCommonDirectory.CUSTOM);
-        fileCommonLocation.selectedDataProperty().bindBidirectional(config().commonDirTypeProperty());
-        fileCommonLocation.customTextProperty().bindBidirectional(config().commonDirectoryProperty());
-        fileCommonLocation.subtitleProperty().bind(
-                Bindings.createObjectBinding(() -> Optional.ofNullable(Settings.instance().getCommonDirectory())
-                                .orElse(i18n("launcher.cache_directory.disabled")),
-                        config().commonDirectoryProperty(), config().commonDirTypeProperty()));
+        for (Toggle toggle : proxyConfigurationGroup.getToggles())
+            if (toggle.getUserData() == Settings.INSTANCE.getProxyType())
+                toggle.setSelected(true);
 
-        // ==== Update ====
-        FXUtils.installFastTooltip(btnUpdate, i18n("update.tooltip"));
-        updateListener = any -> {
-            btnUpdate.setVisible(UpdateChecker.isOutdated());
+        ToggleGroup hasProxyGroup = new ToggleGroup();
+        chkNoProxy.setToggleGroup(hasProxyGroup);
+        chkManualProxy.setToggleGroup(hasProxyGroup);
+        if (!Settings.INSTANCE.hasProxy())
+            chkNoProxy.setSelected(true);
+        else
+            chkManualProxy.setSelected(true);
+        proxyPane.disableProperty().bind(chkNoProxy.selectedProperty());
 
-            if (UpdateChecker.isOutdated()) {
-                lblUpdateSub.setText(i18n("update.newest_version", UpdateChecker.getLatestVersion().getVersion()));
-                lblUpdateSub.getStyleClass().setAll("update-label");
+        hasProxyGroup.selectedToggleProperty().addListener((a, b, newValue) ->
+                Settings.INSTANCE.setHasProxy(newValue != chkNoProxy));
 
-                lblUpdate.setText(i18n("update.found"));
-                lblUpdate.getStyleClass().setAll("update-label");
-            } else if (UpdateChecker.isCheckingUpdate()) {
-                lblUpdateSub.setText(i18n("update.checking"));
-                lblUpdateSub.getStyleClass().setAll("subtitle-label");
+        proxyConfigurationGroup.selectedToggleProperty().addListener((a, b, newValue) ->
+                Settings.INSTANCE.setProxyType((Proxy.Type) newValue.getUserData()));
 
-                lblUpdate.setText(i18n("update"));
-                lblUpdate.getStyleClass().setAll();
-            } else {
-                lblUpdateSub.setText(i18n("update.latest"));
-                lblUpdateSub.getStyleClass().setAll("subtitle-label");
+        chkProxyAuthentication.setSelected(Settings.INSTANCE.hasProxyAuth());
+        chkProxyAuthentication.selectedProperty().addListener((a, b, newValue) -> Settings.INSTANCE.setHasProxyAuth(newValue));
+        authPane.disableProperty().bind(chkProxyAuthentication.selectedProperty().not());
 
-                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);
+        fileCommonLocation.setProperty(Settings.INSTANCE.commonPathProperty());
 
-        lblUpdateNote.setWrappingWidth(470);
+        FXUtils.installTooltip(btnUpdate, Launcher.i18n("update.tooltip"));
+        checkUpdate();
 
-        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 ====
+        // 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.subtitleProperty().bind(
-                new When(backgroundItem.selectedDataProperty().isEqualTo(EnumBackgroundImage.DEFAULT))
-                        .then(i18n("launcher.background.default"))
-                        .otherwise(config().backgroundImageProperty()));
-        // ====
+                backgroundItem.createChildren(Launcher.i18n("launcher.background.default"), EnumBackgroundImage.DEFAULT)
+        ));
 
-        // ==== Theme ====
-        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);
+        FXUtils.bindString(backgroundItem.getTxtCustom(), Settings.INSTANCE.backgroundImageProperty());
+
+        backgroundItem.setCustomUserData(EnumBackgroundImage.CUSTOM);
+        backgroundItem.getGroup().getToggles().stream().filter(it -> it.getUserData() == Settings.INSTANCE.getBackgroundImageType()).findFirst().ifPresent(it -> it.setSelected(true));
+
+        Settings.INSTANCE.backgroundImageProperty().setChangedListener(it -> initBackgroundItemSubtitle());
+        Settings.INSTANCE.backgroundImageTypeProperty().setChangedListener(it -> initBackgroundItemSubtitle());
+        initBackgroundItemSubtitle();
+
+        backgroundItem.setToggleSelectedListener(newValue ->
+                Settings.INSTANCE.setBackgroundImageType((EnumBackgroundImage) newValue.getUserData()));
+
+        // theme
+        JFXColorPicker picker = new JFXColorPicker(Color.web(Settings.INSTANCE.getTheme().getColor()), null);
+        picker.setCustomColorText(Launcher.i18n("color.custom"));
+        picker.setRecentColorsText(Launcher.i18n("color.recent"));
+        picker.getCustomColors().setAll(Arrays.stream(Theme.VALUES).map(Theme::getColor).map(Color::web).collect(Collectors.toList()));
         picker.setOnAction(e -> {
             Theme theme = Theme.custom(Theme.getColorDisplayName(picker.getValue()));
-            config().setTheme(theme);
+            Settings.INSTANCE.setTheme(theme);
             Controllers.getScene().getStylesheets().setAll(theme.getStylesheets());
         });
         themeColorPickerContainer.getChildren().setAll(picker);
         Platform.runLater(() -> JFXDepthManager.setDepth(picker, 0));
-        // ====
+    }
+
+    private void initBackgroundItemSubtitle() {
+        switch (Settings.INSTANCE.getBackgroundImageType()) {
+            case DEFAULT:
+                backgroundItem.setSubtitle(Launcher.i18n("launcher.background.default"));
+                break;
+            case CUSTOM:
+                backgroundItem.setSubtitle(Settings.INSTANCE.getBackgroundImage());
+                break;
+        }
     }
 
     public String getTitle() {
@@ -200,56 +227,34 @@ public final class SettingsPage extends SettingsView implements DecoratorPage {
     }
 
     @Override
-    public ReadOnlyStringProperty titleProperty() {
-        return title.getReadOnlyProperty();
+    public StringProperty titleProperty() {
+        return title;
     }
 
     public void setTitle(String title) {
         this.title.set(title);
     }
 
-    @Override
-    protected void onUpdate() {
-        RemoteVersion target = UpdateChecker.getLatestVersion();
-        if (target == null) {
-            return;
+    public void checkUpdate() {
+        btnUpdate.setVisible(Launcher.UPDATE_CHECKER.isOutOfDate());
+
+        if (Launcher.UPDATE_CHECKER.isOutOfDate()) {
+            lblUpdateSub.setText(Launcher.i18n("update.newest_version", Launcher.UPDATE_CHECKER.getNewVersion().toString()));
+            lblUpdateSub.getStyleClass().setAll("update-label");
+
+            lblUpdate.setText(Launcher.i18n("update.found"));
+            lblUpdate.getStyleClass().setAll("update-label");
+        } else {
+            lblUpdateSub.setText(Launcher.i18n("update.latest"));
+            lblUpdateSub.getStyleClass().setAll("subtitle-label");
+
+            lblUpdate.setText(Launcher.i18n("update"));
+            lblUpdate.getStyleClass().setAll();
         }
-        UpdateHandler.updateFrom(target);
     }
 
-    @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");
+    @FXML
+    private void onUpdate() {
+        Launcher.UPDATE_CHECKER.checkOutdate();
     }
 }

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

@@ -1,529 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.ui;
-
-import com.jfoenix.controls.*;
-import javafx.geometry.HPos;
-import javafx.geometry.Insets;
-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.setPadding(new Insets(36, 18, 36, 18));
-            {
-                ComponentList settingsPane = new ComponentList();
-                {
-                    {
-                        StackPane sponsorPane = new StackPane();
-                        sponsorPane.setCursor(Cursor.HAND);
-                        sponsorPane.setOnMouseClicked(e -> onSponsor());
-
-                        GridPane gridPane = new GridPane();
-
-                        ColumnConstraints col = new ColumnConstraints();
-                        col.setHgrow(Priority.SOMETIMES);
-                        col.setMaxWidth(Double.POSITIVE_INFINITY);
-
-                        gridPane.getColumnConstraints().setAll(col);
-
-                        RowConstraints row = new RowConstraints();
-                        row.setMinHeight(Double.NEGATIVE_INFINITY);
-                        row.setValignment(VPos.TOP);
-                        row.setVgrow(Priority.SOMETIMES);
-                        gridPane.getRowConstraints().setAll(row);
-
-                        {
-                            Label label = new Label(i18n("sponsor.hmcl"));
-                            label.setWrapText(true);
-                            label.setTextAlignment(TextAlignment.JUSTIFY);
-                            GridPane.setRowIndex(label, 0);
-                            GridPane.setColumnIndex(label, 0);
-                            gridPane.getChildren().add(label);
-                        }
-
-                        sponsorPane.getChildren().setAll(gridPane);
-                        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/ToolbarListPageSkin.java

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

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

@@ -0,0 +1,200 @@
+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

@@ -0,0 +1,127 @@
+/*
+ * 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.beans.binding.Bindings;
+import javafx.event.EventHandler;
+import javafx.fxml.FXML;
+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.Pane;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+import javafx.scene.paint.Color;
+import org.jackhuang.hmcl.Launcher;
+import org.jackhuang.hmcl.setting.Theme;
+
+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;
+
+    public VersionItem() {
+        FXUtils.loadFXML(this, "/assets/fxml/version-item.fxml");
+        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));
+
+        FXUtils.installTooltip(btnSettings, Launcher.i18n("version.settings"));
+        FXUtils.installTooltip(btnUpdate, Launcher.i18n("version.update"));
+        FXUtils.installTooltip(btnLaunch, Launcher.i18n("version.launch"));
+        FXUtils.installTooltip(btnScript, Launcher.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

@@ -0,0 +1,70 @@
+/*
+ * 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

@@ -0,0 +1,208 @@
+/*
+ * 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.Launcher;
+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 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, Launcher.i18n("version.manage.remove"));
+        FXUtils.installTooltip(btnBrowseMenu, Launcher.i18n("settings.game.exploration"));
+        FXUtils.installTooltip(btnManagementMenu, Launcher.i18n("settings.game.management"));
+        FXUtils.installTooltip(btnExport, Launcher.i18n("modpack.export"));
+    }
+
+    public void load(String id, Profile profile) {
+        this.version = id;
+        this.profile = profile;
+
+        title.set(Launcher.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(Launcher.i18n("version.manage.remove.confirm", version), Launcher.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(Launcher.i18n("version.manage.rename.message"), res -> {
+            if (profile.getRepository().renameVersion(version, res)) {
+                profile.getRepository().refreshVersionsAsync().start();
+                Controllers.navigate(null);
+            }
+        });
+    }
+
+    public static void exportVersion(Profile profile, String version) {
+        Controllers.getDecorator().startWizard(new ExportWizardProvider(profile, version), Launcher.i18n("modpack.wizard"));
+    }
+}

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

@@ -0,0 +1,256 @@
+/*
+ * 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.JFXCheckBox;
+import com.jfoenix.controls.JFXComboBox;
+import com.jfoenix.controls.JFXTextField;
+import com.jfoenix.controls.JFXToggleButton;
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.scene.Node;
+import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.Toggle;
+import javafx.scene.image.Image;
+import javafx.scene.layout.VBox;
+import javafx.stage.FileChooser;
+import org.jackhuang.hmcl.Launcher;
+import org.jackhuang.hmcl.setting.EnumGameDirectory;
+import org.jackhuang.hmcl.setting.Profile;
+import org.jackhuang.hmcl.setting.VersionSetting;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.ui.construct.ComponentList;
+import org.jackhuang.hmcl.ui.construct.ImagePickerItem;
+import org.jackhuang.hmcl.ui.construct.MultiFileItem;
+import org.jackhuang.hmcl.util.*;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Optional;
+import java.util.logging.Level;
+import java.util.stream.Collectors;
+
+public final class VersionSettingsController {
+    private VersionSetting lastVersionSetting = null;
+    private Profile profile;
+    private String versionId;
+
+    @FXML private VBox rootPane;
+    @FXML private ScrollPane scroll;
+    @FXML private JFXTextField txtWidth;
+    @FXML private JFXTextField txtHeight;
+    @FXML private JFXTextField txtMaxMemory;
+    @FXML private JFXTextField txtJVMArgs;
+    @FXML private JFXTextField txtGameArgs;
+    @FXML private JFXTextField txtMetaspace;
+    @FXML private JFXTextField txtWrapper;
+    @FXML private JFXTextField txtPrecallingCommand;
+    @FXML private JFXTextField txtServerIP;
+    @FXML private ComponentList advancedSettingsPane;
+    @FXML private JFXComboBox<?> cboLauncherVisibility;
+    @FXML private JFXCheckBox chkFullscreen;
+    @FXML private Label lblPhysicalMemory;
+    @FXML private JFXToggleButton chkNoJVMArgs;
+    @FXML private JFXToggleButton chkNoCommon;
+    @FXML private JFXToggleButton chkNoGameCheck;
+    @FXML private MultiFileItem globalItem;
+    @FXML private MultiFileItem javaItem;
+    @FXML private MultiFileItem gameDirItem;
+    @FXML private JFXToggleButton chkShowLogs;
+    @FXML private ImagePickerItem iconPickerItem;
+
+    @FXML
+    private void initialize() {
+        lblPhysicalMemory.setText(Launcher.i18n("settings.physical_memory") + ": " + OperatingSystem.TOTAL_MEMORY + "MB");
+
+        FXUtils.smoothScrolling(scroll);
+
+        Task.of(variables -> variables.set("list", JavaVersion.getJREs().values().stream().map(javaVersion ->
+                javaItem.createChildren(javaVersion.getVersion(), javaVersion.getBinary().getAbsolutePath(), javaVersion)
+        ).collect(Collectors.toList()))).subscribe(Schedulers.javafx(), variables ->
+                javaItem.loadChildren(variables.<Collection<Node>>get("list"))
+        );
+
+        if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS)
+            javaItem.getExtensionFilters().add(new FileChooser.ExtensionFilter("Java", "java.exe", "javaw.exe"));
+
+        gameDirItem.loadChildren(Arrays.asList(
+                gameDirItem.createChildren(Launcher.i18n("settings.advanced.game_dir.default"), EnumGameDirectory.ROOT_FOLDER),
+                gameDirItem.createChildren(Launcher.i18n("settings.advanced.game_dir.independent"), EnumGameDirectory.VERSION_FOLDER)
+        ));
+
+        globalItem.loadChildren(Arrays.asList(
+                globalItem.createChildren(Launcher.i18n("settings.type.global"), true),
+                globalItem.createChildren(Launcher.i18n("settings.type.special"), false)
+        ));
+    }
+
+    public void loadVersionSetting(Profile profile, String versionId) {
+        rootPane.getChildren().remove(advancedSettingsPane);
+
+        this.profile = profile;
+        this.versionId = versionId;
+
+        VersionSetting versionSetting = profile.getVersionSetting(versionId);
+
+        gameDirItem.setDisable(profile.getRepository().isModpack(versionId));
+        globalItem.setDisable(profile.getRepository().isModpack(versionId));
+
+        if (lastVersionSetting != null) {
+            FXUtils.unbindInt(txtWidth, lastVersionSetting.widthProperty());
+            FXUtils.unbindInt(txtHeight, lastVersionSetting.heightProperty());
+            FXUtils.unbindInt(txtMaxMemory, lastVersionSetting.maxMemoryProperty());
+            FXUtils.unbindString(javaItem.getTxtCustom(), lastVersionSetting.javaDirProperty());
+            FXUtils.unbindString(gameDirItem.getTxtCustom(), lastVersionSetting.gameDirProperty());
+            FXUtils.unbindString(txtJVMArgs, lastVersionSetting.javaArgsProperty());
+            FXUtils.unbindString(txtGameArgs, lastVersionSetting.minecraftArgsProperty());
+            FXUtils.unbindString(txtMetaspace, lastVersionSetting.permSizeProperty());
+            FXUtils.unbindString(txtWrapper, lastVersionSetting.wrapperProperty());
+            FXUtils.unbindString(txtPrecallingCommand, lastVersionSetting.preLaunchCommandProperty());
+            FXUtils.unbindString(txtServerIP, lastVersionSetting.serverIpProperty());
+            FXUtils.unbindBoolean(chkFullscreen, lastVersionSetting.fullscreenProperty());
+            FXUtils.unbindBoolean(chkNoGameCheck, lastVersionSetting.notCheckGameProperty());
+            FXUtils.unbindBoolean(chkNoCommon, lastVersionSetting.noCommonProperty());
+            FXUtils.unbindBoolean(chkShowLogs, lastVersionSetting.showLogsProperty());
+            FXUtils.unbindEnum(cboLauncherVisibility);
+        }
+
+        FXUtils.bindInt(txtWidth, versionSetting.widthProperty());
+        FXUtils.bindInt(txtHeight, versionSetting.heightProperty());
+        FXUtils.bindInt(txtMaxMemory, versionSetting.maxMemoryProperty());
+        FXUtils.bindString(javaItem.getTxtCustom(), versionSetting.javaDirProperty());
+        FXUtils.bindString(gameDirItem.getTxtCustom(), versionSetting.gameDirProperty());
+        FXUtils.bindString(txtJVMArgs, versionSetting.javaArgsProperty());
+        FXUtils.bindString(txtGameArgs, versionSetting.minecraftArgsProperty());
+        FXUtils.bindString(txtMetaspace, versionSetting.permSizeProperty());
+        FXUtils.bindString(txtWrapper, versionSetting.wrapperProperty());
+        FXUtils.bindString(txtPrecallingCommand, versionSetting.preLaunchCommandProperty());
+        FXUtils.bindString(txtServerIP, versionSetting.serverIpProperty());
+        FXUtils.bindBoolean(chkFullscreen, versionSetting.fullscreenProperty());
+        FXUtils.bindBoolean(chkNoGameCheck, versionSetting.notCheckGameProperty());
+        FXUtils.bindBoolean(chkNoCommon, versionSetting.noCommonProperty());
+        FXUtils.bindBoolean(chkShowLogs, versionSetting.showLogsProperty());
+        FXUtils.bindEnum(cboLauncherVisibility, versionSetting.launcherVisibilityProperty());
+
+        boolean flag = false;
+        Toggle defaultToggle = null;
+        for (Toggle toggle : javaItem.getGroup().getToggles()) {
+            if (toggle.getUserData() == Lang.invoke(versionSetting::getJavaVersion)) {
+                toggle.setSelected(true);
+                flag = true;
+            } else if (toggle.getUserData() == JavaVersion.fromCurrentEnvironment()) {
+                defaultToggle = toggle;
+            }
+        }
+
+        javaItem.setToggleSelectedListener(newValue -> {
+            if (javaItem.isCustomToggle(newValue)) {
+                versionSetting.setJava("Custom");
+            } else {
+                versionSetting.setJava(((JavaVersion) newValue.getUserData()).getVersion());
+            }
+        });
+
+        if (!flag) {
+            Optional.ofNullable(defaultToggle).ifPresent(t -> t.setSelected(true));
+        }
+
+        versionSetting.javaDirProperty().setChangedListener(it -> initJavaSubtitle(versionSetting));
+        versionSetting.javaProperty().setChangedListener(it -> initJavaSubtitle(versionSetting));
+        initJavaSubtitle(versionSetting);
+
+        if (versionSetting.isUsesGlobal())
+            globalItem.getGroup().getToggles().stream().filter(it -> it.getUserData() == Boolean.TRUE).findFirst().ifPresent(it -> it.setSelected(true));
+        else
+            globalItem.getGroup().getToggles().stream().filter(it -> it.getUserData() == Boolean.FALSE).findFirst().ifPresent(it -> it.setSelected(true));
+        globalItem.setToggleSelectedListener(newValue -> {
+            if ((Boolean) newValue.getUserData())
+                profile.globalizeVersionSetting(versionId);
+            else
+                profile.specializeVersionSetting(versionId);
+
+            Platform.runLater(() -> loadVersionSetting(profile, versionId));
+        });
+
+        versionSetting.usesGlobalProperty().setChangedListenerAndOperate(it ->
+                globalItem.setSubtitle(Launcher.i18n(versionSetting.isUsesGlobal() ? "settings.type.global" : "settings.type.special")));
+
+        gameDirItem.getGroup().getToggles().stream()
+                .filter(it -> it.getUserData() == versionSetting.getGameDirType())
+                .findFirst().ifPresent(toggle -> toggle.setSelected(true));
+
+        gameDirItem.setCustomUserData(EnumGameDirectory.CUSTOM);
+        gameDirItem.setToggleSelectedListener(newValue -> versionSetting.setGameDirType((EnumGameDirectory) newValue.getUserData()));
+
+        versionSetting.gameDirProperty().setChangedListener(it -> initGameDirSubtitle(versionSetting));
+        versionSetting.gameDirTypeProperty().setChangedListener(it -> initGameDirSubtitle(versionSetting));
+        initGameDirSubtitle(versionSetting);
+
+        lastVersionSetting = versionSetting;
+
+        loadIcon();
+    }
+
+    private void initJavaSubtitle(VersionSetting versionSetting) {
+        Task.of(variables -> variables.set("java", versionSetting.getJavaVersion()))
+                .subscribe(Task.of(Schedulers.javafx(),
+                        variables -> javaItem.setSubtitle(variables.<JavaVersion>getOptional("java")
+                                .map(JavaVersion::getBinary).map(File::getAbsolutePath).orElse("Invalid Java Directory"))));
+    }
+
+    private void initGameDirSubtitle(VersionSetting versionSetting) {
+        gameDirItem.setSubtitle(profile.getRepository().getRunDirectory(versionId).getAbsolutePath());
+    }
+
+    @FXML
+    private void onShowAdvanced() {
+        if (!rootPane.getChildren().contains(advancedSettingsPane))
+            rootPane.getChildren().add(advancedSettingsPane);
+        else
+            rootPane.getChildren().remove(advancedSettingsPane);
+    }
+
+    @FXML
+    private void onExploreIcon() {
+        FileChooser chooser = new FileChooser();
+        chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(Launcher.i18n("extension.png"), "*.png"));
+        File selectedFile = chooser.showOpenDialog(Controllers.getStage());
+        if (selectedFile != null) {
+            File iconFile = profile.getRepository().getVersionIcon(versionId);
+            try {
+                FileUtils.copyFile(selectedFile, iconFile);
+                loadIcon();
+            } catch (IOException e) {
+                Logging.LOG.log(Level.SEVERE, "Failed to copy icon file from " + selectedFile + " to " + iconFile, e);
+            }
+        }
+    }
+
+    private void loadIcon() {
+        File iconFile = profile.getRepository().getVersionIcon(versionId);
+        if (iconFile.exists())
+            iconPickerItem.setImage(new Image("file:" + iconFile.getAbsolutePath()));
+        else
+            iconPickerItem.setImage(FXUtils.DEFAULT_ICON);
+        FXUtils.limitSize(iconPickerItem.getImageView(), 32, 32);
+    }
+}

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

@@ -1,58 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.ui;
-
-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) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
- *
+ * 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
@@ -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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.ui;
 
@@ -21,15 +21,14 @@ import javafx.scene.Scene;
 import javafx.scene.image.Image;
 import javafx.scene.web.WebView;
 import javafx.stage.Stage;
-
-import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import org.jackhuang.hmcl.setting.Settings;
 
 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(Settings.INSTANCE.getTheme().getStylesheets());
         getIcons().add(new Image("/assets/img/icon.png"));
     }
 

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

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

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

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

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

@@ -1,332 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.ui.account;
-
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXComboBox;
-import com.jfoenix.controls.JFXPasswordField;
-import com.jfoenix.controls.JFXTextField;
-import javafx.application.Platform;
-import javafx.beans.binding.Bindings;
-import javafx.beans.property.ListProperty;
-import javafx.beans.property.ReadOnlyObjectProperty;
-import javafx.beans.property.SimpleListProperty;
-import javafx.collections.FXCollections;
-import javafx.fxml.FXML;
-import javafx.geometry.Pos;
-import javafx.scene.control.Hyperlink;
-import javafx.scene.control.Label;
-import javafx.scene.image.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.YggdrasilService;
-import org.jackhuang.hmcl.game.TexturesLoader;
-import org.jackhuang.hmcl.setting.Accounts;
-import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.ui.Controllers;
-import org.jackhuang.hmcl.ui.FXUtils;
-import org.jackhuang.hmcl.ui.construct.*;
-import org.jackhuang.hmcl.util.javafx.BindingMapping;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-
-import static java.util.Collections.emptyList;
-import static java.util.Collections.unmodifiableList;
-import static java.util.Objects.requireNonNull;
-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 {
-
-    @FXML private JFXTextField txtUsername;
-    @FXML private JFXPasswordField txtPassword;
-    @FXML private Label lblCreationWarning;
-    @FXML private Label lblPassword;
-    @FXML private JFXComboBox<AccountFactory<?>> cboType;
-    @FXML private JFXComboBox<AuthlibInjectorServer> cboServers;
-    @FXML private Label lblInjectorServer;
-    @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());
-        cboServers.getItems().addListener(onInvalidating(this::selectDefaultServer));
-        selectDefaultServer();
-
-        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());
-
-        txtUsername.getValidators().add(new Validator(i18n("input.email"), str -> !txtPassword.isVisible() || str.contains("@")));
-
-        btnAccept.disableProperty().bind(Bindings.createBooleanBinding(
-                () -> !( // consider the opposite situation: input is valid
-                        txtUsername.validate() &&
-                        // invisible means the field is not needed, neither should it be validated
-                        (!txtPassword.isVisible() || txtPassword.validate()) &&
-                        (!cboServers.isVisible() || cboServers.getSelectionModel().getSelectedItem() != null)
-                ),
-                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);
-    }
-
-    /**
-     * Selects the first server if no server is selected.
-     */
-    private void selectDefaultServer() {
-        if (!cboServers.getItems().isEmpty() && cboServers.getSelectionModel().isEmpty()) {
-            cboServers.getSelectionModel().select(0);
-        }
-    }
-
-    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)}.
-     */
-    private Object getAuthAdditionalData() {
-        AccountFactory<?> factory = cboType.getSelectionModel().getSelectedItem();
-        if (factory == Accounts.FACTORY_AUTHLIB_INJECTOR) {
-            return requireNonNull(cboServers.getSelectionModel().getSelectedItem(), "selected server cannot be null");
-        }
-        return null;
-    }
-
-    @FXML
-    private void onCreationAccept() {
-        if (btnAccept.isDisabled())
-            return;
-
-        acceptPane.showSpinner();
-        lblCreationWarning.setText("");
-        setDisable(true);
-
-        String username = txtUsername.getText();
-        String password = txtPassword.getText();
-        AccountFactory<?> factory = cboType.getSelectionModel().getSelectedItem();
-        Object additionalData = getAuthAdditionalData();
-
-        Task.ofResult(() -> factory.create(new Selector(), username, password, additionalData))
-                .whenComplete(Schedulers.javafx(), account -> {
-                    int oldIndex = Accounts.getAccounts().indexOf(account);
-                    if (oldIndex == -1) {
-                        Accounts.getAccounts().add(account);
-                    } else {
-                        // adding an already-added account
-                        // instead of discarding the new account, we first remove the existing one then add the new one
-                        Accounts.getAccounts().remove(oldIndex);
-                        Accounts.getAccounts().add(oldIndex, account);
-                    }
-
-                    // select the new account
-                    Accounts.setSelectedAccount(account);
-
-                    acceptPane.hideSpinner();
-                    fireEvent(new DialogCloseEvent());
-                }, exception -> {
-                    if (exception instanceof NoSelectedCharacterException) {
-                        fireEvent(new DialogCloseEvent());
-                    } else {
-                        lblCreationWarning.setText(accountException(exception));
-                    }
-                    setDisable(false);
-                    acceptPane.hideSpinner();
-                }).start();
-    }
-
-    @FXML
-    private void onCreationCancel() {
-        fireEvent(new DialogCloseEvent());
-    }
-
-    @FXML
-    private void onManageInjecterServers() {
-        fireEvent(new DialogCloseEvent());
-        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"));
-            StackPane.setAlignment(cancel, Pos.BOTTOM_RIGHT);
-            cancel.setOnMouseClicked(e -> latch.countDown());
-
-            listBox.startCategory(i18n("account.choose"));
-
-            setCenter(listBox);
-
-            HBox hbox = new HBox();
-            hbox.setAlignment(Pos.CENTER_RIGHT);
-            hbox.getChildren().add(cancel);
-            setBottom(hbox);
-        }
-
-        @Override
-        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);
-
-                    IconedItem accountItem = new IconedItem(portraitView, profile.getName());
-                    accountItem.setOnMouseClicked(e -> {
-                        selectedProfile = profile;
-                        latch.countDown();
-                    });
-                    listBox.add(accountItem);
-                }
-                Controllers.dialog(this);
-            });
-
-            try {
-                latch.await();
-
-                if (selectedProfile == null)
-                    throw new NoSelectedCharacterException();
-
-                return selectedProfile;
-            } catch (InterruptedException ignore) {
-                throw new NoSelectedCharacterException();
-            } finally {
-                runInFX(() -> Selector.this.fireEvent(new DialogCloseEvent()));
-            }
-        }
-    }
-
-    public static String accountException(Exception exception) {
-        if (exception instanceof NoCharacterException) {
-            return i18n("account.failed.no_character");
-        } else if (exception instanceof ServerDisconnectException) {
-            return i18n("account.failed.connect_authentication_server");
-        } else if (exception instanceof ServerResponseMalformedException) {
-            return i18n("account.failed.server_response_malformed");
-        } else if (exception instanceof RemoteAuthenticationException) {
-            RemoteAuthenticationException remoteException = (RemoteAuthenticationException) exception;
-            String remoteMessage = remoteException.getRemoteMessage();
-            if ("ForbiddenOperationException".equals(remoteException.getRemoteName()) && remoteMessage != null) {
-                if (remoteMessage.contains("Invalid credentials"))
-                    return i18n("account.failed.invalid_credentials");
-                else if (remoteMessage.contains("Invalid token"))
-                    return i18n("account.failed.invalid_token");
-                else if (remoteMessage.contains("Invalid username or password"))
-                    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,141 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.ui.account;
-
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXDialogLayout;
-import com.jfoenix.controls.JFXTextField;
-
-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 java.io.IOException;
-import java.util.logging.Level;
-
-import static org.jackhuang.hmcl.setting.ConfigHolder.config;
-import static org.jackhuang.hmcl.ui.FXUtils.loadFXML;
-import static org.jackhuang.hmcl.util.Logging.LOG;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
-public class AddAuthlibInjectorServerPane extends StackPane implements DialogAware {
-
-    @FXML private StackPane addServerContainer;
-    @FXML private Label lblServerUrl;
-    @FXML private Label lblServerName;
-    @FXML private Label lblCreationWarning;
-    @FXML private Label lblServerWarning;
-    @FXML private JFXTextField txtServerUrl;
-    @FXML private JFXDialogLayout addServerPane;
-    @FXML private JFXDialogLayout confirmServerPane;
-    @FXML private SpinnerPane nextPane;
-    @FXML private JFXButton btnAddNext;
-
-    private TransitionHandler transitionHandler;
-
-    private AuthlibInjectorServer serverBeingAdded;
-
-    public AddAuthlibInjectorServerPane(String url) {
-        this();
-        txtServerUrl.setText(url);
-        onAddNext();
-    }
-
-    public AddAuthlibInjectorServerPane() {
-        loadFXML(this, "/assets/fxml/authlib-injector-server-add.fxml");
-        transitionHandler = new TransitionHandler(addServerContainer);
-        transitionHandler.setContent(addServerPane, ContainerAnimations.NONE.getAnimationProducer());
-
-        btnAddNext.disableProperty().bind(txtServerUrl.textProperty().isEmpty());
-        nextPane.hideSpinner();
-    }
-
-    @Override
-    public void onDialogShown() {
-        txtServerUrl.requestFocus();
-    }
-
-    private String resolveFetchExceptionMessage(Throwable exception) {
-        if (exception instanceof IOException) {
-            return i18n("account.failed.connect_injector_server");
-        } else {
-            return exception.getClass().getName() + ": " + exception.getLocalizedMessage();
-        }
-    }
-
-    @FXML
-    private void onAddCancel() {
-        fireEvent(new DialogCloseEvent());
-    }
-
-    @FXML
-    private void onAddNext() {
-        if (btnAddNext.isDisabled())
-            return;
-
-        lblCreationWarning.setText("");
-
-        String url = txtServerUrl.getText();
-
-        nextPane.showSpinner();
-        addServerPane.setDisable(true);
-
-        Task.of(() -> {
-            serverBeingAdded = AuthlibInjectorServer.locateServer(url);
-        }).whenComplete(Schedulers.javafx(), (isDependentSucceeded, exception) -> {
-            addServerPane.setDisable(false);
-            nextPane.hideSpinner();
-
-            if (isDependentSucceeded) {
-                lblServerName.setText(serverBeingAdded.getName());
-                lblServerUrl.setText(serverBeingAdded.getUrl());
-
-                lblServerWarning.setVisible("http".equals(NetworkUtils.toURL(serverBeingAdded.getUrl()).getProtocol()));
-
-                transitionHandler.setContent(confirmServerPane, ContainerAnimations.SWIPE_LEFT.getAnimationProducer());
-            } else {
-                LOG.log(Level.WARNING, "Failed to resolve auth server: " + url, exception);
-                lblCreationWarning.setText(resolveFetchExceptionMessage(exception));
-            }
-        }).start();
-
-    }
-
-    @FXML
-    private void onAddPrev() {
-        transitionHandler.setContent(addServerPane, ContainerAnimations.SWIPE_RIGHT.getAnimationProducer());
-    }
-
-    @FXML
-    private void onAddFinish() {
-        if (!config().getAuthlibInjectorServers().contains(serverBeingAdded)) {
-            config().getAuthlibInjectorServers().add(serverBeingAdded);
-        }
-        fireEvent(new DialogCloseEvent());
-    }
-
-}

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

@@ -1,77 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.ui.account;
-
-import javafx.beans.binding.Bindings;
-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.ui.FXUtils.loadFXML;
-import static org.jackhuang.hmcl.ui.FXUtils.smoothScrolling;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
-public class AuthlibInjectorServersPage extends StackPane implements DecoratorPage {
-    private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper(this, "title", i18n("account.injector.manage.title"));
-
-    @FXML private ScrollPane scrollPane;
-    @FXML private VBox listPane;
-    @FXML private StackPane contentPane;
-
-    private ObservableList<AuthlibInjectorServerItem> serverItems;
-
-    public AuthlibInjectorServersPage() {
-        loadFXML(this, "/assets/fxml/authlib-injector-servers.fxml");
-        smoothScrolling(scrollPane);
-
-        serverItems = MappedObservableList.create(config().getAuthlibInjectorServers(), this::createServerItem);
-        Bindings.bindContent(listPane.getChildren(), serverItems);
-    }
-
-    private AuthlibInjectorServerItem createServerItem(AuthlibInjectorServer server) {
-        return new AuthlibInjectorServerItem(server,
-                item -> config().getAuthlibInjectorServers().remove(item.getServer()));
-    }
-
-    @FXML
-    private void onAdd() {
-        Controllers.dialog(new AddAuthlibInjectorServerPane());
-    }
-
-    public String getTitle() {
-        return title.get();
-    }
-
-    @Override
-    public ReadOnlyStringProperty titleProperty() {
-        return title.getReadOnlyProperty();
-    }
-
-    public void setTitle(String title) {
-        this.title.set(title);
-    }
-}

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
- *
+ * 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
@@ -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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://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) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
- *
+ * 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
@@ -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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.ui.animation;
 
@@ -21,8 +21,8 @@ import javafx.animation.KeyFrame;
 
 import java.util.List;
 
+@FunctionalInterface
 public interface AnimationProducer {
-    void init(AnimationHandler handler);
 
     List<KeyFrame> animate(AnimationHandler handler);
 }

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
- *
+ * 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
@@ -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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.ui.animation;
 
@@ -24,60 +24,27 @@ import javafx.util.Duration;
 
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.function.Function;
 
 public enum ContainerAnimations {
-    NONE(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.getCurrentNode().setScaleX(1);
-        c.getCurrentNode().setScaleY(1);
-        c.getCurrentNode().setOpacity(1);
-    }, c -> Collections.emptyList()),
+    NONE(c -> Collections.emptyList()),
     /**
      * A fade between the old and new view
      */
-    FADE(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.getCurrentNode().setScaleX(1);
-        c.getCurrentNode().setScaleY(1);
-        c.getCurrentNode().setOpacity(0);
-    }, c ->
+    FADE(c ->
             Arrays.asList(new KeyFrame(Duration.ZERO,
-                            new KeyValue(c.getPreviousNode().opacityProperty(), 1, Interpolator.EASE_BOTH),
-                            new KeyValue(c.getCurrentNode().opacityProperty(), 0, Interpolator.EASE_BOTH)),
+                            new KeyValue(c.getPreviousNode().opacityProperty(), 1.0D, Interpolator.EASE_BOTH),
+                            new KeyValue(c.getCurrentNode().opacityProperty(), 0.0D, Interpolator.EASE_BOTH)),
                     new KeyFrame(c.getDuration(),
-                            new KeyValue(c.getPreviousNode().opacityProperty(), 0, Interpolator.EASE_BOTH),
-                            new KeyValue(c.getCurrentNode().opacityProperty(), 1, Interpolator.EASE_BOTH)))),
+                            new KeyValue(c.getPreviousNode().opacityProperty(), 0.0D, Interpolator.EASE_BOTH),
+                            new KeyValue(c.getCurrentNode().opacityProperty(), 1.0D, 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 ->
+    ZOOM_IN(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, Interpolator.EASE_BOTH)),
+                            new KeyValue(c.getPreviousNode().opacityProperty(), 1.0D, 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),
@@ -85,19 +52,11 @@ public enum ContainerAnimations {
     /**
      * A zoom effect
      */
-    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 ->
+    ZOOM_OUT(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, Interpolator.EASE_BOTH)),
+                            new KeyValue(c.getPreviousNode().opacityProperty(), 1.0D, 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),
@@ -105,16 +64,7 @@ public enum ContainerAnimations {
     /**
      * A swipe effect
      */
-    SWIPE_LEFT(c -> {
-        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 ->
+    SWIPE_LEFT(c ->
             Arrays.asList(new KeyFrame(Duration.ZERO,
                             new KeyValue(c.getCurrentNode().translateXProperty(), c.getCurrentRoot().getWidth(), Interpolator.EASE_BOTH),
                             new KeyValue(c.getPreviousNode().translateXProperty(), 0, Interpolator.EASE_BOTH)),
@@ -125,16 +75,7 @@ public enum ContainerAnimations {
     /**
      * A swipe effect
      */
-    SWIPE_RIGHT(c -> {
-        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 ->
+    SWIPE_RIGHT(c ->
             Arrays.asList(new KeyFrame(Duration.ZERO,
                             new KeyValue(c.getCurrentNode().translateXProperty(), -c.getCurrentRoot().getWidth(), Interpolator.EASE_BOTH),
                             new KeyValue(c.getPreviousNode().translateXProperty(), 0, Interpolator.EASE_BOTH)),
@@ -144,18 +85,8 @@ public enum ContainerAnimations {
 
     private final AnimationProducer animationProducer;
 
-    ContainerAnimations(Consumer<AnimationHandler> init, Function<AnimationHandler, List<KeyFrame>> animationProducer) {
-        this.animationProducer = new AnimationProducer() {
-            @Override
-            public void init(AnimationHandler handler) {
-                init.accept(handler);
-            }
-
-            @Override
-            public List<KeyFrame> animate(AnimationHandler handler) {
-                return animationProducer.apply(handler);
-            }
-        };
+    ContainerAnimations(AnimationProducer animationProducer) {
+        this.animationProducer = animationProducer;
     }
 
     public AnimationProducer getAnimationProducer() {

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

@@ -1,7 +1,7 @@
 /*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
- *
+ * 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
@@ -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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.ui.animation;
 
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
-import javafx.application.Platform;
 import javafx.scene.Node;
 import javafx.scene.Parent;
 import javafx.scene.layout.StackPane;
-import javafx.scene.shape.Rectangle;
 import javafx.util.Duration;
 
 public final class TransitionHandler implements AnimationHandler {
@@ -38,12 +36,6 @@ public final class TransitionHandler implements AnimationHandler {
     public TransitionHandler(StackPane view) {
         this.view = view;
         currentNode = view.getChildren().stream().findFirst().orElse(null);
-
-        // prevent content overflow
-        Rectangle clip = new Rectangle();
-        clip.widthProperty().bind(view.widthProperty());
-        clip.heightProperty().bind(view.heightProperty());
-        view.setClip(clip);
     }
 
     @Override
@@ -79,38 +71,28 @@ public final class TransitionHandler implements AnimationHandler {
 
         updateContent(newView);
 
-        transition.init(this);
-
-        // runLater or "init" will not work
-        Platform.runLater(() -> {
-            Timeline nowAnimation = new Timeline();
-            nowAnimation.getKeyFrames().addAll(transition.animate(this));
-            nowAnimation.getKeyFrames().add(new KeyFrame(duration, e -> {
-                view.setMouseTransparent(false);
-                view.getChildren().remove(previousNode);
-            }));
-            nowAnimation.play();
-            animation = nowAnimation;
-        });
+        Timeline nowAnimation = new Timeline();
+        nowAnimation.getKeyFrames().addAll(transition.animate(this));
+        nowAnimation.getKeyFrames().add(new KeyFrame(duration, e -> view.getChildren().remove(previousNode)));
+        nowAnimation.play();
+        animation = nowAnimation;
     }
 
     private void updateContent(Node newView) {
         if (view.getWidth() > 0 && view.getHeight() > 0) {
             previousNode = currentNode;
             if (previousNode == null)
-                previousNode = EMPTY_PANE;
+                previousNode = NULL;
         } else
-            previousNode = EMPTY_PANE;
+            previousNode = NULL;
 
-        if (previousNode == newView)
-            previousNode = EMPTY_PANE;
-
-        view.setMouseTransparent(true);
+        if (previousNode == currentNode)
+            previousNode = NULL;
 
         currentNode = newView;
 
         view.getChildren().setAll(previousNode, currentNode);
     }
 
-    private final StackPane EMPTY_PANE = new StackPane();
+    private static final StackPane NULL = new StackPane();
 }

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

@@ -1,6 +1,6 @@
 /*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ * 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
@@ -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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://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 || child instanceof AdvancedListItem)
+        if (child instanceof Pane)
             container.getChildren().add(child);
         else {
             StackPane pane = new StackPane();

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

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

@@ -1,108 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.ui.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) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
- *
+ * 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
@@ -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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://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) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
- *
+ * 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
@@ -13,29 +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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.ui.construct;
 
-import org.jackhuang.hmcl.util.javafx.MappedObservableList;
-
 import javafx.beans.DefaultProperty;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.ObjectBinding;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
-import javafx.css.PseudoClass;
 import javafx.scene.Node;
-import javafx.scene.control.Control;
-import javafx.scene.control.SkinBase;
+import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 
 @DefaultProperty("content")
-public class ComponentList extends Control {
+public class ComponentList extends StackPane {
+    private final VBox vbox = new VBox();
     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);
@@ -43,9 +39,35 @@ public class ComponentList extends Control {
     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();
     }
@@ -93,40 +115,4 @@ public class ComponentList extends Control {
     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) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
- *
+ * 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
@@ -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 <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
 package org.jackhuang.hmcl.ui.construct;
 
@@ -24,12 +24,9 @@ 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;
@@ -41,13 +38,13 @@ import org.jackhuang.hmcl.ui.SVG;
 /**
  * @author huangyuhui
  */
-class ComponentListCell extends StackPane {
+public class ComponentListCell extends StackPane {
     private final Node content;
     private Animation expandAnimation;
     private Rectangle clipRect;
     private final BooleanProperty expanded = new SimpleBooleanProperty(this, "expanded", false);
 
-    ComponentListCell(Node content) {
+    public ComponentListCell(Node content) {
         this.content = content;
 
         updateLayout();
@@ -78,57 +75,44 @@ class ComponentListCell extends StackPane {
             content.getStyleClass().remove("options-list");
             content.getStyleClass().add("options-sublist");
 
-            BorderPane groupNode = new BorderPane();
+            StackPane groupNode = new StackPane();
+            groupNode.getStyleClass().add("options-list-item-header");
 
             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();
-            labelVBox.setAlignment(Pos.CENTER_LEFT);
+            Label label = new Label();
+            label.textProperty().bind(list.titleProperty());
+            label.setMouseTransparent(true);
+            labelVBox.getChildren().add(label);
 
-            boolean overrideHeaderLeft = false;
-            if (list instanceof ComponentSublist) {
-                Node leftNode = ((ComponentSublist) list).getHeaderLeft();
-                if (leftNode != null) {
-                    labelVBox.getChildren().setAll(leftNode);
-                    overrideHeaderLeft = true;
-                }
+            if (list.isHasSubtitle()) {
+                Label subtitleLabel = new Label();
+                subtitleLabel.textProperty().bind(list.subtitleProperty());
+                subtitleLabel.setMouseTransparent(true);
+                subtitleLabel.getStyleClass().add("subtitle-label");
+                labelVBox.getChildren().add(subtitleLabel);
             }
 
-            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);
+            StackPane.setAlignment(labelVBox, Pos.CENTER_LEFT);
+            groupNode.getChildren().setAll(labelVBox, expandButton);
 
             VBox container = new VBox();
-            container.setPadding(new Insets(8, 0, 0, 0));
+            container.setStyle("-fx-padding: 8 0 0 0;");
             FXUtils.setLimitHeight(container, 0);
-            FXUtils.setOverflowHidden(container, true);
+            Rectangle clipRect = new Rectangle();
+            clipRect.widthProperty().bind(container.widthProperty());
+            clipRect.heightProperty().bind(container.heightProperty());
+            container.setClip(clipRect);
             container.getChildren().setAll(content);
-            groupNode.setBottom(container);
+
+            VBox holder = new VBox();
+            holder.getChildren().setAll(groupNode, container);
+            holder.getStyleClass().add("options-list-item-container");
 
             expandButton.setOnMouseClicked(e -> {
                 if (expandAnimation != null && expandAnimation.getStatus() == Animation.Status.RUNNING) {
@@ -160,7 +144,7 @@ class ComponentListCell extends StackPane {
             expandedProperty().addListener((a, b, newValue) ->
                     expandIcon.setRotate(newValue ? 180 : 0));
 
-            getChildren().setAll(groupNode);
+            getChildren().setAll(holder);
         } else
             getChildren().setAll(content);
     }

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

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