Fix NPE when first start

重构

.gitignore

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

HMCL/build.gradle

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

HMCL/proguard.pro

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

@@ -0,0 +1,152 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
+package org.jackhuang.hmcl;
+
+import com.jfoenix.concurrency.JFXUtilities;
+import javafx.application.Application;
+import javafx.application.Platform;
+import javafx.stage.Stage;
+import org.jackhuang.hmcl.setting.ConfigHolder;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.upgrade.UpdateChecker;
+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.LinkedList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+public final class Launcher extends Application {
+
+    @Override
+    public void start(Stage primaryStage) {
+        Thread.currentThread().setUncaughtExceptionHandler(CRASH_REPORTER);
+
+        try {
+            ConfigHolder.init();
+        } catch (IOException e) {
+            Main.showErrorAndExit(i18n("fatal.config_loading_failure", Paths.get("").toAbsolutePath().normalize()));
+        }
+
+        try {
+            // When launcher visibility is set to "hide and reopen" without Platform.implicitExit = false,
+            // Stage.show() cannot work again because JavaFX Toolkit have already shut down.
+            Platform.setImplicitExit(false);
+            Controllers.initialize(primaryStage);
+            primaryStage.setResizable(false);
+            primaryStage.setScene(Controllers.getScene());
+
+            UpdateChecker.init();
+
+            primaryStage.show();
+        } catch (Throwable e) {
+            CRASH_REPORTER.uncaughtException(Thread.currentThread(), e);
+        }
+    }
+
+    public static void main(String[] args) {
+        Thread.setDefaultUncaughtExceptionHandler(CRASH_REPORTER);
+
+        if (!FileUtils.makeDirectory(LOG_DIRECTORY))
+            System.out.println("Unable to create log directory " + LOG_DIRECTORY + ", log files cannot be generated.");
+
+        try {
+            Logging.start(LOG_DIRECTORY);
+
+            // NetworkUtils.setUserAgentSupplier(() -> "Hello Minecraft! Launcher");
+            Constants.UI_THREAD_SCHEDULER = Constants.JAVAFX_UI_THREAD_SCHEDULER;
+
+            LOG.info("*** " + Metadata.TITLE + " ***");
+            LOG.info("Operating System: " + System.getProperty("os.name") + ' ' + OperatingSystem.SYSTEM_VERSION);
+            LOG.info("Java Version: " + System.getProperty("java.version") + ", " + System.getProperty("java.vendor"));
+            LOG.info("Java VM Version: " + System.getProperty("java.vm.name") + " (" + System.getProperty("java.vm.info") + "), " + System.getProperty("java.vm.vendor"));
+            LOG.info("Java Home: " + System.getProperty("java.home"));
+            LOG.info("Current Directory: " + Paths.get("").toAbsolutePath());
+            LOG.info("HMCL Directory: " + HMCL_DIRECTORY);
+            LOG.info("Memory: " + Runtime.getRuntime().maxMemory() / 1024 / 1024 + "MB");
+            ManagementFactory.getMemoryPoolMXBeans().stream().filter(bean -> bean.getName().equals("Metaspace")).findAny()
+                    .ifPresent(bean -> LOG.info("Metaspace: " + bean.getUsage().getUsed() / 1024 / 1024 + "MB"));
+
+            launch(args);
+        } catch (Throwable e) { // Fucking JavaFX will suppress the exception and will break our crash reporter.
+            CRASH_REPORTER.uncaughtException(Thread.currentThread(), e);
+        }
+    }
+
+    public static void stopApplication() {
+        LOG.info("Stopping application.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
+
+        JFXUtilities.runInFX(() -> {
+            if (Controllers.getStage() == null)
+                return;
+            Controllers.getStage().close();
+            Schedulers.shutdown();
+            Controllers.shutdown();
+            Platform.exit();
+            Lang.executeDelayed(OperatingSystem::forceGC, TimeUnit.SECONDS, 5, true);
+        });
+    }
+
+    public static void stopWithoutPlatform() {
+        LOG.info("Stopping application without JavaFX Toolkit.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
+
+        JFXUtilities.runInFX(() -> {
+            if (Controllers.getStage() == null)
+                return;
+            Controllers.getStage().close();
+            Schedulers.shutdown();
+            Controllers.shutdown();
+            Lang.executeDelayed(OperatingSystem::forceGC, TimeUnit.SECONDS, 5, true);
+        });
+    }
+
+    public static List<File> getCurrentJarFiles() {
+        List<File> result = new LinkedList<>();
+        if (Launcher.class.getClassLoader() instanceof URLClassLoader) {
+            URL[] urls = ((URLClassLoader) Launcher.class.getClassLoader()).getURLs();
+            for (URL u : urls)
+                try {
+                    File f = new File(u.toURI());
+                    if (f.isFile() && (f.getName().endsWith(".exe") || f.getName().endsWith(".jar")))
+                        result.add(f);
+                } catch (URISyntaxException e) {
+                    return null;
+                }
+        }
+        if (result.isEmpty())
+            return null;
+        else
+            return result;
+    }
+
+    public static final File MINECRAFT_DIRECTORY = OperatingSystem.getWorkingDirectory("minecraft");
+    public static final File HMCL_DIRECTORY = OperatingSystem.getWorkingDirectory("hmcl");
+    public static final File LOG_DIRECTORY = new File(Launcher.HMCL_DIRECTORY, "logs");
+
+    public static final CrashReporter CRASH_REPORTER = new CrashReporter();
+}

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

@@ -17,126 +17,97 @@
  */
 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.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.*;
+import org.jackhuang.hmcl.setting.ConfigHolder;
+import org.jackhuang.hmcl.upgrade.UpdateHandler;
 
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509TrustManager;
+import javax.swing.*;
 import java.io.File;
-import java.util.Arrays;
-import java.util.ResourceBundle;
-import java.util.concurrent.TimeUnit;
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.X509Certificate;
 import java.util.logging.Level;
 
-public final class Main extends Application {
+import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
-    @Override
-    public void start(Stage primaryStage) {
-        Thread.currentThread().setUncaughtExceptionHandler(CRASH_REPORTER);
-
-        try {
-            // When launcher visibility is set to "hide and reopen" without Platform.implicitExit = false,
-            // Stage.show() cannot work again because JavaFX Toolkit have already shut down.
-            Platform.setImplicitExit(false);
-            Controllers.initialize(primaryStage);
-            primaryStage.setResizable(false);
-            primaryStage.setScene(Controllers.getScene());
-            primaryStage.show();
-        } catch (Throwable e) {
-            CRASH_REPORTER.uncaughtException(Thread.currentThread(), e);
-        }
-    }
+public final class Main {
 
     public static void main(String[] args) {
-        Thread.setDefaultUncaughtExceptionHandler(CRASH_REPORTER);
+        System.setProperty("java.net.useSystemProxies", "true");
 
+        checkJavaFX();
+        checkDirectoryPath();
+        checkDSTRootCAX3();
+
+        if (UpdateHandler.processArguments(args)) {
+            return;
+        }
+
+        Launcher.main(args);
+    }
+
+    private static void checkDirectoryPath() {
+        String currentDirectory = new File("").getAbsolutePath();
+        if (currentDirectory.contains("!")) {
+            // 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 {
-            // 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 + " ***");
-
-            UPDATE_CHECKER.process(false)
-                    .then(Task.of(Schedulers.javafx(), () -> {
-                        if (UPDATE_CHECKER.isOutOfDate())
-                            Controllers.showUpdate();
-                    }))
-                    .start();
-
-            launch(args);
-        } catch (Throwable e) { // Fucking JavaFX will suppress the exception and will break our crash reporter.
-            CRASH_REPORTER.uncaughtException(Thread.currentThread(), e);
+            Class.forName("javafx.application.Application");
+        } catch (ClassNotFoundException e) {
+            showErrorAndExit(i18n("fatal.missing_javafx"));
         }
     }
 
-    public static void stopApplication() {
-        JFXUtilities.runInFX(() -> {
-            stopWithoutPlatform();
-            Platform.exit();
-        });
-    }
-
-    public static void stopWithoutPlatform() {
-        JFXUtilities.runInFX(() -> {
-            Controllers.getStage().close();
-
-            Logging.LOG.info("Shutting down executor services.");
-            Schedulers.shutdown();
-
-            Controllers.shutdown();
-
-            Lang.executeDelayed(OperatingSystem::forceGC, TimeUnit.SECONDS, 5, true);
-        });
-    }
-
-    public static String i18n(String key) {
+    private static void checkDSTRootCAX3() {
+        TrustManagerFactory tmf;
         try {
-            return RESOURCE_BUNDLE.getString(key);
-        } catch (Exception e) {
-            Logging.LOG.log(Level.SEVERE, "Cannot find key " + key + " in resource bundle", e);
-            return key;
+            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;
         }
-    }
-
-    public static String i18n(String key, Object... formatArgs) {
-        return String.format(i18n(key), formatArgs);
-    }
-
-    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 + "/");
+        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"));
     }
 
-    public static final File MINECRAFT_DIRECTORY = getWorkingDirectory("minecraft");
-    public static final File HMCL_DIRECTORY = getWorkingDirectory("hmcl");
+    /**
+     * 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);
+    }
 
-    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();
+    /**
+     * 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);
+    }
 
-    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/Metadata.java

@@ -0,0 +1,36 @@
+/*
+ * 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;
+
+import org.jackhuang.hmcl.util.JarUtils;
+
+/**
+ * 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";
+}

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

@@ -19,12 +19,12 @@ package org.jackhuang.hmcl.game;
 
 import javafx.geometry.Rectangle2D;
 import javafx.scene.image.Image;
-import org.jackhuang.hmcl.Main;
+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.setting.Accounts;
 import org.jackhuang.hmcl.task.FileDownloadTask;
 import org.jackhuang.hmcl.task.Scheduler;
 import org.jackhuang.hmcl.task.Schedulers;
@@ -33,48 +33,32 @@ 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;
+import java.util.*;
 
 public final class AccountHelper {
-    public static final AccountHelper INSTANCE = new AccountHelper();
+
     private AccountHelper() {}
 
-    public static final File SKIN_DIR = new File(Main.HMCL_DIRECTORY, "skins");
+    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()) {
+        for (Account account : Accounts.getAccounts()) {
             if (account instanceof YggdrasilAccount) {
-                new SkinLoadTask((YggdrasilAccount) account, proxy, false).start();
+                new SkinLoadTask((YggdrasilAccount) account, 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);
+        return new SkinLoadTask(account, false);
     }
 
     public static Task refreshSkinAsync(YggdrasilAccount account) {
-        return refreshSkinAsync(account, Settings.INSTANCE.getProxy());
+        return new SkinLoadTask(account, true);
     }
 
-    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");
+    private static File getSkinFile(UUID uuid) {
+        return new File(SKIN_DIR, uuid + ".png");
     }
 
     public static Image getSkin(YggdrasilAccount account) {
@@ -82,9 +66,11 @@ public final class AccountHelper {
     }
 
     public static Image getSkin(YggdrasilAccount account, double scaleRatio) {
-        if (account.getCharacter() == null)
-            return getDefaultSkin(account, scaleRatio);
-        File file = getSkinFile(account.getCharacter());
+        UUID uuid = account.getUUID();
+        if (uuid == null)
+            return getSteveSkin(scaleRatio);
+
+        File file = getSkinFile(uuid);
         if (file.exists()) {
             Image original = new Image("file:" + file.getAbsolutePath());
             return new Image("file:" + file.getAbsolutePath(),
@@ -92,15 +78,14 @@ public final class AccountHelper {
                     original.getHeight() * scaleRatio,
                     false, false);
         }
-        return getDefaultSkin(account, scaleRatio);
+        return getDefaultSkin(uuid, 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);
+    public static Image getSkinImmediately(YggdrasilAccount account, GameProfile profile, double scaleRatio) throws Exception {
+        File file = getSkinFile(profile.getId());
+        downloadSkin(account, profile, true);
         if (!file.exists())
-            return getDefaultSkin(account, scaleRatio);
+            return getDefaultSkin(profile.getId(), scaleRatio);
 
         String url = "file:" + file.getAbsolutePath();
         return scale(url, scaleRatio);
@@ -113,17 +98,11 @@ public final class AccountHelper {
 
     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) {
+        public SkinLoadTask(YggdrasilAccount account, boolean refresh) {
             this.account = account;
-            this.proxy = proxy;
             this.refresh = refresh;
         }
 
@@ -142,33 +121,33 @@ public final class AccountHelper {
             if (!account.isLoggedIn() && (account.getCharacter() == null || refresh))
                 DialogController.logIn(account);
 
-            downloadSkin(account, refresh, proxy);
+            downloadSkin(account, refresh);
         }
     }
 
-    private static void downloadSkin(YggdrasilAccount account, GameProfile profile, boolean refresh, Proxy proxy) throws Exception {
+    private static void downloadSkin(YggdrasilAccount account, GameProfile profile, boolean refresh) throws Exception {
         account.clearCache();
 
         Optional<Texture> texture = account.getSkin(profile);
         if (!texture.isPresent()) return;
         String url = texture.get().getUrl();
-        File file = getSkinFile(profile.getName());
+        File file = getSkinFile(profile.getId());
         if (!refresh && file.exists())
             return;
-        new FileDownloadTask(NetworkUtils.toURL(url), file, proxy).run();
+        new FileDownloadTask(NetworkUtils.toURL(url), file).run();
     }
 
-    private static void downloadSkin(YggdrasilAccount account, boolean refresh, Proxy proxy) throws Exception {
+    private static void downloadSkin(YggdrasilAccount account, boolean refresh) throws Exception {
         account.clearCache();
 
         if (account.getCharacter() == null) return;
         Optional<Texture> texture = account.getSkin();
         if (!texture.isPresent()) return;
         String url = texture.get().getUrl();
-        File file = getSkinFile(account.getCharacter());
+        File file = getSkinFile(account.getUUID());
         if (!refresh && file.exists())
             return;
-        new FileDownloadTask(NetworkUtils.toURL(url), file, proxy).run();
+        new FileDownloadTask(NetworkUtils.toURL(url), file).run();
     }
 
     public static Image scale(String url, double scaleRatio) {
@@ -187,11 +166,8 @@ public final class AccountHelper {
         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;
+    public static Image getDefaultSkin(UUID uuid, double scaleRatio) {
+        int type = uuid.hashCode() & 1;
         if (type == 1)
             return getAlexSkin(scaleRatio);
         else

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

@@ -0,0 +1,30 @@
+package org.jackhuang.hmcl.game;
+
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import org.jackhuang.hmcl.download.DefaultCacheRepository;
+
+import java.nio.file.Paths;
+
+public class HMCLCacheRepository extends DefaultCacheRepository {
+
+    private final StringProperty directory = new SimpleStringProperty();
+
+    public HMCLCacheRepository() {
+        directory.addListener((a, b, t) -> changeDirectory(Paths.get(t)));
+    }
+
+    public String getDirectory() {
+        return directory.get();
+    }
+
+    public StringProperty directoryProperty() {
+        return directory;
+    }
+
+    public void setDirectory(String directory) {
+        this.directory.set(directory);
+    }
+
+    public static final HMCLCacheRepository REPOSITORY = new HMCLCacheRepository();
+}

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

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

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

@@ -17,12 +17,12 @@
  */
 package org.jackhuang.hmcl.game;
 
-import org.jackhuang.hmcl.Main;
+import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.auth.AuthInfo;
 import org.jackhuang.hmcl.launch.DefaultLauncher;
 import org.jackhuang.hmcl.launch.ProcessListener;
 
-import java.util.List;
+import java.util.Map;
 
 /**
  * @author huangyuhui
@@ -42,10 +42,10 @@ public final class HMCLGameLauncher extends DefaultLauncher {
     }
 
     @Override
-    protected void appendJvmArgs(List<String> result) {
-        super.appendJvmArgs(result);
-
-        result.add("-Dminecraft.launcher.version=" + Main.VERSION);
-        result.add("-Dminecraft.launcher.brand=" + Main.NAME);
+    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;
     }
 }

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

@@ -27,7 +27,6 @@ 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 java.io.File;
@@ -51,19 +50,6 @@ 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))
@@ -79,17 +65,6 @@ public class HMCLGameRepository extends DefaultGameRepository {
         }
     }
 
-    @Override
-    public File getLibraryFile(Version version, Library lib) {
-        VersionSetting vs = profile.getVersionSetting(version.getId());
-        File self = super.getLibraryFile(version, lib);
-        if (self.exists() || vs.isNoCommon())
-            return self;
-        else
-            return new File(Settings.INSTANCE.getCommonPath(), "libraries/" + lib.getPath());
-    }
-
-
     @Override
     protected void refreshVersionsImpl() {
         versionSettings.clear();
@@ -173,10 +148,41 @@ public class HMCLGameRepository extends DefaultGameRepository {
         return new File(getVersionRoot(id), "icon.png");
     }
 
-    public void saveVersionSetting(String id) {
+    public boolean saveVersionSetting(String id) {
         if (!versionSettings.containsKey(id))
-            return;
-        Lang.invoke(() -> FileUtils.writeText(getVersionSettingFile(id), GSON.toJson(versionSettings.get(id))));
+            return false;
+        File file = getVersionSettingFile(id);
+        if (!FileUtils.makeDirectory(file.getAbsoluteFile().getParentFile()))
+            return false;
+
+        try {
+            FileUtils.writeText(file, GSON.toJson(versionSettings.get(id)));
+            return true;
+        } catch (IOException e) {
+            Logging.LOG.log(Level.SEVERE, "Unable to save version setting of " + id, e);
+            return false;
+        }
+    }
+
+    /**
+     * 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) {

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

@@ -17,12 +17,11 @@
  */
 package org.jackhuang.hmcl.game;
 
-
 import org.jackhuang.hmcl.mod.Modpack;
-import org.jackhuang.hmcl.task.TaskResult;
+import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.util.Constants;
 import org.jackhuang.hmcl.util.Logging;
-import org.jackhuang.hmcl.util.ZipEngine;
+import org.jackhuang.hmcl.util.Zipper;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -31,58 +30,44 @@ import java.util.List;
 /**
  * Export the game to a mod pack file.
  */
-public class HMCLModpackExportTask extends TaskResult<ZipEngine> {
+public class HMCLModpackExportTask extends Task {
     private final DefaultGameRepository repository;
     private final String version;
     private final List<String> whitelist;
     private final Modpack modpack;
     private final File output;
-    private final String id;
-
-    public HMCLModpackExportTask(DefaultGameRepository repository, String version, List<String> whitelist, Modpack modpack, File output) {
-        this(repository, version, whitelist, modpack, output, ID);
-    }
 
     /**
      * @param output  mod pack file.
      * @param version to locate version.json
      */
-    public HMCLModpackExportTask(DefaultGameRepository repository, String version, List<String> whitelist, Modpack modpack, File output, String id) {
+    public HMCLModpackExportTask(DefaultGameRepository repository, String version, List<String> whitelist, Modpack modpack, File output) {
         this.repository = repository;
         this.version = version;
         this.whitelist = whitelist;
         this.modpack = modpack;
         this.output = output;
-        this.id = id;
 
         onDone().register(event -> {
             if (event.isFailed()) output.delete();
         });
     }
 
-    @Override
-    public String getId() {
-        return id;
-    }
-
     @Override
     public void execute() throws Exception {
         ArrayList<String> blackList = new ArrayList<>(HMCLModpackManager.MODPACK_BLACK_LIST);
         blackList.add(version + ".jar");
         blackList.add(version + ".json");
         Logging.LOG.info("Compressing game files without some files in blacklist, including files or directories: usernamecache.json, asm, logs, backups, versions, assets, usercache.json, libraries, crash-reports, launcher_profiles.json, NVIDIA, TCNodeTracker");
-        try (ZipEngine zip = new ZipEngine(output)) {
-            zip.putDirectory(repository.getRunDirectory(version), (String pathName, Boolean isDirectory) -> {
+        try (Zipper zip = new Zipper(output.toPath())) {
+            zip.putDirectory(repository.getRunDirectory(version).toPath(), "minecraft", path -> {
                 for (String s : blackList)
-                    if (isDirectory) {
-                        if (pathName.startsWith(s + "/"))
-                            return null;
-                    } else if (pathName.equals(s))
-                        return null;
+                    if (path.equals(s))
+                        return false;
                 for (String s : whitelist)
-                    if (pathName.equals(s + (isDirectory ? "/" : "")))
-                        return "minecraft/" + pathName;
-                return null;
+                    if (path.equals(s))
+                        return true;
+                return false;
             });
 
             Version mv = repository.getResolvedVersion(version);
@@ -92,6 +77,4 @@ public class HMCLModpackExportTask extends TaskResult<ZipEngine> {
             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

@@ -35,14 +35,12 @@ 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;
     private final String name;
     private final HMCLGameRepository repository;
     private final Modpack modpack;
-    private final File run;
     private final List<Task> dependencies = new LinkedList<>();
     private final List<Task> dependents = new LinkedList<>();
 
@@ -52,8 +50,8 @@ public final class HMCLModpackInstallTask extends Task {
         this.zipFile = zipFile;
         this.name = name;
         this.modpack = modpack;
-        this.run = repository.getRunDirectory(name);
 
+        File run = repository.getRunDirectory(name);
         File json = repository.getModpackConfiguration(name);
         if (repository.hasVersion(name) && !json.exists())
             throw new IllegalArgumentException("Version " + name + " already exists");
@@ -75,7 +73,7 @@ public final class HMCLModpackInstallTask extends Task {
             }
         } catch (JsonParseException | IOException ignore) {
         }
-        dependents.add(new ModpackInstallTask<>(zipFile, run, "minecraft/", it -> !Objects.equals(it, "minecraft/pack.json"), config));
+        dependents.add(new ModpackInstallTask<>(zipFile, run, "/minecraft", it -> !"pack.json".equals(it), config));
     }
 
     @Override
@@ -91,9 +89,9 @@ public final class HMCLModpackInstallTask extends Task {
     @Override
     public void execute() throws Exception {
         String json = CompressingUtils.readTextZipEntry(zipFile, "minecraft/pack.json");
-        Version version = Constants.GSON.fromJson(json, Version.class).setJar(null);
+        Version version = Constants.GSON.fromJson(json, Version.class).setId(name).setJar(null);
         dependencies.add(new VersionJsonSaveTask(repository, version));
-        dependencies.add(new MinecraftInstanceTask<>(zipFile, "minecraft/", modpack, MODPACK_TYPE, repository.getModpackConfiguration(name)));
+        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

@@ -26,7 +26,6 @@ import org.jackhuang.hmcl.util.StringUtils;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -40,7 +39,7 @@ public final class HMCLModpackManager {
             "pack.json", "launcher.jar", "hmclmc.log", // HMCL
             "manifest.json", "minecraftinstance.json", ".curseclient", // Curse
             "minetweaker.log", // Mods
-            "logs", "versions", "assets", "libraries", "crash-reports", "NVIDIA", "AMD", "screenshots", "natives", "native", "$native", "server-resource-packs", // Minecraft
+            "jars", "logs", "versions", "assets", "libraries", "crash-reports", "NVIDIA", "AMD", "screenshots", "natives", "native", "$native", "server-resource-packs", // Minecraft
             "downloads", // Curse
             "asm", "backups", "TCNodeTracker", "CustomDISkins", "data" // Mods
     );

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

@@ -17,73 +17,80 @@
  */
 package org.jackhuang.hmcl.game;
 
-import com.jfoenix.concurrency.JFXUtilities;
 import javafx.application.Platform;
-import org.jackhuang.hmcl.Main;
+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.ServerDisconnectException;
+import org.jackhuang.hmcl.auth.CredentialExpiredException;
 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.MessageBox;
-import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
 import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane;
 import org.jackhuang.hmcl.util.*;
 
 import java.io.File;
+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.Pair.pair;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
 public final class LauncherHelper {
     public static final LauncherHelper INSTANCE = new LauncherHelper();
     private LauncherHelper(){}
 
-    private TaskExecutor executor;
     public static final Queue<ManagedProcess> PROCESSES = new ConcurrentLinkedQueue<>();
-    private final TaskExecutorDialogPane launchingStepsPane = new TaskExecutorDialogPane(() -> {});
+    private final TaskExecutorDialogPane launchingStepsPane = new TaskExecutorDialogPane(it -> {});
 
-    public void launch(String selectedVersion, File scriptFile) {
-        Profile profile = Settings.INSTANCE.getSelectedProfile();
-        GameRepository repository = profile.getRepository();
-        Account account = Settings.INSTANCE.getSelectedAccount();
+    public void launch(Profile profile, Account account, String selectedVersion, File scriptFile) {
         if (account == null)
-            throw new IllegalStateException("No account");
+            throw new IllegalArgumentException("No account");
+
+        Logging.LOG.info("Launching game version: " + selectedVersion);
+
+        GameRepository repository = profile.getRepository();
 
         Version version = repository.getResolvedVersion(selectedVersion);
         VersionSetting setting = profile.getVersionSetting(selectedVersion);
 
         Platform.runLater(() -> {
             try {
-                checkGameState(profile, setting, version, () -> Schedulers.newThread().schedule(() -> launch0(selectedVersion, scriptFile)));
+                checkGameState(profile, setting, version, () -> {
+                    Controllers.dialog(launchingStepsPane);
+                    Schedulers.newThread().schedule(() -> launch0(profile, account, selectedVersion, scriptFile));
+                });
             } catch (InterruptedException ignore) {
             }
         });
     }
 
-    private void launch0(String selectedVersion, File scriptFile) {
-        Profile profile = Settings.INSTANCE.getSelectedProfile();
-        GameRepository repository = profile.getRepository();
+    private void launch0(Profile profile, Account account, String selectedVersion, File scriptFile) {
+        HMCLGameRepository repository = profile.getRepository();
         DefaultDependencyManager dependencyManager = profile.getDependency();
-        Version version = repository.getResolvedVersion(selectedVersion);
-        Account account = Settings.INSTANCE.getSelectedAccount();
+        Version version = MaintainTask.maintain(repository.getResolvedVersion(selectedVersion));
         VersionSetting setting = profile.getVersionSetting(selectedVersion);
         Optional<String> gameVersion = GameVersion.minecraftVersion(repository.getVersionJar(version));
 
-        executor = Task.of(Schedulers.javafx(), () -> Controllers.dialog(launchingStepsPane))
-                .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.DEPENDENCIES)))
+        TaskExecutor executor = Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.DEPENDENCIES))
                 .then(variables -> {
                     if (setting.isNotCheckGame())
                         return null;
@@ -91,38 +98,49 @@ public final class LauncherHelper {
                         return dependencyManager.checkGameCompletionAsync(version);
                 })
                 .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.MODS)))
-                .then(new CurseCompletionTask(dependencyManager, selectedVersion))
-                .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.LOGGING_IN)))
-                .then(Task.of(Main.i18n("account.methods"), variables -> {
+                .then(var -> {
                     try {
-                        try {
-                            variables.set("account", account.logIn());
-                        } catch (ServerDisconnectException e) {
-                            if (account.canPlayOffline())
-                                variables.set("account", account.playOffline());
-                            else
-                                throw e;
-                        }
-                    } catch (AuthenticationException e) {
+                        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(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.LOGGING_IN)))
+                .then(Task.of(i18n("account.methods"), variables -> {
+                    try {
+                        variables.set("account", account.logIn());
+                    } catch (CredentialExpiredException e) {
                         variables.set("account", DialogController.logIn(account));
-                        JFXUtilities.runInFX(() -> Controllers.dialog(launchingStepsPane));
+                    } catch (AuthenticationException e) {
+                        variables.set("account",
+                                account.playOffline().orElseThrow(() -> e));
                     }
                 }))
                 .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.LAUNCHING)))
                 .then(Task.of(variables -> {
                     variables.set("launcher", new HMCLGameLauncher(
-                            repository, selectedVersion, variables.get("account"), setting.toLaunchOptions(profile.getGameDir()), new HMCLProcessListener(variables.get("account"), setting, gameVersion.isPresent())
+                            repository,
+                            selectedVersion,
+                            variables.get("account"),
+                            setting.toLaunchOptions(profile.getGameDir()),
+                            setting.getLauncherVisibility() == LauncherVisibility.CLOSE
+                                    ? null // Unnecessary to start listening to game process output when close launcher immediately after game launched.
+                                    : new HMCLProcessListener(variables.get("account"), setting, gameVersion.isPresent())
                     ));
                 }))
                 .then(variables -> {
                     DefaultLauncher launcher = variables.get("launcher");
                     if (scriptFile == null) {
-                        return new LaunchTask<>(launcher::launch).setName(Main.i18n("version.launch"));
+                        return new LaunchTask<>(launcher::launch).setName(i18n("version.launch"));
                     } else {
                         return new LaunchTask<>(() -> {
                             launcher.makeLaunchScript(scriptFile);
                             return null;
-                        }).setName(Main.i18n("version.launch_script"));
+                        }).setName(i18n("version.launch_script"));
                     }
                 })
                 .then(Task.of(variables -> {
@@ -130,15 +148,17 @@ public final class LauncherHelper {
                         ManagedProcess process = variables.get(LaunchTask.LAUNCH_ID);
                         PROCESSES.add(process);
                         if (setting.getLauncherVisibility() == LauncherVisibility.CLOSE)
-                            Main.stopApplication();
+                            Launcher.stopApplication();
                         else
-                            launchingStepsPane.setCancel(() -> {
+                            launchingStepsPane.setCancel(it -> {
                                 process.stop();
-                                Controllers.closeDialog();
+                                it.fireEvent(new DialogCloseEvent());
                             });
                     } else
-                        Platform.runLater(() ->
-                                Controllers.dialog(Main.i18n("version.launch_script.success", scriptFile.getAbsolutePath())));
+                        Platform.runLater(() -> {
+                            launchingStepsPane.fireEvent(new DialogCloseEvent());
+                            Controllers.dialog(i18n("version.launch_script.success", scriptFile.getAbsolutePath()));
+                        });
 
                 }))
                 .executor();
@@ -156,18 +176,36 @@ public final class LauncherHelper {
 
             @Override
             public void onStop(boolean success, TaskExecutor executor) {
-                if (!success) {
+                if (!success && !Controllers.isStopped()) {
                     Platform.runLater(() -> {
-                        if (executor.getLastException() != null)
-                            Controllers.dialog(I18nException.getStackTrace(executor.getLastException()),
-                                    scriptFile == null ? Main.i18n("launch.failed") : Main.i18n("version.launch_script.failed"),
-                                    MessageBox.ERROR_MESSAGE, Controllers::closeDialog);
-                        else
-                            Controllers.closeDialog();
+                        // 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) {
+                                    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"),
+                                        MessageBox.ERROR_MESSAGE);
+                            }
+                        }
                     });
                 }
-
-                LauncherHelper.this.executor = null;
+                launchingStepsPane.setExecutor(null);
             }
         });
 
@@ -175,47 +213,120 @@ public final class LauncherHelper {
     }
 
     private static void checkGameState(Profile profile, VersionSetting setting, Version version, Runnable onAccept) throws InterruptedException {
-        boolean flag = false, suggest = true;
+        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(Main.i18n("launch.wrong_javadir"), Main.i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
+            Controllers.dialog(i18n("launch.wrong_javadir"), i18n("message.warning"), MessageBox.WARNING_MESSAGE, onAccept);
             setting.setJava(null);
+            setting.setDefaultJavaPath(null);
             java = JavaVersion.fromCurrentEnvironment();
             flag = true;
         }
 
-        if (java.getParsedVersion() < JavaVersion.JAVA_8) {
-            Controllers.dialog(Main.i18n("launch.advice.newer_java"), Main.i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
-            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.getJREs().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"), MessageBox.ERROR_MESSAGE, null);
+                } else {
+                    // Most mods require Java 8 or later version.
+                    Controllers.dialog(i18n("launch.advice.newer_java"), i18n("message.warning"), MessageBox.WARNING_MESSAGE, onAccept);
+                }
+                flag = true;
+            }
         }
 
-        if (java.getParsedVersion() >= JavaVersion.JAVA_9 && gameVersion.compareTo(VersionNumber.asVersion("1.12.5")) < 0 && version.getMainClass().contains("launchwrapper")) {
-            Controllers.dialog(Main.i18n("launch.advice.java9"), Main.i18n("message.error"), MessageBox.ERROR_MESSAGE, null);
-            suggest = false;
-            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.getJREs().stream().filter(javaVersion -> javaVersion.getParsedVersion() == JavaVersion.JAVA_8).findAny();
+            if (java8.isPresent()) {
+                java8required = true;
+                setting.setJavaVersion(java8.get());
+            } else {
+                Controllers.dialog(i18n("launch.advice.java9"), i18n("message.error"), MessageBox.ERROR_MESSAGE, null);
+                flag = true;
+            }
         }
 
-        if (java.getPlatform() == org.jackhuang.hmcl.util.Platform.BIT_32 &&
+        // 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.getJREs().stream()
+                    .filter(javaVersion -> javaVersion.getVersionNumber().compareTo(JAVA_8) >= 0)
+                    .max(Comparator.comparing(JavaVersion::getVersionNumber));
+            if (java8.isPresent()) {
+                newJavaRequired = true;
+                setting.setJavaVersion(java8.get());
+            } else {
+                Controllers.dialog(i18n("launch.advice.java8_51_1_13"), i18n("message.warning"), MessageBox.WARNING_MESSAGE, onAccept);
+                flag = true;
+            }
+        }
+
+        if (!flag && java.getPlatform() == org.jackhuang.hmcl.util.Platform.BIT_32 &&
                 org.jackhuang.hmcl.util.Platform.IS_64_BIT) {
-            Controllers.dialog(Main.i18n("launch.advice.different_platform"), Main.i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
-            flag = true;
+            final JavaVersion java32 = java;
+
+            // First find if same java version but whose platform is 64-bit installed.
+            Optional<JavaVersion> java64 = JavaVersion.getJREs().stream()
+                    .filter(javaVersion -> javaVersion.getPlatform() == org.jackhuang.hmcl.util.Platform.PLATFORM)
+                    .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.getJREs().stream()
+                        .filter(javaVersion -> javaVersion.getPlatform() == org.jackhuang.hmcl.util.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"), MessageBox.ERROR_MESSAGE, onAccept);
+                flag = true;
+            }
         }
-        if (java.getPlatform() == org.jackhuang.hmcl.util.Platform.BIT_32 &&
+
+        if (!flag && java.getPlatform() == org.jackhuang.hmcl.util.Platform.BIT_32 &&
                 setting.getMaxMemory() > 1.5 * 1024) {
-            Controllers.dialog(Main.i18n("launch.advice.too_large_memory_for_32bit"), Main.i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
+            // 1.5 * 1024 is an inaccurate number.
+            // Actual memory limit depends on operating system and memory.
+            Controllers.dialog(i18n("launch.advice.too_large_memory_for_32bit"), i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
             flag = true;
         }
-        if (OperatingSystem.TOTAL_MEMORY > 0 && OperatingSystem.TOTAL_MEMORY < setting.getMaxMemory()) {
-            Controllers.dialog(Main.i18n("launch.advice.not_enough_space", OperatingSystem.TOTAL_MEMORY), Main.i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
+        
+        if (!flag && OperatingSystem.TOTAL_MEMORY > 0 && OperatingSystem.TOTAL_MEMORY < setting.getMaxMemory()) {
+            Controllers.dialog(i18n("launch.advice.not_enough_space", OperatingSystem.TOTAL_MEMORY), i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
             flag = true;
         }
 
-        if (flag) {
-            if (suggest && Controllers.getDialogContent() instanceof MessageDialogPane)
-                ((MessageDialogPane) Controllers.getDialogContent()).disableClosingDialog();
-        } else
+        if (!flag)
             onAccept.run();
     }
 
@@ -225,10 +336,12 @@ public final class LauncherHelper {
     }
 
     public void emitStatus(LoadingState state) {
+        if (state == LoadingState.DONE) {
+            launchingStepsPane.fireEvent(new DialogCloseEvent());
+        }
 
         launchingStepsPane.setTitle(state.getLocalizedMessage());
         launchingStepsPane.setSubtitle((state.ordinal() + 1) + " / " + LoadingState.values().length);
-        Controllers.dialog(launchingStepsPane);
     }
 
     private void checkExit(LauncherVisibility v) {
@@ -245,8 +358,8 @@ public final class LauncherHelper {
                 Platform.runLater(() -> {
                     // Shut down the platform when user closed log window.
                     Platform.setImplicitExit(true);
-                    // If we use Main.stop(), log window will be halt immediately.
-                    Main.stopWithoutPlatform();
+                    // If we use Launcher.stop(), log window will be halt immediately.
+                    Launcher.stopWithoutPlatform();
                 });
                 break;
         }
@@ -261,15 +374,7 @@ public final class LauncherHelper {
 
         @Override
         public void execute() throws Exception {
-            try {
-                setResult(supplier.get());
-            } catch (PermissionException e) {
-                throw new I18nException(Main.i18n("launch.failed.executable_permission"), e);
-            } catch (ProcessCreationException e) {
-                throw new I18nException(Main.i18n("launch.failed.creating_process") + e.getLocalizedMessage(), e);
-            } catch (NotDecompressingNativesException e) {
-                throw new I18nException(Main.i18n("launch.failed.decompressing_natives") + e.getLocalizedMessage(), e);
-            }
+            setResult(supplier.get());
         }
 
         @Override
@@ -304,10 +409,10 @@ public final class LauncherHelper {
             if (authInfo == null)
                 forbiddenTokens = Collections.emptyMap();
             else
-                forbiddenTokens = Lang.mapOf(
-                        new Pair<>(authInfo.getAccessToken(), "<access token>"),
-                        new Pair<>(authInfo.getUserId(), "<uuid>"),
-                        new Pair<>(authInfo.getUsername(), "<player>")
+                forbiddenTokens = mapOf(
+                        pair(authInfo.getAccessToken(), "<access token>"),
+                        pair(UUIDTypeAdapter.fromUUID(authInfo.getUUID()), "<uuid>"),
+                        pair(authInfo.getUsername(), "<player>")
                 );
 
             visibility = setting.getLauncherVisibility();
@@ -337,20 +442,23 @@ public final class LauncherHelper {
             else
                 System.out.print(log);
 
-            logs.add(new Pair<>(log, level));
-            if (logs.size() > Settings.INSTANCE.getLogLines())
+            logs.add(pair(log, level));
+            if (logs.size() > config().getLogLines())
                 logs.removeFirst();
 
             if (setting.isShowLogs()) {
-                Lang.invoke(() -> {
+                try {
                     latch.await();
                     logWindow.waitForLoaded();
-                });
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    return;
+                }
 
                 Platform.runLater(() -> logWindow.logLine(log, level));
             }
 
-            if (!lwjgl && log.contains("LWJGL Version: ") || !detectWindow) {
+            if (!lwjgl && (log.contains("LWJGL Version: ") || !detectWindow)) {
                 lwjgl = true;
                 switch (visibility) {
                     case HIDE_AND_REOPEN:
@@ -360,9 +468,12 @@ public final class LauncherHelper {
                         });
                         break;
                     case CLOSE:
-                        throw new Error("Never come to here");
+                        // Never come to here.
+                        break;
                     case KEEP:
-                        // No operations here
+                        Platform.runLater(() -> {
+                            emitStatus(LoadingState.DONE);
+                        });
                         break;
                     case HIDE:
                         Platform.runLater(() -> {
@@ -385,16 +496,16 @@ public final class LauncherHelper {
 
                     switch (exitType) {
                         case JVM_ERROR:
-                            logWindow.setTitle(Main.i18n("launch.failed.cannot_create_jvm"));
+                            logWindow.setTitle(i18n("launch.failed.cannot_create_jvm"));
                             break;
                         case APPLICATION_ERROR:
-                            logWindow.setTitle(Main.i18n("launch.failed.exited_abnormally"));
+                            logWindow.setTitle(i18n("launch.failed.exited_abnormally"));
                             break;
                     }
 
                     logWindow.show();
                     logWindow.onDone.register(() -> {
-                        logWindow.logLine("Commands: " + StringUtils.makeCommand(process.getCommands()), Log4jLevel.INFO);
+                        logWindow.logLine("Command: " + new CommandBuilder().addAll(process.getCommands()).toString(), Log4jLevel.INFO);
                         for (Map.Entry<String, Log4jLevel> entry : logs)
                             logWindow.logLine(entry.getKey(), entry.getValue());
                     });

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

@@ -17,7 +17,7 @@
  */
 package org.jackhuang.hmcl.game;
 
-import org.jackhuang.hmcl.Main;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public enum LoadingState {
     DEPENDENCIES("launch.state.dependencies"),
@@ -33,6 +33,6 @@ public enum LoadingState {
     }
 
     public String getLocalizedMessage() {
-        return Main.i18n(key);
+        return i18n(key);
     }
 }

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

@@ -59,12 +59,12 @@ public final class ModpackHelper {
         throw new UnsupportedModpackException(file.toString());
     }
 
-    public static <T> ModpackConfiguration<T> readModpackConfiguration(File file) throws IOException {
+    public static ModpackConfiguration<?> readModpackConfiguration(File file) throws IOException {
         if (!file.exists())
             throw new FileNotFoundException(file.getPath());
         else
             try {
-                return Constants.GSON.fromJson(FileUtils.readText(file), new TypeToken<ModpackConfiguration<T>>() {
+                return Constants.GSON.fromJson(FileUtils.readText(file), new TypeToken<ModpackConfiguration<?>>() {
                 }.getType());
             } catch (JsonParseException e) {
                 throw new IOException("Malformed modpack configuration");
@@ -86,11 +86,14 @@ public final class ModpackHelper {
         profile.getRepository().markVersionAsModpack(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);
+            if (isDependentsSucceeded) {
+                HMCLGameRepository repository = profile.getRepository();
+                repository.refreshVersions();
+                VersionSetting vs = repository.specializeVersionSetting(name);
+                repository.undoMark(name);
+                if (vs != null)
+                    vs.setGameDirType(EnumGameDirectory.VERSION_FOLDER);
+            }
         };
 
         if (modpack.getManifest() instanceof CurseManifest)
@@ -102,7 +105,7 @@ public final class ModpackHelper {
         else if (modpack.getManifest() instanceof MultiMCInstanceConfiguration)
             return new MultiMCModpackInstallTask(profile.getDependency(), zipFile, ((MultiMCInstanceConfiguration) modpack.getManifest()), name)
                     .finalized(finalizeTask)
-                    .with(new MultiMCInstallVersionSettingTask(profile, ((MultiMCInstanceConfiguration) modpack.getManifest()), name));
+                    .then(new MultiMCInstallVersionSettingTask(profile, ((MultiMCInstanceConfiguration) modpack.getManifest()), name));
         else throw new IllegalStateException("Unrecognized modpack: " + modpack);
     }
 

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

@@ -44,7 +44,7 @@ public final class MultiMCInstallVersionSettingTask extends Task {
 
     @Override
     public void execute() {
-        VersionSetting vs = Objects.requireNonNull(profile.specializeVersionSetting(version));
+        VersionSetting vs = Objects.requireNonNull(profile.getRepository().specializeVersionSetting(version));
         ModpackHelper.toVersionSetting(manifest, vs);
     }
 }

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

@@ -1,7 +1,7 @@
 /*
  * 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
@@ -17,27 +17,38 @@
  */
 package org.jackhuang.hmcl.setting;
 
-import com.google.gson.JsonParseException;
-import org.jackhuang.hmcl.Main;
+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.Launcher;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.AccountFactory;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccountFactory;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorBuildInfo;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServerResponse;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDownloader;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.auth.offline.OfflineAccount;
 import org.jackhuang.hmcl.auth.offline.OfflineAccountFactory;
 import org.jackhuang.hmcl.auth.yggdrasil.MojangYggdrasilProvider;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccountFactory;
-import org.jackhuang.hmcl.task.FileDownloadTask;
-import org.jackhuang.hmcl.util.*;
 
-import java.io.File;
 import java.io.IOException;
-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
@@ -45,60 +56,206 @@ import java.util.Map;
 public final class Accounts {
     private Accounts() {}
 
-    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";
+    public static final OfflineAccountFactory FACTORY_OFFLINE = OfflineAccountFactory.INSTANCE;
+    public static final YggdrasilAccountFactory FACTORY_YGGDRASIL = new YggdrasilAccountFactory(MojangYggdrasilProvider.INSTANCE);
+    public static final AuthlibInjectorAccountFactory FACTORY_AUTHLIB_INJECTOR = new AuthlibInjectorAccountFactory(
+            new AuthlibInjectorDownloader(Launcher.HMCL_DIRECTORY.toPath(), DownloadProviders::getDownloadProvider)::getArtifactInfo,
+            Accounts::getOrCreateAuthlibInjectorServer);
 
-    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))
-    );
+    private static final String TYPE_OFFLINE = "offline";
+    private static final String TYPE_YGGDRASIL_ACCOUNT = "yggdrasil";
+    private static final String TYPE_AUTHLIB_INJECTOR = "authlibInjector";
 
-    private static final Map<String, String> AUTHLIB_INJECTOR_SERVER_NAMES = new HashMap<>();
+    private static Map<String, AccountFactory<?>> type2factory = mapOf(
+            pair(TYPE_OFFLINE, FACTORY_OFFLINE),
+            pair(TYPE_YGGDRASIL_ACCOUNT, FACTORY_YGGDRASIL),
+            pair(TYPE_AUTHLIB_INJECTOR, FACTORY_AUTHLIB_INJECTOR));
 
-    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;
+    private static String accountType(Account account) {
+        if (account instanceof OfflineAccount)
+            return TYPE_OFFLINE;
+        else if (account instanceof AuthlibInjectorAccount)
+            return TYPE_AUTHLIB_INJECTOR;
+        else if (account instanceof YggdrasilAccount)
+            return TYPE_YGGDRASIL_ACCOUNT;
+        else
+            throw new IllegalArgumentException("Failed to determine account type: " + account);
     }
 
-    static String getAccountId(Account account) {
-        return getAccountId(account.getUsername(), account.getCharacter());
+    public static AccountFactory<?> getAccountFactory(Account account) {
+        return type2factory.get(accountType(account));
     }
 
-    static String getAccountId(String username, String character) {
-        return username + ":" + character;
+    static String accountId(Account account) {
+        return account.getUsername() + ":" + account.getCharacter();
     }
 
-    private static String downloadAuthlibInjector() throws Exception {
-        AuthlibInjectorBuildInfo buildInfo = AuthlibInjectorBuildInfo.requestBuildInfo();
-        File jar = new File(Main.HMCL_DIRECTORY, "authlib-injector.jar");
-        File local = new File(Main.HMCL_DIRECTORY, "authlib-injector.txt");
-        int buildNumber = 0;
-        try {
-            buildNumber = Integer.parseInt(FileUtils.readText(local));
-        } catch (IOException | NumberFormatException ignore) {
+    private static ObservableList<Account> accounts = observableArrayList(account -> new Observable[] { account });
+    private static ReadOnlyListWrapper<Account> accountsWrapper = new ReadOnlyListWrapper<>(accounts);
+
+    private static ObjectProperty<Account> selectedAccount = new SimpleObjectProperty<Account>() {
+        {
+            accounts.addListener(onInvalidating(this::invalidated));
         }
-        if (buildNumber < buildInfo.getBuildNumber()) {
-            new FileDownloadTask(new URL(buildInfo.getUrl()), jar).run();
-            FileUtils.writeText(local, String.valueOf(buildInfo.getBuildNumber()));
-        }
-        return jar.getAbsolutePath();
-    }
 
-    public static String getAuthlibInjectorServerName(String serverIp) {
-        if (AUTHLIB_INJECTOR_SERVER_NAMES.containsKey(serverIp))
-            return AUTHLIB_INJECTOR_SERVER_NAMES.get(serverIp);
-        else {
-            try {
-                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();
-            } catch (JsonParseException | IOException | NullPointerException e) {
-                return null;
+        @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;
+            config().setSelectedAccount(selected == null ? "" : accountId(selected));
         }
+    };
+
+    /**
+     * True if {@link #init()} hasn't been called.
+     */
+    private static boolean initialized = false;
+
+    static {
+        accounts.addListener(onInvalidating(Accounts::updateAccountStorages));
     }
+
+    static Map<Object, Object> getAccountStorage(Account account) {
+        Map<Object, Object> storage = account.toStorage();
+        storage.put("type", accountType(account));
+        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);
+        });
+
+        initialized = true;
+
+        config().getAuthlibInjectorServers().addListener(onInvalidating(Accounts::removeDanglingAuthlibInjectorAccounts));
+
+        // load selected account
+        selectedAccount.set(
+                accounts.stream()
+                        .filter(it -> accountId(it).equals(config().getSelectedAccount()))
+                        .findFirst()
+                        .orElse(null));
+    }
+
+    public static ObservableList<Account> getAccounts() {
+        return accounts;
+    }
+
+    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 AuthlibInjectorServer getOrCreateAuthlibInjectorServer(String url) {
+        return config().getAuthlibInjectorServers().stream()
+                .filter(server -> url.equals(server.getUrl()))
+                .findFirst()
+                .orElseGet(() -> {
+                    // this usually happens when migrating data from an older version
+                    AuthlibInjectorServer server;
+                    try {
+                        server = AuthlibInjectorServer.fetchServerInfo(url);
+                        LOG.info("Migrated authlib injector server " + server);
+                    } catch (IOException e) {
+                        server = new AuthlibInjectorServer(url, url);
+                        LOG.log(Level.WARNING, "Failed to migrate authlib injector server " + url, e);
+                    }
+
+                    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> loginType2name = mapOf(
+            pair(Accounts.FACTORY_OFFLINE, i18n("account.methods.offline")),
+            pair(Accounts.FACTORY_YGGDRASIL, i18n("account.methods.yggdrasil")),
+            pair(Accounts.FACTORY_AUTHLIB_INJECTOR, i18n("account.methods.authlib_injector")));
+
+    public static String getAccountTypeName(AccountFactory<?> factory) {
+        return Optional.ofNullable(loginType2name.get(factory))
+                .orElseThrow(() -> new IllegalArgumentException("No corresponding login type name"));
+    }
+
+    public static String getAccountTypeName(Account account) {
+        return getAccountTypeName(getAccountFactory(account));
+    }
+    // ====
 }

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

@@ -17,274 +17,441 @@
  */
 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 org.jackhuang.hmcl.Main;
-import org.jackhuang.hmcl.util.JavaVersion;
+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.Launcher;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
+import org.jackhuang.hmcl.upgrade.UpdateChannel;
+import org.jackhuang.hmcl.util.EnumOrdinalDeserializer;
+import org.jackhuang.hmcl.util.FileTypeAdapter;
+import org.jackhuang.hmcl.util.ObservableHelper;
+import org.jackhuang.hmcl.util.i18n.Locales;
+import org.jackhuang.hmcl.util.i18n.Locales.SupportedLocale;
 
-import java.util.*;
+import java.io.File;
+import java.lang.reflect.Modifier;
+import java.net.Proxy;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.stream.Stream;
 
-final class Config {
+public final class Config implements Cloneable, Observable {
+
+    private static final Gson CONFIG_GSON = new GsonBuilder()
+            .registerTypeAdapter(VersionSetting.class, VersionSetting.Serializer.INSTANCE)
+            .registerTypeAdapter(Profile.class, Profile.Serializer.INSTANCE)
+            .registerTypeAdapter(File.class, FileTypeAdapter.INSTANCE)
+            .registerTypeAdapter(ObservableList.class, new ObservableListCreator())
+            .registerTypeAdapter(ObservableSet.class, new ObservableSetCreator())
+            .registerTypeAdapter(ObservableMap.class, new ObservableMapCreator())
+            .registerTypeAdapterFactory(new JavaFxPropertyTypeAdapterFactory(true, true))
+            .registerTypeAdapter(Theme.class, new Theme.TypeAdapter())
+            .registerTypeAdapter(SupportedLocale.class, new SupportedLocale.TypeAdapter())
+            .registerTypeAdapter(EnumBackgroundImage.class, new EnumOrdinalDeserializer<>(EnumBackgroundImage.class)) // backward compatibility for backgroundType
+            .registerTypeAdapter(Proxy.Type.class, new EnumOrdinalDeserializer<>(Proxy.Type.class)) // backward compatibility for hasProxy
+            .setPrettyPrinting()
+            .create();
+
+    public static Config fromJson(String json) throws JsonParseException {
+        Config instance = CONFIG_GSON.fromJson(json, Config.class);
+        // Gson will replace the property fields (even they are final!)
+        // So we have to add the listeners again after deserialization
+        instance.addListenerToProperties();
+        return instance;
+    }
 
     @SerializedName("last")
-    private String selectedProfile = "";
+    private StringProperty selectedProfile = new SimpleStringProperty("");
 
     @SerializedName("backgroundType")
-    private int backgroundImageType = 0;
+    private ObjectProperty<EnumBackgroundImage> backgroundImageType = new SimpleObjectProperty<>(EnumBackgroundImage.DEFAULT);
 
     @SerializedName("bgpath")
-    private String backgroundImage = null;
+    private StringProperty backgroundImage = new SimpleStringProperty();
+
+    @SerializedName("commonDirType")
+    private ObjectProperty<EnumCommonDirectory> commonDirType = new SimpleObjectProperty<>(EnumCommonDirectory.DEFAULT);
 
     @SerializedName("commonpath")
-    private String commonDirectory = Main.MINECRAFT_DIRECTORY.getAbsolutePath();
+    private StringProperty commonDirectory = new SimpleStringProperty(Launcher.MINECRAFT_DIRECTORY.getAbsolutePath());
 
     @SerializedName("hasProxy")
-    private boolean hasProxy = false;
+    private BooleanProperty hasProxy = new SimpleBooleanProperty();
 
     @SerializedName("hasProxyAuth")
-    private boolean hasProxyAuth = false;
+    private BooleanProperty hasProxyAuth = new SimpleBooleanProperty();
 
     @SerializedName("proxyType")
-    private int proxyType = 0;
+    private ObjectProperty<Proxy.Type> proxyType = new SimpleObjectProperty<>(Proxy.Type.DIRECT);
 
     @SerializedName("proxyHost")
-    private String proxyHost = null;
+    private StringProperty proxyHost = new SimpleStringProperty();
 
     @SerializedName("proxyPort")
-    private String proxyPort = null;
+    private StringProperty proxyPort = new SimpleStringProperty();
 
     @SerializedName("proxyUserName")
-    private String proxyUser = null;
+    private StringProperty proxyUser = new SimpleStringProperty();
 
     @SerializedName("proxyPassword")
-    private String proxyPass = null;
+    private StringProperty proxyPass = new SimpleStringProperty();
 
     @SerializedName("theme")
-    private String theme = null;
-
-    @SerializedName("java")
-    private List<JavaVersion> java = null;
+    private ObjectProperty<Theme> theme = new SimpleObjectProperty<>(Theme.BLUE);
 
     @SerializedName("localization")
-    private String localization;
+    private ObjectProperty<SupportedLocale> localization = new SimpleObjectProperty<>(Locales.DEFAULT);
 
-    @SerializedName("downloadtype")
-    private int downloadType = 0;
+    @SerializedName("downloadType")
+    private StringProperty downloadType = new SimpleStringProperty("bmclapi");
 
     @SerializedName("configurations")
-    private Map<String, Profile> configurations = new TreeMap<>();
+    private ObservableMap<String, Profile> configurations = FXCollections.observableMap(new TreeMap<>());
 
     @SerializedName("accounts")
-    private List<Map<Object, Object>> accounts = new LinkedList<>();
+    private ObservableList<Map<Object, Object>> accountStorages = FXCollections.observableArrayList();
 
     @SerializedName("selectedAccount")
-    private String selectedAccount = "";
+    private StringProperty selectedAccount = new SimpleStringProperty("");
 
     @SerializedName("fontFamily")
-    private String fontFamily = "Consolas";
+    private StringProperty fontFamily = new SimpleStringProperty("Consolas");
 
     @SerializedName("fontSize")
-    private double fontSize = 12;
+    private DoubleProperty fontSize = new SimpleDoubleProperty(12);
 
     @SerializedName("logLines")
-    private int logLines = 100;
+    private IntegerProperty logLines = new SimpleIntegerProperty(100);
 
-    @SerializedName("authlibInjectorServerURLs")
-    private Set<String> authlibInjectorServerURLs = new HashSet<>();
+    @SerializedName("authlibInjectorServers")
+    private ObservableList<AuthlibInjectorServer> authlibInjectorServers = FXCollections.observableArrayList();
 
+    @SerializedName("updateChannel")
+    private ObjectProperty<UpdateChannel> updateChannel = new SimpleObjectProperty<>(UpdateChannel.STABLE);
+
+    @SerializedName("enableMainPageGameList")
+    private BooleanProperty enableMainPageGameList = new SimpleBooleanProperty(false);
+
+    @SerializedName("_version")
+    private IntegerProperty configVersion = new SimpleIntegerProperty(0);
+
+    private transient ObservableHelper helper = new ObservableHelper(this);
+
+    public Config() {
+        addListenerToProperties();
+    }
+
+    private void addListenerToProperties() {
+        Stream.of(getClass().getDeclaredFields())
+                .filter(it -> {
+                    int modifiers = it.getModifiers();
+                    return !Modifier.isTransient(modifiers) && !Modifier.isStatic(modifiers);
+                })
+                .filter(it -> Observable.class.isAssignableFrom(it.getType()))
+                .map(it -> {
+                    try {
+                        return (Observable) it.get(this);
+                    } catch (IllegalAccessException e) {
+                        throw new IllegalStateException("Failed to get my own properties");
+                    }
+                })
+                .forEach(helper::receiveUpdatesFrom);
+    }
+
+    @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;
+        return selectedProfile.get();
     }
 
     public void setSelectedProfile(String selectedProfile) {
-        this.selectedProfile = selectedProfile;
-        Settings.INSTANCE.save();
+        this.selectedProfile.set(selectedProfile);
     }
 
-    public String getBackgroundImage() {
-        return backgroundImage;
+    public StringProperty selectedProfileProperty() {
+        return selectedProfile;
     }
 
-    public void setBackgroundImage(String backgroundImage) {
-        this.backgroundImage = backgroundImage;
-        Settings.INSTANCE.save();
+    public EnumBackgroundImage getBackgroundImageType() {
+        return backgroundImageType.get();
     }
 
-    public int getBackgroundImageType() {
+    public void setBackgroundImageType(EnumBackgroundImage backgroundImageType) {
+        this.backgroundImageType.set(backgroundImageType);
+    }
+
+    public ObjectProperty<EnumBackgroundImage> backgroundImageTypeProperty() {
         return backgroundImageType;
     }
 
-    public void setBackgroundImageType(int backgroundImageType) {
-        this.backgroundImageType = backgroundImageType;
-        Settings.INSTANCE.save();
+    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 ObjectProperty<EnumCommonDirectory> commonDirTypeProperty() {
+        return commonDirType;
+    }
+
+    public void setCommonDirType(EnumCommonDirectory commonDirType) {
+        this.commonDirType.set(commonDirType);
     }
 
     public String getCommonDirectory() {
-        return commonDirectory;
+        return commonDirectory.get();
     }
 
     public void setCommonDirectory(String commonDirectory) {
-        this.commonDirectory = commonDirectory;
-        Settings.INSTANCE.save();
+        this.commonDirectory.set(commonDirectory);
     }
 
-    public boolean isHasProxy() {
-        return hasProxy;
+    public StringProperty commonDirectoryProperty() {
+        return commonDirectory;
+    }
+
+    public boolean hasProxy() {
+        return hasProxy.get();
     }
 
     public void setHasProxy(boolean hasProxy) {
-        this.hasProxy = hasProxy;
-        Settings.INSTANCE.save();
+        this.hasProxy.set(hasProxy);
     }
 
-    public boolean isHasProxyAuth() {
-        return hasProxyAuth;
+    public BooleanProperty hasProxyProperty() {
+        return hasProxy;
+    }
+
+    public boolean hasProxyAuth() {
+        return hasProxyAuth.get();
     }
 
     public void setHasProxyAuth(boolean hasProxyAuth) {
-        this.hasProxyAuth = hasProxyAuth;
-        Settings.INSTANCE.save();
+        this.hasProxyAuth.set(hasProxyAuth);
     }
 
-    public int getProxyType() {
+    public BooleanProperty hasProxyAuthProperty() {
+        return hasProxyAuth;
+    }
+
+    public Proxy.Type getProxyType() {
+        return proxyType.get();
+    }
+
+    public void setProxyType(Proxy.Type proxyType) {
+        this.proxyType.set(proxyType);
+    }
+
+    public ObjectProperty<Proxy.Type> proxyTypeProperty() {
         return proxyType;
     }
 
-    public void setProxyType(int proxyType) {
-        this.proxyType = proxyType;
-        Settings.INSTANCE.save();
-    }
-
     public String getProxyHost() {
-        return proxyHost;
+        return proxyHost.get();
     }
 
     public void setProxyHost(String proxyHost) {
-        this.proxyHost = proxyHost;
-        Settings.INSTANCE.save();
+        this.proxyHost.set(proxyHost);
+    }
+
+    public StringProperty proxyHostProperty() {
+        return proxyHost;
     }
 
     public String getProxyPort() {
-        return proxyPort;
+        return proxyPort.get();
     }
 
     public void setProxyPort(String proxyPort) {
-        this.proxyPort = proxyPort;
-        Settings.INSTANCE.save();
+        this.proxyPort.set(proxyPort);
+    }
+
+    public StringProperty proxyPortProperty() {
+        return proxyPort;
     }
 
     public String getProxyUser() {
-        return proxyUser;
+        return proxyUser.get();
     }
 
     public void setProxyUser(String proxyUser) {
-        this.proxyUser = proxyUser;
-        Settings.INSTANCE.save();
+        this.proxyUser.set(proxyUser);
+    }
+
+    public StringProperty proxyUserProperty() {
+        return proxyUser;
     }
 
     public String getProxyPass() {
-        return proxyPass;
+        return proxyPass.get();
     }
 
     public void setProxyPass(String proxyPass) {
-        this.proxyPass = proxyPass;
-        Settings.INSTANCE.save();
+        this.proxyPass.set(proxyPass);
     }
 
-    public String getTheme() {
+    public StringProperty proxyPassProperty() {
+        return proxyPass;
+    }
+
+    public Theme getTheme() {
+        return theme.get();
+    }
+
+    public void setTheme(Theme theme) {
+        this.theme.set(theme);
+    }
+
+    public ObjectProperty<Theme> themeProperty() {
         return theme;
     }
 
-    public void setTheme(String theme) {
-        this.theme = theme;
-        Settings.INSTANCE.save();
+    public SupportedLocale getLocalization() {
+        return localization.get();
     }
 
-    public List<JavaVersion> getJava() {
-        return java;
+    public void setLocalization(SupportedLocale localization) {
+        this.localization.set(localization);
     }
 
-    public void setJava(List<JavaVersion> java) {
-        this.java = java;
-        Settings.INSTANCE.save();
-    }
-
-    public String getLocalization() {
+    public ObjectProperty<SupportedLocale> localizationProperty() {
         return localization;
     }
 
-    public void setLocalization(String localization) {
-        this.localization = localization;
-        Settings.INSTANCE.save();
+    public String getDownloadType() {
+        return downloadType.get();
     }
 
-    public int getDownloadType() {
+    public void setDownloadType(String downloadType) {
+        this.downloadType.set(downloadType);
+    }
+
+    public StringProperty downloadTypeProperty() {
         return downloadType;
     }
 
-    public void setDownloadType(int downloadType) {
-        this.downloadType = downloadType;
-        Settings.INSTANCE.save();
-    }
-
-    public Map<String, Profile> getConfigurations() {
+    public ObservableMap<String, Profile> getConfigurations() {
         return configurations;
     }
 
-    public void setConfigurations(Map<String, Profile> configurations) {
-        this.configurations = configurations;
-        Settings.INSTANCE.save();
-    }
-
-    public List<Map<Object, Object>> getAccounts() {
-        return accounts;
-    }
-
-    public void setAccounts(List<Map<Object, Object>> accounts) {
-        this.accounts = accounts;
-        Settings.INSTANCE.save();
+    public ObservableList<Map<Object, Object>> getAccountStorages() {
+        return accountStorages;
     }
 
     public String getSelectedAccount() {
-        return selectedAccount;
+        return selectedAccount.get();
     }
 
     public void setSelectedAccount(String selectedAccount) {
-        this.selectedAccount = selectedAccount;
-        Settings.INSTANCE.save();
+        this.selectedAccount.set(selectedAccount);
+    }
+
+    public StringProperty selectedAccountProperty() {
+        return selectedAccount;
     }
 
     public String getFontFamily() {
-        return fontFamily;
+        return fontFamily.get();
     }
 
     public void setFontFamily(String fontFamily) {
-        this.fontFamily = fontFamily;
-        Settings.INSTANCE.save();
+        this.fontFamily.set(fontFamily);
+    }
+
+    public StringProperty fontFamilyProperty() {
+        return fontFamily;
     }
 
     public double getFontSize() {
-        return fontSize;
+        return fontSize.get();
     }
 
     public void setFontSize(double fontSize) {
-        this.fontSize = fontSize;
-        Settings.INSTANCE.save();
+        this.fontSize.set(fontSize);
+    }
+
+    public DoubleProperty fontSizeProperty() {
+        return fontSize;
     }
 
     public int getLogLines() {
-        return logLines;
+        return logLines.get();
     }
 
     public void setLogLines(int logLines) {
-        this.logLines = logLines;
+        this.logLines.set(logLines);
     }
 
-    public Set<String> getAuthlibInjectorServerURLs() {
-        return authlibInjectorServerURLs;
+    public IntegerProperty logLinesProperty() {
+        return logLines;
     }
 
-    public void setAuthlibInjectorServerURLs(Set<String> authlibInjectorServerURLs) {
-        this.authlibInjectorServerURLs = authlibInjectorServerURLs;
-        Settings.INSTANCE.save();
+    public ObservableList<AuthlibInjectorServer> getAuthlibInjectorServers() {
+        return authlibInjectorServers;
+    }
+
+    public UpdateChannel getUpdateChannel() {
+        return updateChannel.get();
+    }
+
+    public ObjectProperty<UpdateChannel> updateChannelProperty() {
+        return updateChannel;
+    }
+
+    public void setUpdateChannel(UpdateChannel updateChannel) {
+        this.updateChannel.set(updateChannel);
+    }
+
+    public boolean isEnableMainPageGameList() {
+        return enableMainPageGameList.get();
+    }
+
+    public BooleanProperty enableMainPageGameListProperty() {
+        return enableMainPageGameList;
+    }
+
+    public void setEnableMainPageGameList(boolean enableMainPageGameList) {
+        this.enableMainPageGameList.set(enableMainPageGameList);
     }
 }

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

@@ -0,0 +1,143 @@
+/*
+ * 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.setting;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonParseException;
+import org.jackhuang.hmcl.util.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 static boolean isNewlyCreated() {
+        if (configInstance == null) {
+            throw new IllegalStateException("Configuration hasn't been loaded");
+        }
+        return newlyCreated;
+    }
+
+    public synchronized static void init() throws IOException {
+        if (configInstance != null) {
+            throw new IllegalStateException("Configuration is already loaded");
+        }
+
+        configLocation = locateConfig();
+        configInstance = loadConfig();
+        configInstance.addListener(source -> markConfigDirty());
+
+        Settings.init();
+
+        if (newlyCreated) {
+            saveConfig();
+
+            // 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 = new String(Files.readAllBytes(configLocation), UTF_8);
+                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 void saveConfig() throws IOException {
+        LOG.info("Saving config");
+        try {
+            Files.write(configLocation, configInstance.toJson().getBytes(UTF_8));
+        } catch (IOException e) {
+            LOG.log(Level.SEVERE, "Failed to save config", e);
+            throw e;
+        }
+    }
+
+    static void markConfigDirty() {
+        // TODO: change this to async
+        try {
+            saveConfig();
+        } catch (IOException ignored) {
+            // ignore it as it has been logged
+        }
+    }
+}

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

@@ -0,0 +1,102 @@
+/*
+ * 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.setting;
+
+import org.jackhuang.hmcl.auth.offline.OfflineAccount;
+import org.jackhuang.hmcl.auth.offline.OfflineAccountFactory;
+import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.UUIDTypeAdapter;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import static org.jackhuang.hmcl.util.Lang.tryCast;
+
+final class ConfigUpgrader {
+    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
+     */
+    static void upgradeConfig(Config deserialized, Map<?, ?> rawJson) {
+        upgradeV2(deserialized, rawJson);
+        upgradeV3(deserialized, rawJson);
+    }
+
+    /**
+     * 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 -> {
+                List<OfflineAccount> accounts = new LinkedList<>();
+                tryCast(offline.get("uuidMap"), Map.class).ifPresent(uuidMap -> {
+                    ((Map<?, ?>) uuidMap).forEach((key, value) -> {
+                        OfflineAccount account = OfflineAccountFactory.INSTANCE.create((String) key, UUIDTypeAdapter.fromString((String) value));
+                        accounts.add(account);
+                        deserialized.getAccountStorages().add(Accounts.getAccountStorage(account));
+                    });
+                });
+
+                tryCast(offline.get("IAuthenticator_UserName"), String.class).ifPresent(selected -> {
+                    if (!rawJson.containsKey("selectedAccount"))
+                        accounts.stream().filter(account -> selected.equals(account.getUsername())).findAny().ifPresent(account ->
+                                deserialized.setSelectedAccount(Accounts.accountId(account)));
+                });
+            });
+        });
+    }
+
+    /**
+     * 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");
+                        }
+                    });
+        }
+    }
+}

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

@@ -17,21 +17,44 @@
  */
 package org.jackhuang.hmcl.setting;
 
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.util.Lang.mapOf;
+import static org.jackhuang.hmcl.util.Pair.pair;
+
+import java.util.Map;
+import java.util.Optional;
+
 import org.jackhuang.hmcl.download.BMCLAPIDownloadProvider;
-import org.jackhuang.hmcl.download.CurseCDNDownloadProvider;
 import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.download.MojangDownloadProvider;
-import org.jackhuang.hmcl.util.Lang;
 
-import java.util.Arrays;
-import java.util.List;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.ObjectBinding;
+import javafx.beans.value.ObservableObjectValue;
 
 public final class DownloadProviders {
     private DownloadProviders() {}
 
-    public static final List<DownloadProvider> DOWNLOAD_PROVIDERS = Lang.immutableListOf(new MojangDownloadProvider(Settings.INSTANCE.getLocale() == Locales.ZH_CN), BMCLAPIDownloadProvider.INSTANCE, CurseCDNDownloadProvider.INSTANCE);
+    public static final Map<String, DownloadProvider> providersById = mapOf(
+            pair("mojang", new MojangDownloadProvider()),
+            pair("bmclapi", new BMCLAPIDownloadProvider()));
 
-    public static DownloadProvider getDownloadProvider(int index) {
-        return Lang.get(DOWNLOAD_PROVIDERS, index).orElse(DOWNLOAD_PROVIDERS.get(0));
+    public static final String DEFAULT_PROVIDER_ID = "bmclapi";
+
+    private static ObjectBinding<DownloadProvider> downloadProviderProperty;
+
+    static void init() {
+        downloadProviderProperty = Bindings.createObjectBinding(
+                () -> Optional.ofNullable(providersById.get(config().getDownloadType()))
+                        .orElse(providersById.get(DEFAULT_PROVIDER_ID)),
+                config().downloadTypeProperty());
+    }
+
+    public static DownloadProvider getDownloadProvider() {
+        return downloadProviderProperty.get();
+    }
+
+    public static ObservableObjectValue<DownloadProvider> downloadProviderProperty() {
+        return downloadProviderProperty;
     }
 }

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

@@ -19,12 +19,5 @@ package org.jackhuang.hmcl.setting;
 
 public enum EnumBackgroundImage {
     DEFAULT,
-    CUSTOM;
-
-    public static EnumBackgroundImage indexOf(int index) {
-        if (index >= values().length || index < 0)
-            return DEFAULT;
-        else
-            return values()[index];
-    }
+    CUSTOM
 }

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

@@ -1,7 +1,7 @@
 /*
  * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -15,11 +15,15 @@
  * 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.auth;
+package org.jackhuang.hmcl.setting;
 
-/**
- *
- * @author huangyuhui
- */
-public class InvalidTokenException extends AuthenticationException {
+public enum EnumCommonDirectory {
+    /**
+     * %appdata%/.minecraft or ~/.minecraft
+     */
+    DEFAULT,
+    /**
+     * user customized common directory.
+     */
+    CUSTOM
 }

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

@@ -18,72 +18,99 @@
 package org.jackhuang.hmcl.setting;
 
 import com.google.gson.*;
+import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
-import org.jackhuang.hmcl.game.HMCLDependencyManager;
+import javafx.beans.Observable;
+import javafx.beans.property.*;
+import org.jackhuang.hmcl.download.DefaultDependencyManager;
+import org.jackhuang.hmcl.event.EventBus;
+import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
+import org.jackhuang.hmcl.game.HMCLCacheRepository;
 import org.jackhuang.hmcl.game.HMCLGameRepository;
+import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.mod.ModManager;
-import org.jackhuang.hmcl.util.ImmediateObjectProperty;
-import org.jackhuang.hmcl.util.ImmediateStringProperty;
+import org.jackhuang.hmcl.ui.WeakListenerHolder;
+import org.jackhuang.hmcl.util.*;
 
 import java.io.File;
 import java.lang.reflect.Type;
 import java.util.Optional;
 
+import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
+
 /**
  *
  * @author huangyuhui
  */
-public final class Profile {
-
+public final class Profile implements Observable {
+    private final WeakListenerHolder listenerHolder = new WeakListenerHolder();
     private final HMCLGameRepository repository;
     private final ModManager modManager;
 
-    private final ImmediateObjectProperty<File> gameDirProperty;
+    private final StringProperty selectedVersion = new SimpleStringProperty();
 
-    public ImmediateObjectProperty<File> gameDirProperty() {
-        return gameDirProperty;
+    public StringProperty selectedVersionProperty() {
+        return selectedVersion;
+    }
+
+    public String getSelectedVersion() {
+        return selectedVersion.get();
+    }
+
+    public void setSelectedVersion(String selectedVersion) {
+        this.selectedVersion.set(selectedVersion);
+    }
+
+    private final ObjectProperty<File> gameDir;
+
+    public ObjectProperty<File> gameDirProperty() {
+        return gameDir;
     }
 
     public File getGameDir() {
-        return gameDirProperty.get();
+        return gameDir.get();
     }
 
     public void setGameDir(File gameDir) {
-        gameDirProperty.set(gameDir);
+        this.gameDir.set(gameDir);
     }
 
-    private final ImmediateObjectProperty<VersionSetting> globalProperty = new ImmediateObjectProperty<>(this, "global", new VersionSetting());
+    private final ReadOnlyObjectWrapper<VersionSetting> global = new ReadOnlyObjectWrapper<>(this, "global");
 
-    public ImmediateObjectProperty<VersionSetting> globalProperty() {
-        return globalProperty;
+    public ReadOnlyObjectProperty<VersionSetting> globalProperty() {
+        return global.getReadOnlyProperty();
     }
 
     public VersionSetting getGlobal() {
-        return globalProperty.get();
+        return global.get();
     }
 
-    public void setGlobal(VersionSetting global) {
-        if (global == null)
-            global = new VersionSetting();
-        globalProperty.set(global);
-    }
-
-    private final ImmediateStringProperty nameProperty;
+    private final ImmediateStringProperty name;
 
     public ImmediateStringProperty nameProperty() {
-        return nameProperty;
+        return name;
     }
 
     public String getName() {
-        return nameProperty.get();
+        return name.get();
     }
 
     public void setName(String name) {
-        nameProperty.set(name);
+        this.name.set(name);
     }
 
-    public Profile() {
-        this("Default");
+    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(String name) {
@@ -91,12 +118,39 @@ public final class Profile {
     }
 
     public Profile(String name, File initialGameDir) {
-        nameProperty = new ImmediateStringProperty(this, "name", name);
-        gameDirProperty = new ImmediateObjectProperty<>(this, "gameDir", 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 ImmediateStringProperty(this, "name", name);
+        gameDir = new ImmediateObjectProperty<>(this, "gameDir", initialGameDir);
         repository = new HMCLGameRepository(this, initialGameDir);
         modManager = new ModManager(repository);
+        this.global.set(global == null ? new VersionSetting() : global);
+        this.selectedVersion.set(selectedVersion);
+        this.useRelativePath.set(useRelativePath);
 
-        gameDirProperty.addListener((a, b, newValue) -> repository.changeDirectory(newValue));
+        gameDir.addListener((a, b, newValue) -> repository.changeDirectory(newValue));
+        this.selectedVersion.addListener(o -> checkSelectedVersion());
+        listenerHolder.add(EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).registerWeak(event -> checkSelectedVersion()));
+
+        addPropertyChangedListener(onInvalidating(this::invalidate));
+    }
+
+    private void checkSelectedVersion() {
+        if (!repository.isLoaded()) return;
+        String newValue = selectedVersion.get();
+        if (!repository.hasVersion(newValue)) {
+            Optional<String> version = repository.getVersions().stream().findFirst().map(Version::getId);
+            if (version.isPresent())
+                selectedVersion.setValue(version.get());
+            else if (newValue != null)
+                selectedVersion.setValue(null);
+        }
     }
 
     public HMCLGameRepository getRepository() {
@@ -107,49 +161,52 @@ public final class Profile {
         return modManager;
     }
 
-    public HMCLDependencyManager getDependency() {
-        return new HMCLDependencyManager(this, Settings.INSTANCE.getDownloadProvider(), Settings.INSTANCE.getProxy());
+    public DefaultDependencyManager getDependency() {
+        return new DefaultDependencyManager(repository, DownloadProviders.getDownloadProvider(), HMCLCacheRepository.REPOSITORY);
     }
 
     public VersionSetting getVersionSetting(String id) {
         VersionSetting vs = repository.getVersionSetting(id);
         if (vs == null || vs.isUsesGlobal()) {
             getGlobal().setGlobal(true); // always keep global.isGlobal = true
+            getGlobal().setUsesGlobal(true);
             return getGlobal();
         } else
             return vs;
     }
 
-    public boolean isVersionGlobal(String id) {
-        VersionSetting vs = repository.getVersionSetting(id);
-        return vs == null || vs.isUsesGlobal();
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .append("gameDir", getGameDir())
+                .append("name", getName())
+                .append("useRelativePath", isUseRelativePath())
+                .toString();
     }
 
-    /**
-     * 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;
+    private void addPropertyChangedListener(InvalidationListener listener) {
+        name.addListener(listener);
+        global.addListener(listener);
+        gameDir.addListener(listener);
+        useRelativePath.addListener(listener);
+        global.get().addPropertyChangedListener(listener);
+        selectedVersion.addListener(listener);
     }
 
-    public void globalizeVersionSetting(String id) {
-        VersionSetting vs = repository.getVersionSetting(id);
-        if (vs != null)
-            vs.setUsesGlobal(true);
+    private ObservableHelper observableHelper = new ObservableHelper(this);
+
+    @Override
+    public void addListener(InvalidationListener listener) {
+        observableHelper.addListener(listener);
     }
 
-    public void addPropertyChangedListener(InvalidationListener listener) {
-        nameProperty.addListener(listener);
-        globalProperty.addListener(listener);
-        gameDirProperty.addListener(listener);
+    @Override
+    public void removeListener(InvalidationListener listener) {
+        observableHelper.removeListener(listener);
+    }
+
+    private void invalidate() {
+        Platform.runLater(observableHelper::invalidate);
     }
 
     public static final class Serializer implements JsonSerializer<Profile>, JsonDeserializer<Profile> {
@@ -166,6 +223,8 @@ public final class Profile {
             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;
         }
@@ -176,9 +235,11 @@ public final class Profile {
             JsonObject obj = (JsonObject) json;
             String gameDir = Optional.ofNullable(obj.get("gameDir")).map(JsonElement::getAsString).orElse("");
 
-            Profile profile = new Profile("Default", new File(gameDir));
-            profile.setGlobal(context.deserialize(obj.get("global"), VersionSetting.class));
-            return profile;
+            return new Profile("Default",
+                    new File(gameDir),
+                    context.deserialize(obj.get("global"), VersionSetting.class),
+                    Optional.ofNullable(obj.get("selectedMinecraftVersion")).map(JsonElement::getAsString).orElse(""),
+                    Optional.ofNullable(obj.get("useRelativePath")).map(JsonElement::getAsBoolean).orElse(false));
         }
 
     }

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

@@ -17,20 +17,194 @@
  */
 package org.jackhuang.hmcl.setting;
 
-import org.jackhuang.hmcl.Main;
+import com.jfoenix.concurrency.JFXUtilities;
+import javafx.application.Platform;
+import javafx.beans.InvalidationListener;
+import javafx.beans.Observable;
+import javafx.beans.property.*;
+import javafx.beans.value.ObservableValue;
+import javafx.collections.ObservableList;
+import org.jackhuang.hmcl.Launcher;
+import org.jackhuang.hmcl.event.EventBus;
+import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.stream.Collectors;
+
+import static java.util.stream.Collectors.toList;
+import static javafx.collections.FXCollections.observableArrayList;
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class Profiles {
+
+    public static final String DEFAULT_PROFILE = "Default";
+    public static final String HOME_PROFILE = "Home";
+
+    private static InvalidationListener listener = o -> loadVersion();
+
     private Profiles() {
     }
 
     public static String getProfileDisplayName(Profile profile) {
         switch (profile.getName()) {
-            case Settings.DEFAULT_PROFILE:
-                return Main.i18n("profile.default");
-            case Settings.HOME_PROFILE:
-                return Main.i18n("profile.home");
+            case Profiles.DEFAULT_PROFILE:
+                return i18n("profile.default");
+            case Profiles.HOME_PROFILE:
+                return 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));
+
+            this.addListener(this::change);
+        }
+
+        @Override
+        protected void invalidated() {
+            Profile profile = get();
+
+            if (get() != null)
+                get().removeListener(listener);
+
+            if (profiles.isEmpty()) {
+                if (profile != null) {
+                    set(null);
+                    return;
+                }
+            } else {
+                if (!profiles.contains(profile)) {
+                    set(profiles.get(0));
+                    return;
+                }
+            }
+
+            if (!initialized)
+                return;
+
+            config().setSelectedProfile(profile == null ? "" : profile.getName());
+            loadVersion();
+        }
+
+        private void change(ObservableValue<? extends Profile> observableValue, Profile oldProfile, Profile newProfile) {
+            if (oldProfile != null)
+                oldProfile.selectedVersionProperty().removeListener(listener);
+            if (newProfile != null)
+                newProfile.selectedVersionProperty().addListener(listener);
+        }
+    };
+
+    private static void checkProfiles() {
+        if (profiles.isEmpty()) {
+            Profile current = new Profile(Profiles.DEFAULT_PROFILE, new File(".minecraft"), new VersionSetting(), null, true);
+            Profile home = new Profile(Profiles.HOME_PROFILE, Launcher.MINECRAFT_DIRECTORY);
+            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(() -> {
+            selectedProfile.set(
+                    profiles.stream()
+                            .filter(it -> it.getName().equals(config().getSelectedProfile()))
+                            .findFirst()
+                            .orElse(profiles.get(0)));
+
+            initialized = true;
+        });
+
+        EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).registerWeak(event -> {
+            JFXUtilities.runInFX(() -> {
+                if (selectedProfile.get() != null && selectedProfile.get().getRepository() == event.getSource())
+                    loadVersion();
+            });
+        });
+    }
+
+    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();
+    }
+
+    public static String getSelectedVersion() {
+        return selectedVersion.get();
+    }
+
+    private static void loadVersion() {
+        Profile profile = selectedProfile.get();
+        if (profile == null || !profile.getRepository().isLoaded()) return;
+        JFXUtilities.runInFX(() ->
+                selectedVersion.set(profile.getSelectedVersion()));
+    }
 }

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

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

@@ -0,0 +1,112 @@
+/*
+ * 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.setting;
+
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.ObjectBinding;
+import javafx.beans.value.ObservableObjectValue;
+import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.StringUtils;
+
+import java.net.Authenticator;
+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;
+
+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();
+                    Integer port = Lang.toIntOrNull(config().getProxyPort());
+                    if (!config().hasProxy() || StringUtils.isBlank(host) || port == null || config().getProxyType() == Proxy.Type.DIRECT) {
+                        return Proxy.NO_PROXY;
+                    } else {
+                        return new Proxy(config().getProxyType(), new InetSocketAddress(host, port));
+                    }
+                },
+                config().proxyTypeProperty(),
+                config().proxyHostProperty(),
+                config().proxyPortProperty(),
+                config().hasProxyProperty());
+
+        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

@@ -17,533 +17,62 @@
  */
 package org.jackhuang.hmcl.setting;
 
-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.Main;
-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.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 org.jackhuang.hmcl.Launcher;
+import org.jackhuang.hmcl.game.HMCLCacheRepository;
+import org.jackhuang.hmcl.util.CacheRepository;
 
-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;
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 
 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();
 
-    public static final String DEFAULT_PROFILE = "Default";
-    public static final String HOME_PROFILE = "Home";
+    private static Settings instance;
 
-    public static final File SETTINGS_FILE = new File("hmcl.json").getAbsoluteFile();
-
-    public static final Settings INSTANCE = new Settings();
-
-    private Settings() {}
-
-    private final Config SETTINGS = initSettings();
-
-    private 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);
+    public static Settings instance() {
+        if (instance == null) {
+            throw new IllegalStateException("Settings hasn't been initialized");
         }
-
-        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());
-        }
-    };
-
-    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));
-    }
-
-    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));
-        loadProxy();
-    }
-
-    public String getProxyHost() {
-        return SETTINGS.getProxyHost();
-    }
-
-    public void setProxyHost(String proxyHost) {
-        SETTINGS.setProxyHost(proxyHost);
-    }
-
-    public String getProxyPort() {
-        return SETTINGS.getProxyPort();
-    }
-
-    public void setProxyPort(String proxyPort) {
-        SETTINGS.setProxyPort(proxyPort);
-    }
-
-    public String getProxyUser() {
-        return SETTINGS.getProxyUser();
-    }
-
-    public void setProxyUser(String proxyUser) {
-        SETTINGS.setProxyUser(proxyUser);
-    }
-
-    public String getProxyPass() {
-        return SETTINGS.getProxyPass();
-    }
-
-    public void setProxyPass(String proxyPass) {
-        SETTINGS.setProxyPass(proxyPass);
-    }
-
-    public boolean hasProxy() { return SETTINGS.isHasProxy(); }
-
-    public void setHasProxy(boolean hasProxy) { SETTINGS.setHasProxy(hasProxy); }
-
-    public boolean hasProxyAuth() { return SETTINGS.isHasProxyAuth(); }
-
-    public void setHasProxyAuth(boolean hasProxyAuth) { SETTINGS.setHasProxyAuth(hasProxyAuth); }
-
-    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());
-    }
-
-    public int getLogLines() {
-        return Math.max(SETTINGS.getLogLines(), 100);
-    }
-
-    public void setLogLines(int logLines) {
-        SETTINGS.setLogLines(logLines);
-    }
-
-    /****************************************
-     *           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<>());
-    }
-
-    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);
-    }
-
-    /****************************************
-     *               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()));
-        }
-    };
-
-    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);
-    }
-
-    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));
-
-        selectedAccount.get();
-    }
-
-    public void deleteAccount(Account account) {
-        accounts.remove(Accounts.getAccountId(account));
-
-        selectedAccount.get();
-    }
-
-    /****************************************
-     *              BACKGROUND              *
-     ****************************************/
-
-    private final ImmediateStringProperty backgroundImage = new ImmediateStringProperty(this, "backgroundImage", SETTINGS.getBackgroundImage()) {
-        @Override
-        public void invalidated() {
-            super.invalidated();
-
-            SETTINGS.setBackgroundImage(get());
-        }
-    };
-
-    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());
-        }
-    };
-
-    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());
-        }
-    };
-
-    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())) {
-            SETTINGS.setSelectedProfile(getProfileMap().keySet().stream().findFirst().get());
-            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());
-            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);
-
-        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, Main.MINECRAFT_DIRECTORY));
-        }
-    }
-
-    private void onProfileChanged() {
-        getSelectedProfile().getRepository().refreshVersionsAsync().subscribe(() ->
-                EventBus.EVENT_BUS.fireEvent(new ProfileChangedEvent(SETTINGS, getSelectedProfile())));
-    }
-
-    private void profileNameChanged(ObservableValue<? extends String> observableValue, String oldValue, String newValue) {
-        getProfileMap().put(newValue, getProfileMap().remove(oldValue));
+        return instance;
     }
 
     /**
-     * Start profiles loading process.
-     * Invoked by loading GUI phase.
+     * Should be called from {@link ConfigHolder#init()}.
      */
-    public void onProfileLoading() {
-        EventBus.EVENT_BUS.fireEvent(new ProfileLoadingEvent(SETTINGS));
-        onProfileChanged();
+    static void init() {
+        instance = new Settings();
+    }
+
+    private Settings() {
+        DownloadProviders.init();
+        ProxyManager.init();
+        Accounts.init();
+        Profiles.init();
+
+        CacheRepository.setInstance(HMCLCacheRepository.REPOSITORY);
+        HMCLCacheRepository.REPOSITORY.directoryProperty().bind(config().commonDirectoryProperty());
+    }
+
+    public Font getFont() {
+        return Font.font(config().getFontFamily(), config().getFontSize());
+    }
+
+    public void setFont(Font font) {
+        config().setFontFamily(font.getFamily());
+        config().setFontSize(font.getSize());
+    }
+
+    public static String getDefaultCommonDirectory() {
+        return Launcher.MINECRAFT_DIRECTORY.getAbsolutePath();
+    }
+
+    public String getCommonDirectory() {
+        switch (config().getCommonDirType()) {
+            case DEFAULT:
+                return getDefaultCommonDirectory();
+            case CUSTOM:
+                return config().getCommonDirectory();
+            default:
+                return null;
+        }
     }
 }

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

@@ -17,6 +17,8 @@
  */
 package org.jackhuang.hmcl.setting;
 
+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;
@@ -29,15 +31,19 @@ import java.io.IOException;
 import java.util.Optional;
 import java.util.logging.Level;
 
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+
 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 Theme[] VALUES = new Theme[]{BLUE, DARK_BLUE, GREEN, ORANGE, PURPLE, RED};
+    public static final Color[] SUGGESTED_COLORS = new Color[]{
+            Color.web("#5C6BC0"), // blue
+            Color.web("#283593"), // dark blue
+            Color.web("#43A047"), // green
+            Color.web("#E67E22"), // orange
+            Color.web("#9C27B0"), // purple
+            Color.web("#F44336")  // red
+    };
 
     private final String color;
     private final String name;
@@ -68,8 +74,7 @@ public class Theme {
     }
 
     public String[] getStylesheets() {
-        String name = isCustom() ? BLUE.getName() : this.name;
-        String css = Theme.class.getResource("/assets/css/" + name + ".css").toExternalForm();
+        String css;
         try {
             File temp = File.createTempFile("hmcl", ".css");
             FileUtils.writeText(temp, IOUtils.readFullyAsString(Theme.class.getResourceAsStream("/assets/css/custom.css"))
@@ -77,12 +82,11 @@ public class Theme {
                     .replace("%font-color%", getColorDisplayName(getForegroundColor())));
             css = temp.toURI().toString();
         } catch (IOException e) {
-            Logging.LOG.log(Level.SEVERE, "Unable to create theme stylesheet", e);
+            Logging.LOG.log(Level.SEVERE, "Unable to create theme stylesheet. Fallback to blue theme.", e);
+            css = Theme.class.getResource("/assets/css/blue.css").toExternalForm();
         }
 
         return new String[]{
-                Theme.class.getResource("/css/jfoenix-fonts.css").toExternalForm(),
-                Theme.class.getResource("/css/jfoenix-design.css").toExternalForm(),
                 css,
                 Theme.class.getResource("/assets/css/root.css").toExternalForm()
         };
@@ -97,10 +101,18 @@ public class Theme {
     public static Optional<Theme> getTheme(String name) {
         if (name == null)
             return Optional.empty();
-
-        for (Theme theme : VALUES)
-            if (theme.name.equalsIgnoreCase(name))
-                return Optional.of(theme);
+        else if (name.equalsIgnoreCase("blue"))
+            return Optional.of(custom("#5C6BC0"));
+        else if (name.equalsIgnoreCase("darker_blue"))
+            return Optional.of(custom("#283593"));
+        else if (name.equalsIgnoreCase("green"))
+            return Optional.of(custom("#43A047"));
+        else if (name.equalsIgnoreCase("orange"))
+            return Optional.of(custom("#E67E22"));
+        else if (name.equalsIgnoreCase("purple"))
+            return Optional.of(custom("#9C27B0"));
+        else if (name.equalsIgnoreCase("red"))
+            return Optional.of(custom("#F44336"));
 
         if (name.startsWith("#"))
             try {
@@ -117,7 +129,7 @@ public class Theme {
     }
 
     public static ObjectBinding<Color> foregroundFillBinding() {
-        return Bindings.createObjectBinding(() -> Settings.INSTANCE.getTheme().getForegroundColor(), Settings.INSTANCE.themeProperty());
+        return Bindings.createObjectBinding(() -> config().getTheme().getForegroundColor(), config().themeProperty());
     }
 
     public static ObjectBinding<Color> blackFillBinding() {
@@ -127,4 +139,16 @@ 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

@@ -19,14 +19,18 @@ package org.jackhuang.hmcl.setting;
 
 import com.google.gson.*;
 import javafx.beans.InvalidationListener;
-import org.jackhuang.hmcl.Main;
+import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.game.LaunchOptions;
 import org.jackhuang.hmcl.util.*;
 
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Type;
+import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
+
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 
 /**
  *
@@ -77,7 +81,7 @@ public final class VersionSetting {
     }
 
     /**
-     * Java version or null if user customizes java directory.
+     * Java version or "Custom" if user customizes java directory, "Default" if the jvm that this app relies on.
      */
     public String getJava() {
         return javaProperty.get();
@@ -87,6 +91,29 @@ public final class VersionSetting {
         javaProperty.set(java);
     }
 
+    public boolean isUsesCustomJavaDir() {
+        return "Custom".equals(getJava());
+    }
+
+    public void setUsesCustomJavaDir() {
+        setJava("Custom");
+        setDefaultJavaPath(null);
+    }
+
+    private final ImmediateStringProperty defaultJavaPathProperty = new ImmediateStringProperty(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 ImmediateStringProperty javaDirProperty = new ImmediateStringProperty(this, "javaDir", "");
 
     public ImmediateStringProperty javaDirProperty() {
@@ -260,23 +287,6 @@ public final class VersionSetting {
         notCheckGameProperty.set(notCheckGame);
     }
 
-    private final ImmediateBooleanProperty noCommonProperty = new ImmediateBooleanProperty(this, "noCommon", false);
-
-    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() {
@@ -437,22 +447,33 @@ public final class VersionSetting {
         if (StringUtils.isBlank(getJava()))
             setJava(StringUtils.isBlank(getJavaDir()) ? "Default" : "Custom");
         if ("Default".equals(getJava())) return JavaVersion.fromCurrentEnvironment();
-        else if ("Custom".equals(getJava())) {
+        else if (isUsesCustomJavaDir()) {
             try {
                 return JavaVersion.fromExecutable(new File(getJavaDir()));
             } catch (IOException e) {
                 return null; // Custom Java Directory not found,
             }
         } else if (StringUtils.isNotBlank(getJava())) {
-            JavaVersion c = JavaVersion.getJREs().get(getJava());
-            if (c == null) {
+            List<JavaVersion> matchedJava = JavaVersion.getJREs().stream()
+                    .filter(java -> java.getVersion().equals(getJava()))
+                    .collect(Collectors.toList());
+            if (matchedJava.isEmpty()) {
                 setJava("Default");
                 return JavaVersion.fromCurrentEnvironment();
-            } else
-                return c;
+            } else {
+                return matchedJava.stream()
+                        .filter(java -> java.getBinary().toString().equals(getDefaultJavaPath()))
+                        .findFirst()
+                        .orElse(matchedJava.get(0));
+            }
         } 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);
@@ -466,7 +487,6 @@ public final class VersionSetting {
         minecraftArgsProperty.addListener(listener);
         noJVMArgsProperty.addListener(listener);
         notCheckGameProperty.addListener(listener);
-        noCommonProperty.addListener(listener);
         showLogsProperty.addListener(listener);
         serverIpProperty.addListener(listener);
         fullscreenProperty.addListener(listener);
@@ -475,6 +495,7 @@ public final class VersionSetting {
         gameDirTypeProperty.addListener(listener);
         gameDirProperty.addListener(listener);
         launcherVisibilityProperty.addListener(listener);
+        defaultJavaPathProperty.addListener(listener);
     }
 
     public LaunchOptions toLaunchOptions(File gameDir) throws InterruptedException {
@@ -482,8 +503,8 @@ public final class VersionSetting {
         return new LaunchOptions.Builder()
                 .setGameDir(gameDir)
                 .setJava(javaVersion)
-                .setVersionName(Main.TITLE)
-                .setProfileName(Main.TITLE)
+                .setVersionName(Metadata.TITLE)
+                .setProfileName(Metadata.TITLE)
                 .setMinecraftArgs(getMinecraftArgs())
                 .setJavaArgs(getJavaArgs())
                 .setMaxMemory(getMaxMemory())
@@ -494,10 +515,10 @@ 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())
+                .setProxyHost(config().getProxyHost())
+                .setProxyPort(config().getProxyPort())
+                .setProxyUser(config().getProxyUser())
+                .setProxyPass(config().getProxyPass())
                 .setPrecalledCommand(getPreLaunchCommand())
                 .setNoGeneratedJVMArgs(isNoJVMArgs())
                 .create();
@@ -530,11 +551,11 @@ public final class VersionSetting {
             obj.addProperty("fullscreen", src.isFullscreen());
             obj.addProperty("noJVMArgs", src.isNoJVMArgs());
             obj.addProperty("notCheckGame", src.isNotCheckGame());
-            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;
         }
@@ -567,10 +588,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.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;
         }
@@ -580,7 +601,9 @@ public final class VersionSetting {
         }
 
         private int parseJsonPrimitive(JsonPrimitive primitive, int defaultValue) {
-            if (primitive.isNumber())
+            if (primitive == null)
+                return defaultValue;
+            else if (primitive.isNumber())
                 return primitive.getAsInt();
             else
                 return Lang.parseInt(primitive.getAsString(), defaultValue);

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

@@ -1,133 +0,0 @@
-/*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
- */
-package org.jackhuang.hmcl.ui;
-
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXProgressBar;
-import com.jfoenix.controls.JFXRadioButton;
-import javafx.beans.binding.Bindings;
-import javafx.event.EventHandler;
-import javafx.fxml.FXML;
-import javafx.scene.control.Label;
-import javafx.scene.control.ToggleGroup;
-import javafx.scene.effect.BlurType;
-import javafx.scene.effect.DropShadow;
-import javafx.scene.image.ImageView;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
-import javafx.scene.paint.Color;
-import org.jackhuang.hmcl.auth.Account;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
-import org.jackhuang.hmcl.auth.offline.OfflineAccount;
-import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
-import org.jackhuang.hmcl.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.task.Task;
-
-public final class AccountItem extends StackPane {
-
-    private final Account account;
-
-    @FXML
-    private Pane icon;
-    @FXML private VBox content;
-    @FXML private StackPane header;
-    @FXML private StackPane body;
-    @FXML private JFXButton btnDelete;
-    @FXML private JFXButton btnRefresh;
-    @FXML private Label lblUser;
-    @FXML private Label lblType;
-    @FXML private Label lblEmail;
-    @FXML private Label lblServer;
-    @FXML private Label lblCurrentAccount;
-    @FXML private JFXRadioButton chkSelected;
-    @FXML private JFXProgressBar pgsSkin;
-    @FXML private ImageView portraitView;
-    @FXML private HBox buttonPane;
-
-    public AccountItem(int i, Account account, ToggleGroup toggleGroup) {
-        this.account = account;
-
-        FXUtils.loadFXML(this, "/assets/fxml/account-item.fxml");
-
-        setEffect(new DropShadow(BlurType.GAUSSIAN, Color.rgb(0, 0, 0, 0.26), 5.0, 0.12, -0.5, 1.0));
-
-        chkSelected.setToggleGroup(toggleGroup);
-        btnDelete.setGraphic(SVG.delete(Theme.blackFillBinding(), 15, 15));
-        btnRefresh.setGraphic(SVG.refresh(Theme.blackFillBinding(), 15, 15));
-
-        // create image view
-        icon.translateYProperty().bind(Bindings.createDoubleBinding(() -> header.getBoundsInParent().getHeight() - icon.getHeight() / 2 - 16, header.boundsInParentProperty(), icon.heightProperty()));
-
-        chkSelected.getProperties().put("account", account);
-        setSelected(Settings.INSTANCE.getSelectedAccount() == account);
-
-        lblUser.setText(account.getCharacter());
-        lblType.setText(AccountsPage.accountType(account));
-        lblEmail.setText(account.getUsername());
-
-        if (account instanceof AuthlibInjectorAccount) {
-            Task.ofResult("serverName", () -> Accounts.getAuthlibInjectorServerName(((AuthlibInjectorAccount) account).getServerBaseURL()))
-                    .subscribe(Schedulers.javafx(), variables -> lblServer.setText(variables.get("serverName")));
-        }
-
-        if (account instanceof YggdrasilAccount) {
-            btnRefresh.setOnMouseClicked(e -> {
-                pgsSkin.setVisible(true);
-                AccountHelper.refreshSkinAsync((YggdrasilAccount) account)
-                        .subscribe(Schedulers.javafx(), this::loadSkin);
-            });
-            AccountHelper.loadSkinAsync((YggdrasilAccount) account)
-                    .subscribe(Schedulers.javafx(), this::loadSkin);
-        } else
-            loadSkin();
-
-        if (account instanceof OfflineAccount) { // Offline Account cannot be refreshed,
-            buttonPane.getChildren().remove(btnRefresh);
-        }
-    }
-
-    private void loadSkin() {
-        pgsSkin.setVisible(false);
-        portraitView.setViewport(AccountHelper.getViewport(4));
-        if (account instanceof YggdrasilAccount)
-            portraitView.setImage(AccountHelper.getSkin((YggdrasilAccount) account, 4));
-        else
-            portraitView.setImage(AccountHelper.getDefaultSkin(account, 4));
-        FXUtils.limitSize(portraitView, 32, 32);
-    }
-
-    public Account getAccount() {
-        return account;
-    }
-
-    public void setSelected(boolean selected) {
-        lblCurrentAccount.setVisible(selected);
-        chkSelected.setSelected(selected);
-    }
-
-    public void setOnDeleteButtonMouseClicked(EventHandler<? super MouseEvent> eventHandler) {
-        btnDelete.setOnMouseClicked(eventHandler);
-    }
-}

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

@@ -1,312 +0,0 @@
-/*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
- */
-package org.jackhuang.hmcl.ui;
-
-import com.jfoenix.concurrency.JFXUtilities;
-import com.jfoenix.controls.*;
-import javafx.application.Platform;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-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.control.ScrollPane;
-import javafx.scene.control.ToggleGroup;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.StackPane;
-import org.jackhuang.hmcl.Main;
-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.ui.wizard.DecoratorPage;
-
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.CountDownLatch;
-import java.util.stream.Collectors;
-
-public final class AccountsPage extends StackPane implements DecoratorPage {
-    private final StringProperty title = new SimpleStringProperty(this, "title", Main.i18n("account"));
-
-    @FXML
-    private ScrollPane scrollPane;
-    @FXML private JFXMasonryPane masonryPane;
-    @FXML private JFXDialog dialog;
-    @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;
-
-    {
-        FXUtils.loadFXML(this, "/assets/fxml/account.fxml");
-
-        getChildren().remove(dialog);
-        dialog.setDialogContainer(this);
-
-        FXUtils.smoothScrolling(scrollPane);
-
-        cboType.getItems().setAll(Main.i18n("account.methods.offline"), Main.i18n("account.methods.yggdrasil"), Main.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);
-        });
-        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(Main.i18n("input.email"), str -> !txtPassword.isVisible() || str.contains("@")));
-
-        FXUtils.onChangeAndOperate(Settings.INSTANCE.selectedAccountProperty(), account -> {
-            for (Node node : masonryPane.getChildren())
-                if (node instanceof AccountItem)
-                    ((AccountItem) node).setSelected(account == ((AccountItem) node).getAccount());
-        });
-
-        loadAccounts();
-        loadServers();
-
-        if (Settings.INSTANCE.getAccounts().isEmpty())
-            addNewAccount();
-    }
-
-    public void loadAccounts() {
-        List<Node> children = new LinkedList<>();
-        int i = 0;
-        ToggleGroup group = new ToggleGroup();
-        for (Account account : Settings.INSTANCE.getAccounts()) {
-            children.add(buildNode(++i, account, group));
-        }
-        group.selectedToggleProperty().addListener((a, b, newValue) -> {
-            if (newValue != null)
-                Settings.INSTANCE.setSelectedAccount((Account) newValue.getProperties().get("account"));
-        });
-        FXUtils.resetChildren(masonryPane, children);
-        Platform.runLater(() -> {
-            masonryPane.requestLayout();
-            scrollPane.requestLayout();
-        });
-    }
-
-    public void loadServers() {
-        Task.ofResult("list", () -> Settings.INSTANCE.getAuthlibInjectorServerURLs().parallelStream()
-                .map(serverURL -> new TwoLineListItem(Accounts.getAuthlibInjectorServerName(serverURL), serverURL))
-                .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);
-                }));
-    }
-
-    private Node buildNode(int i, Account account, ToggleGroup group) {
-        AccountItem item = new AccountItem(i, account, group);
-        item.setOnDeleteButtonMouseClicked(e -> {
-            Settings.INSTANCE.deleteAccount(account);
-            Platform.runLater(this::loadAccounts);
-        });
-        return item;
-    }
-
-    @FXML
-    private void addNewAccount() {
-        txtUsername.setText("");
-        txtPassword.setText("");
-        lblCreationWarning.setText("");
-        dialog.show();
-    }
-
-    @FXML
-    private void onAddInjecterServer() {
-        Controllers.navigate(Controllers.getServersPage());
-    }
-
-    @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"));
-            dialog.close();
-            loadAccounts();
-            progressBar.setVisible(false);
-        }, exception -> {
-            if (exception instanceof NoSelectedCharacterException) {
-                dialog.close();
-            } else {
-                lblCreationWarning.setText(accountException(exception));
-            }
-            progressBar.setVisible(false);
-        }).start();
-    }
-
-    @FXML
-    private void onCreationCancel() {
-        dialog.close();
-    }
-
-    public String getTitle() {
-        return title.get();
-    }
-
-    @Override
-    public StringProperty titleProperty() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title.set(title);
-    }
-
-    public static String accountException(Exception exception) {
-        if (exception instanceof InvalidCredentialsException) {
-            return Main.i18n("account.failed.invalid_credentials");
-        } else if (exception instanceof NoCharacterException) {
-            return Main.i18n("account.failed.no_charactor");
-        } else if (exception instanceof ServerDisconnectException) {
-            return Main.i18n("account.failed.connect_authentication_server");
-        } else if (exception instanceof InvalidTokenException) {
-            return Main.i18n("account.failed.invalid_token");
-        } else if (exception instanceof InvalidPasswordException) {
-            return Main.i18n("account.failed.invalid_password");
-        } else {
-            return exception.getClass() + ": " + exception.getLocalizedMessage();
-        }
-    }
-
-    public static String accountType(Account account) {
-        if (account instanceof OfflineAccount) return Main.i18n("account.methods.offline");
-        else if (account instanceof AuthlibInjectorAccount) return Main.i18n("account.methods.authlib_injector");
-        else if (account instanceof YggdrasilAccount) return Main.i18n("account.methods.yggdrasil");
-        else throw new Error(Main.i18n("account.methods.no_method") + ": " + account);
-    }
-
-    private static 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(Main.i18n("button.cancel"));
-            StackPane.setAlignment(cancel, Pos.BOTTOM_RIGHT);
-            cancel.setOnMouseClicked(e -> latch.countDown());
-
-            listBox.startCategory(Main.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(() -> Controllers.dialog(this));
-
-            try {
-                latch.await();
-
-                JFXUtilities.runInFX(Controllers::closeDialog);
-
-                if (selectedProfile == null)
-                    throw new NoSelectedCharacterException(account);
-
-                return selectedProfile;
-            } catch (InterruptedException ignore) {
-                throw new NoSelectedCharacterException(account);
-            }
-        }
-    }
-}

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

@@ -1,154 +0,0 @@
-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.Main;
-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.wizard.DecoratorPage;
-import org.jackhuang.hmcl.util.NetworkUtils;
-
-import java.util.Collection;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-public class AuthlibInjectorServersPage extends StackPane implements DecoratorPage {
-    private final StringProperty title = new SimpleStringProperty(this, "title", Main.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;
-
-    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);
-
-        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()
-                .map(serverURL -> new AuthlibInjectorServerItem(new AuthlibInjectorServerInfo(serverURL, Accounts.getAuthlibInjectorServerName(serverURL)), this::removeServer))
-                .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", () -> Objects.requireNonNull(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

@@ -17,24 +17,34 @@
  */
 package org.jackhuang.hmcl.ui;
 
-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.Main;
-import org.jackhuang.hmcl.setting.Settings;
+import org.jackhuang.hmcl.Launcher;
+import org.jackhuang.hmcl.Metadata;
+import org.jackhuang.hmcl.setting.Accounts;
+import org.jackhuang.hmcl.setting.Profiles;
 import org.jackhuang.hmcl.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.TaskExecutorDialogPane;
+import org.jackhuang.hmcl.ui.decorator.DecoratorController;
+import org.jackhuang.hmcl.ui.profile.ProfileList;
+import org.jackhuang.hmcl.ui.versions.GameList;
+import org.jackhuang.hmcl.ui.versions.VersionPage;
+import org.jackhuang.hmcl.util.FutureCallback;
 import org.jackhuang.hmcl.util.JavaVersion;
 
 import java.util.function.Consumer;
 
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+
 public final class Controllers {
 
     private static Scene scene;
@@ -42,9 +52,12 @@ public final class Controllers {
     private static MainPage mainPage = null;
     private static SettingsPage settingsPage = null;
     private static VersionPage versionPage = null;
+    private static GameList gameListPage = null;
+    private static AccountList accountListPage = null;
+    private static ProfileList profileListPage = null;
     private static AuthlibInjectorServersPage serversPage = null;
     private static LeftPaneController leftPaneController;
-    private static Decorator decorator;
+    private static DecoratorController decorator;
 
     public static Scene getScene() {
         return scene;
@@ -61,6 +74,33 @@ public final class Controllers {
         return settingsPage;
     }
 
+    // FXThread
+    public static GameList getGameListPage() {
+        if (gameListPage == null)
+            gameListPage = new GameList();
+        return gameListPage;
+    }
+
+    // FXThread
+    public static AccountList getAccountListPage() {
+        if (accountListPage == null) {
+            accountListPage = new AccountList();
+            accountListPage.selectedAccountProperty().bindBidirectional(Accounts.selectedAccountProperty());
+            accountListPage.accountsProperty().bindContent(Accounts.accountsProperty());
+        }
+        return accountListPage;
+    }
+
+    // FXThread
+    public static ProfileList getProfileListPage() {
+        if (profileListPage == null) {
+            profileListPage = new ProfileList();
+            profileListPage.selectedProfileProperty().bindBidirectional(Profiles.selectedProfileProperty());
+            profileListPage.profilesProperty().bindContent(Profiles.profilesProperty());
+        }
+        return profileListPage;
+    }
+
     // FXThread
     public static VersionPage getVersionPage() {
         if (versionPage == null)
@@ -76,7 +116,7 @@ public final class Controllers {
     }
 
     // FXThread
-    public static Decorator getDecorator() {
+    public static DecoratorController getDecorator() {
         return decorator;
     }
 
@@ -93,34 +133,24 @@ public final class Controllers {
     public static void initialize(Stage stage) {
         Controllers.stage = stage;
 
-        decorator = new Decorator(stage, getMainPage(), Main.TITLE, false, true);
-        decorator.showPage(null);
-        leftPaneController = new LeftPaneController(decorator.getLeftPane());
+        stage.setOnCloseRequest(e -> Launcher.stopApplication());
+
+        decorator = new DecoratorController(stage, getMainPage());
+        leftPaneController = new LeftPaneController();
+        decorator.getDecorator().drawerProperty().setAll(leftPaneController);
 
-        Settings.INSTANCE.onProfileLoading();
         Task.of(JavaVersion::initialize).start();
 
-        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);
+        scene = new Scene(decorator.getDecorator(), 800, 519);
+        scene.getStylesheets().setAll(config().getTheme().getStylesheets());
 
         stage.getIcons().add(new Image("/assets/img/icon.png"));
-        stage.setTitle(Main.TITLE);
+        stage.setTitle(Metadata.TITLE);
     }
 
-    public static Region getDialogContent() {
-        return decorator.getDialog().getContent();
-    }
-
-    public static JFXDialog dialog(Region content) {
-        // TODO: temp fix
-        decorator.showDialog(new Region());
-        return decorator.showDialog(content);
+    public static void dialog(Region content) {
+        if (decorator != null)
+            decorator.showDialog(content);
     }
 
     public static void dialog(String text) {
@@ -136,39 +166,38 @@ public final class Controllers {
     }
 
     public static void dialog(String text, String title, int type, Runnable onAccept) {
-        dialog(new MessageDialogPane(text, title, decorator.getDialog(), type, onAccept));
+        dialog(new MessageDialogPane(text, title, type, onAccept));
     }
 
     public static void confirmDialog(String text, String title, Runnable onAccept, Runnable onCancel) {
-        dialog(new MessageDialogPane(text, title, decorator.getDialog(), onAccept, onCancel));
+        dialog(new MessageDialogPane(text, title, onAccept, onCancel));
     }
 
-    public static void inputDialog(String text, Consumer<String> onResult) {
-        dialog(new InputDialogPane(text, decorator.getDialog(), onResult));
+    public static InputDialogPane inputDialog(String text, FutureCallback<String> onResult) {
+        InputDialogPane pane = new InputDialogPane(text, onResult);
+        dialog(pane);
+        return pane;
     }
 
-    public static void taskDialog(TaskExecutor executor, String title, String subtitle, Runnable onCancel) {
+    public static Region taskDialog(TaskExecutor executor, String title, String subtitle) {
+        return taskDialog(executor, title, subtitle, null);
+    }
+
+    public static Region taskDialog(TaskExecutor executor, String title, String subtitle, Consumer<Region> onCancel) {
         TaskExecutorDialogPane pane = new TaskExecutorDialogPane(onCancel);
         pane.setTitle(title);
         pane.setSubtitle(subtitle);
         pane.setExecutor(executor);
-        executor.start();
         dialog(pane);
-    }
-
-    public static void closeDialog() {
-        decorator.getDialog().close();
+        return pane;
     }
 
     public static void navigate(Node node) {
-        if (decorator.getNowPage() == node)
-            decorator.showPage(null);
-        else
-            decorator.showPage(node);
+        decorator.getNavigator().navigate(node);
     }
 
-    public static void showUpdate() {
-        getDecorator().showUpdate();
+    public static boolean isStopped() {
+        return decorator == null;
     }
 
     public static void shutdown() {
@@ -179,5 +208,8 @@ public final class Controllers {
         decorator = null;
         stage = null;
         scene = null;
+        gameListPage = null;
+        accountListPage = null;
+        profileListPage = null;
     }
 }

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

@@ -27,7 +27,10 @@ import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
-import org.jackhuang.hmcl.Main;
+import org.jackhuang.hmcl.Metadata;
+import org.jackhuang.hmcl.upgrade.UpdateChecker;
+
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 /**
  * @author huangyuhui
@@ -36,10 +39,10 @@ public class CrashWindow extends Stage {
 
     public CrashWindow(String text) {
         Label lblCrash = new Label();
-        if (Main.UPDATE_CHECKER.isOutOfDate())
-            lblCrash.setText(Main.i18n("launcher.crash_out_dated"));
+        if (UpdateChecker.isOutdated())
+            lblCrash.setText(i18n("launcher.crash_out_dated"));
         else
-            lblCrash.setText(Main.i18n("launcher.crash"));
+            lblCrash.setText(i18n("launcher.crash"));
         lblCrash.setWrapText(true);
 
         TextArea textArea = new TextArea();
@@ -47,8 +50,8 @@ public class CrashWindow extends Stage {
         textArea.setEditable(false);
 
         Button btnContact = new Button();
-        btnContact.setText(Main.i18n("launcher.contact"));
-        btnContact.setOnMouseClicked(event -> FXUtils.openLink(Main.CONTACT));
+        btnContact.setText(i18n("launcher.contact"));
+        btnContact.setOnMouseClicked(event -> FXUtils.openLink(Metadata.CONTACT_URL));
         HBox box = new HBox();
         box.setStyle("-fx-padding: 8px;");
         box.getChildren().add(btnContact);
@@ -65,7 +68,7 @@ public class CrashWindow extends Stage {
         Scene scene = new Scene(pane, 800, 480);
         setScene(scene);
         getIcons().add(new Image("/assets/img/icon.png"));
-        setTitle(Main.i18n("message.error"));
+        setTitle(i18n("message.error"));
 
         setOnCloseRequest(e -> System.exit(1));
     }

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

@@ -1,641 +0,0 @@
-/*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
- */
-package org.jackhuang.hmcl.ui;
-
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXDialog;
-import com.jfoenix.controls.JFXDrawer;
-import com.jfoenix.controls.JFXHamburger;
-import com.jfoenix.svg.SVGGlyph;
-import javafx.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.Main;
-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.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 = new SimpleObjectProperty<>(Main::stopApplication);
-    private final BooleanProperty customMaximize = new SimpleBooleanProperty(false);
-
-    private final Stage primaryStage;
-    private final Node mainPage;
-    private final boolean max, min;
-    private final WizardController wizardController = new WizardController(this);
-    private final Queue<Object> cancelQueue = new ConcurrentLinkedQueue<>();
-
-    private double xOffset, yOffset, newX, newY, initX, initY;
-    private boolean allowMove, isDragging, dialogShown, maximized;
-    private BoundingBox originalBox, maximizedBox;
-    private final TransitionHandler animationHandler;
-
-    @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 JFXDialog dialog;
-    @FXML
-    private JFXButton btnMin;
-    @FXML
-    private JFXButton btnMax;
-    @FXML
-    private JFXButton btnClose;
-    @FXML
-    private HBox updatePane;
-    @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");
-
-        updatePane.setCursor(Cursor.HAND);
-        updatePane.setOnMouseClicked(event -> Main.UPDATE_CHECKER.checkOutdate());
-
-        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.setDialogContainer(drawerWrapper);
-        dialog.setOnDialogClosed(e -> dialogShown = false);
-        dialog.setOnDialogOpened(e -> dialogShown = true);
-
-        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() {
-        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))));
-    }
-
-    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);
-        }
-    }
-
-    public void showUpdate() {
-        updatePane.setVisible(true);
-    }
-
-    private void showCloseNavButton() {
-        navLeft.getChildren().add(closeNavButton);
-    }
-
-    private void hideCloseNavButton() {
-        navLeft.getChildren().remove(closeNavButton);
-    }
-
-    private void setContent(Node content, AnimationProducer animation) {
-        animationHandler.setContent(content, animation);
-
-        if (content instanceof Region) {
-            ((Region) content).setMinSize(0, 0);
-            FXUtils.setOverflowHidden((Region) content, true);
-        }
-
-        if (content instanceof Refreshable)
-            refreshNavButton.setVisible(true);
-
-        if (content != mainPage)
-            backNavButton.setVisible(true);
-
-        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;
-
-    public Node getNowPage() {
-        return nowPage;
-    }
-
-    public void showPage(Node content) {
-        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 JFXDialog showDialog(Region content) {
-        dialog.setContent(content);
-        if (!dialogShown)
-            dialog.show();
-        return dialog;
-    }
-
-    public void startWizard(WizardProvider wizardProvider) {
-        startWizard(wizardProvider, null);
-    }
-
-    public void startWizard(WizardProvider wizardProvider, String category) {
-        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());
-    }
-
-    @FXML
-    private void onRefresh() {
-        ((Refreshable) contentPlaceHolder.getChildren().get(0)).refresh();
-    }
-
-    @FXML
-    private void onCloseNav() {
-        wizardController.onCancel();
-        showPage(null);
-    }
-
-    @FXML
-    private void onBack() {
-        if (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 JFXDialog getDialog() {
-        return dialog;
-    }
-
-    public AdvancedListBox getLeftPane() {
-        return leftPane;
-    }
-}

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

@@ -22,6 +22,7 @@ import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.AuthInfo;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
 import org.jackhuang.hmcl.task.SilentException;
+import org.jackhuang.hmcl.ui.account.AccountLoginPane;
 
 import java.util.Optional;
 import java.util.concurrent.CountDownLatch;
@@ -37,12 +38,8 @@ public final class DialogController {
                 AccountLoginPane pane = new AccountLoginPane(account, it -> {
                         res.set(it);
                         latch.countDown();
-                        Controllers.closeDialog();
-                }, () -> {
-                        latch.countDown();
-                        Controllers.closeDialog();
-                });
-                pane.setDialog(Controllers.dialog(pane));
+                }, latch::countDown);
+                Controllers.dialog(pane);
             });
             latch.await();
             return Optional.ofNullable(res.get()).orElseThrow(SilentException::new);

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

@@ -17,12 +17,14 @@
  */
 package org.jackhuang.hmcl.ui;
 
-import com.jfoenix.adapters.ReflectionHelper;
+import com.jfoenix.concurrency.JFXUtilities;
 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;
@@ -30,34 +32,48 @@ import javafx.beans.value.WeakChangeListener;
 import javafx.event.EventHandler;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Node;
-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.control.*;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.input.ScrollEvent;
 import javafx.scene.layout.Region;
 import javafx.scene.shape.Rectangle;
+import javafx.util.Callback;
 import javafx.util.Duration;
-import org.jackhuang.hmcl.Main;
+import javafx.util.StringConverter;
 import org.jackhuang.hmcl.util.*;
+import org.jackhuang.hmcl.util.i18n.I18n;
 
 import java.io.File;
 import java.io.IOException;
+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.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
 import java.util.logging.Level;
 
-import static org.jackhuang.hmcl.util.ReflectionHelper.call;
-import static org.jackhuang.hmcl.util.ReflectionHelper.construct;
+import static org.jackhuang.hmcl.util.Lang.thread;
+import static org.jackhuang.hmcl.util.Lang.tryCast;
 
 public final class FXUtils {
     private FXUtils() {
     }
 
+    public static void checkFxUserThread() {
+        if (!Platform.isFxApplicationThread()) {
+            throw new IllegalStateException("Not on FX application thread; currentThread = "
+                    + Thread.currentThread().getName());
+        }
+    }
+
+    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));
     }
@@ -114,7 +130,7 @@ public final class FXUtils {
     }
 
     public static void removeListener(Node node, String key) {
-        Lang.cast(node.getProperties().get(key), ListenerPair.class)
+        tryCast(node.getProperties().get(key), ListenerPair.class)
                 .ifPresent(info -> {
                     info.unbind();
                     node.getProperties().remove(key);
@@ -184,39 +200,40 @@ public final class FXUtils {
     }
 
     public static void loadFXML(Node node, String absolutePath) {
-        FXMLLoader loader = new FXMLLoader(node.getClass().getResource(absolutePath), Main.RESOURCE_BUNDLE);
+        FXMLLoader loader = new FXMLLoader(node.getClass().getResource(absolutePath), I18n.getResourceBundle());
         loader.setRoot(node);
         loader.setController(node);
         Lang.invoke((ExceptionalSupplier<Object, IOException>) loader::load);
     }
 
-    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 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) {
-        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) {
+        JFXUtilities.runInFX(() -> {
             try {
-                // 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);
+                // Java 8
+                Class<?> behaviorClass = Class.forName("javafx.scene.control.Tooltip$TooltipBehavior");
+                Constructor<?> behaviorConstructor = behaviorClass.getDeclaredConstructor(Duration.class, Duration.class, Duration.class, boolean.class);
+                behaviorConstructor.setAccessible(true);
+                Object behavior = behaviorConstructor.newInstance(new Duration(openDelay), new Duration(visibleDelay), new Duration(closeDelay), false);
+                Method installMethod = behaviorClass.getDeclaredMethod("install", Node.class, Tooltip.class);
+                installMethod.setAccessible(true);
+                installMethod.invoke(behavior, node, tooltip);
+            } catch (ReflectiveOperationException e) {
+                try {
+                    // Java 9
+                    Tooltip.class.getMethod("setShowDelay", Duration.class).invoke(tooltip, new Duration(openDelay));
+                    Tooltip.class.getMethod("setShowDuration", Duration.class).invoke(tooltip, new Duration(visibleDelay));
+                    Tooltip.class.getMethod("setHideDelay", Duration.class).invoke(tooltip, new Duration(closeDelay));
+                } catch (ReflectiveOperationException e2) {
+                    e.addSuppressed(e2);
+                    Logging.LOG.log(Level.SEVERE, "Cannot install tooltip", e);
+                }
+                Tooltip.install(node, tooltip);
             }
-            Tooltip.install(node, tooltip);
-        }
+        });
     }
 
     public static void openFolder(File file) {
@@ -236,11 +253,15 @@ public final class FXUtils {
                 }
                 break;
             default:
-                try {
-                    java.awt.Desktop.getDesktop().open(file);
-                } catch (Throwable e) {
-                    Logging.LOG.log(Level.SEVERE, "Unable to open " + path + " by java.awt.Desktop.getDesktop()::open", e);
-                }
+                thread(() -> {
+                    if (java.awt.Desktop.isDesktopSupported()) {
+                        try {
+                            java.awt.Desktop.getDesktop().open(file);
+                        } catch (Throwable e) {
+                            Logging.LOG.log(Level.SEVERE, "Unable to open " + path + " by java.awt.Desktop.getDesktop()::open", e);
+                        }
+                    }
+                });
         }
     }
 
@@ -252,17 +273,21 @@ public final class FXUtils {
     public static void openLink(String link) {
         if (link == null)
             return;
-        try {
-            java.awt.Desktop.getDesktop().browse(new URI(link));
-        } catch (Throwable e) {
-            if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX)
+        thread(() -> {
+            if (java.awt.Desktop.isDesktopSupported()) {
                 try {
-                    Runtime.getRuntime().exec(new String[] { "/usr/bin/open", link });
-                } catch (IOException ex) {
-                    Logging.LOG.log(Level.WARNING, "Unable to open link: " + link, ex);
+                    java.awt.Desktop.getDesktop().browse(new URI(link));
+                } catch (Throwable e) {
+                    if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX)
+                        try {
+                            Runtime.getRuntime().exec(new String[]{"/usr/bin/open", link});
+                        } catch (IOException ex) {
+                            Logging.LOG.log(Level.WARNING, "Unable to open link: " + link, ex);
+                        }
+                    Logging.LOG.log(Level.WARNING, "Failed to open link: " + link, e);
                 }
-            Logging.LOG.log(Level.WARNING, "Failed to open link: " + link, e);
-        }
+            }
+        });
     }
 
     public static void bindInt(JFXTextField textField, Property<Number> property) {
@@ -303,8 +328,10 @@ 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 SelectionModelSelectedItemProperty#selectedItemPropertyFor(ComboBox)}
      */
     @SuppressWarnings("unchecked")
+    @Deprecated
     public static void bindEnum(JFXComboBox<?> comboBox, Property<? extends Enum> property) {
         unbindEnum(comboBox);
         ChangeListener<Number> listener = (a, b, newValue) ->
@@ -321,8 +348,9 @@ public final class FXUtils {
      * @see #bindEnum(JFXComboBox, Property)
      */
     @SuppressWarnings("unchecked")
+    @Deprecated
     public static void unbindEnum(JFXComboBox<?> comboBox) {
-        ChangeListener listener = Lang.get(comboBox.getProperties(), "FXUtils.bindEnum.listener", ChangeListener.class).orElse(null);
+        ChangeListener listener = tryCast(comboBox.getProperties().get("FXUtils.bindEnum.listener"), ChangeListener.class).orElse(null);
         if (listener == null) return;
         comboBox.getSelectionModel().selectedIndexProperty().removeListener(listener);
     }
@@ -368,7 +396,57 @@ public final class FXUtils {
         });
     }
 
-    public static final Image DEFAULT_ICON = new Image("/assets/img/icon.png");
+    public static <T> T runInUIThread(Supplier<T> supplier) {
+        if (javafx.application.Platform.isFxApplicationThread()) {
+            return supplier.get();
+        } else {
+            CountDownLatch doneLatch = new CountDownLatch(1);
+            AtomicReference<T> reference = new AtomicReference<>();
+            Platform.runLater(() -> {
+                try {
+                    reference.set(supplier.get());
+                } finally {
+                    doneLatch.countDown();
+                }
+
+            });
+
+            try {
+                doneLatch.await();
+            } catch (InterruptedException var3) {
+                Thread.currentThread().interrupt();
+            }
+
+            return reference.get();
+        }
+    }
+
+    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) {
+                    setGraphic(graphicBuilder.apply(item));
+                }
+            }
+        };
+    }
 
     public static final Interpolator SINE = new Interpolator() {
         @Override

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

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

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

@@ -1,96 +0,0 @@
-/*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
- */
-package org.jackhuang.hmcl.ui;
-
-import javafx.fxml.FXML;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.download.MaintainTask;
-import org.jackhuang.hmcl.download.game.VersionJsonSaveTask;
-import org.jackhuang.hmcl.game.GameVersion;
-import org.jackhuang.hmcl.game.Library;
-import org.jackhuang.hmcl.game.Version;
-import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.ui.download.InstallerWizardProvider;
-
-import 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("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

@@ -21,10 +21,11 @@ import com.jfoenix.effects.JFXDepthManager;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.layout.BorderPane;
-import org.jackhuang.hmcl.Main;
 
 import java.util.function.Consumer;
 
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
 /**
  * @author huangyuhui
  */
@@ -44,7 +45,7 @@ public class InstallerItem extends BorderPane {
         setStyle("-fx-background-radius: 2; -fx-background-color: white; -fx-padding: 8;");
         JFXDepthManager.setDepth(this, 1);
         lblInstallerArtifact.setText(artifact);
-        lblInstallerVersion.setText(Main.i18n("archive.version") + ": " + version);
+        lblInstallerVersion.setText(i18n("archive.version") + ": " + version);
     }
 
     @FXML

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

@@ -18,124 +18,94 @@
 package org.jackhuang.hmcl.ui;
 
 import com.jfoenix.concurrency.JFXUtilities;
-import com.jfoenix.controls.JFXButton;
 import javafx.application.Platform;
-import javafx.scene.Node;
-import javafx.scene.image.Image;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.VBox;
-import javafx.scene.text.Text;
-import org.jackhuang.hmcl.Main;
-import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
+import javafx.beans.binding.When;
+import javafx.scene.layout.Region;
+import javafx.scene.paint.Color;
 import org.jackhuang.hmcl.event.EventBus;
-import org.jackhuang.hmcl.event.ProfileChangedEvent;
-import org.jackhuang.hmcl.event.ProfileLoadingEvent;
 import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
-import org.jackhuang.hmcl.game.AccountHelper;
 import org.jackhuang.hmcl.game.HMCLGameRepository;
 import org.jackhuang.hmcl.game.ModpackHelper;
 import org.jackhuang.hmcl.mod.Modpack;
 import org.jackhuang.hmcl.mod.UnsupportedModpackException;
-import org.jackhuang.hmcl.setting.Profile;
+import org.jackhuang.hmcl.setting.Accounts;
 import org.jackhuang.hmcl.setting.Profiles;
-import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.task.TaskExecutor;
+import org.jackhuang.hmcl.ui.account.AccountAdvancedListItem;
+import org.jackhuang.hmcl.ui.account.AddAccountPane;
 import org.jackhuang.hmcl.ui.construct.AdvancedListBox;
-import org.jackhuang.hmcl.ui.construct.ClassTitle;
+import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 import org.jackhuang.hmcl.ui.construct.IconedItem;
-import org.jackhuang.hmcl.ui.construct.RipplerContainer;
-import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.ui.profile.ProfileAdvancedListItem;
+import org.jackhuang.hmcl.ui.versions.GameAdvancedListItem;
+import org.jackhuang.hmcl.upgrade.UpdateChecker;
 
 import java.io.File;
-import java.util.LinkedList;
-import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
 
-public final class LeftPaneController {
-    private final AdvancedListBox leftPane;
-    private final VBox profilePane = new VBox();
-    private final VersionListItem accountItem = new VersionListItem("", "");
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
-    public LeftPaneController(AdvancedListBox leftPane) {
-        this.leftPane = leftPane;
+public final class LeftPaneController extends AdvancedListBox {
 
-        leftPane.startCategory(Main.i18n("account").toUpperCase())
-                .add(Lang.apply(new RipplerContainer(accountItem), rippler -> {
-                    rippler.setOnMouseClicked(e -> Controllers.navigate(new AccountsPage()));
-                    accountItem.setOnSettingsButtonClicked(() -> Controllers.navigate(new AccountsPage()));
-                }))
-                .startCategory(Main.i18n("launcher").toUpperCase())
-                .add(Lang.apply(new IconedItem(SVG.gear(Theme.blackFillBinding(), 20, 20), Main.i18n("settings.launcher")), iconedItem -> {
-                    iconedItem.prefWidthProperty().bind(leftPane.widthProperty());
-                    iconedItem.setOnMouseClicked(e -> Controllers.navigate(Controllers.getSettingsPage()));
-                }))
-                .add(new ClassTitle(Lang.apply(new BorderPane(), borderPane -> {
-                    borderPane.setLeft(Lang.apply(new VBox(), vBox -> vBox.getChildren().setAll(new Text(Main.i18n("profile.title").toUpperCase()))));
-                    JFXButton addProfileButton = new JFXButton();
-                    addProfileButton.setGraphic(SVG.plus(Theme.blackFillBinding(), 10, 10));
-                    addProfileButton.getStyleClass().add("toggle-icon-tiny");
-                    addProfileButton.setOnMouseClicked(e ->
-                            Controllers.getDecorator().showPage(new ProfilePage(null)));
-                    borderPane.setRight(addProfileButton);
-                })))
-                .add(profilePane);
+    public LeftPaneController() {
 
-        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);
+        AccountAdvancedListItem accountListItem = new AccountAdvancedListItem();
+        accountListItem.setOnAction(e -> Controllers.navigate(Controllers.getAccountListPage()));
+        accountListItem.accountProperty().bind(Accounts.selectedAccountProperty());
+        GameAdvancedListItem gameListItem = new GameAdvancedListItem();
+        gameListItem.setOnAction(e -> Controllers.navigate(Controllers.getGameListPage()));
+        ProfileAdvancedListItem profileListItem = new ProfileAdvancedListItem();
+        profileListItem.setOnAction(e -> Controllers.navigate(Controllers.getProfileListPage()));
+        profileListItem.profileProperty().bind(Profiles.selectedProfileProperty());
 
-        FXUtils.onChangeAndOperate(Settings.INSTANCE.selectedAccountProperty(), it -> {
-            if (it == null) {
-                accountItem.setVersionName(Main.i18n("account.missing"));
-                accountItem.setGameVersion(Main.i18n("message.unknown"));
-            } else {
-                accountItem.setVersionName(it.getCharacter());
-                accountItem.setGameVersion(AccountsPage.accountType(it));
-            }
+        IconedItem launcherSettingsItem = new IconedItem(SVG.gear(Theme.blackFillBinding(), 20, 20), "iconed-item");
 
-            if (it instanceof YggdrasilAccount) {
-                Image image = AccountHelper.getSkin((YggdrasilAccount) it, 4);
-                accountItem.setImage(image, AccountHelper.getViewport(4));
-            } else
-                accountItem.setImage(AccountHelper.getDefaultSkin(it, 4), AccountHelper.getViewport(4));
-        });
+        launcherSettingsItem.getLabel().textProperty().bind(
+                new When(UpdateChecker.outdatedProperty())
+                        .then(i18n("update.found"))
+                        .otherwise(i18n("settings.launcher")));
+
+        launcherSettingsItem.getLabel().textFillProperty().bind(
+                new When(UpdateChecker.outdatedProperty())
+                        .then(Color.RED)
+                        .otherwise(Color.BLACK));
+
+        launcherSettingsItem.setOnMouseClicked(e -> Controllers.navigate(Controllers.getSettingsPage()));
+
+        this
+                .startCategory(i18n("account").toUpperCase())
+                .add(accountListItem)
+                .startCategory(i18n("version").toUpperCase())
+                .add(gameListItem)
+                .startCategory(i18n("profile.title").toUpperCase())
+                .add(profileListItem)
+                .startCategory(i18n("launcher").toUpperCase())
+                .add(launcherSettingsItem);
+
+        EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).register(event -> onRefreshedVersions((HMCLGameRepository) event.getSource()));
+        if (Profiles.selectedProfileProperty().get().getRepository().isLoaded())
+            onRefreshedVersions(Profiles.selectedProfileProperty().get().getRepository());
     }
 
-    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 ? Main.i18n("profile.selected") : "");
-                }
-            }
-        });
+    // ==== Accounts ====
+    public void checkAccount() {
+        if (Accounts.getAccounts().isEmpty())
+            Platform.runLater(this::addNewAccount);
     }
 
-    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(() -> 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 void addNewAccount() {
+        Controllers.dialog(new AddAccountPane());
     }
+    // ====
 
     private boolean checkedModpack = false;
+    private static boolean showNewAccount = true;
 
-    private void onRefreshedVersions(RefreshedVersionsEvent event) {
+    private void onRefreshedVersions(HMCLGameRepository repository) {
         JFXUtilities.runInFX(() -> {
-            boolean flag = true;
-            HMCLGameRepository repository = (HMCLGameRepository) event.getSource();
             if (!checkedModpack) {
                 checkedModpack = true;
 
@@ -143,27 +113,26 @@ public final class LeftPaneController {
                     File modpackFile = new File("modpack.zip").getAbsoluteFile();
                     if (modpackFile.exists()) {
                         try {
+                            AtomicReference<Region> region = new AtomicReference<>();
                             Modpack modpack = ModpackHelper.readModpackManifest(modpackFile);
-                            Controllers.taskDialog(ModpackHelper.getInstallTask(repository.getProfile(), modpackFile, modpack.getName(), modpack)
-                                            .with(Task.of(Schedulers.javafx(), () -> {
-                                                Controllers.closeDialog();
-                                                checkAccount();
-                                            })).executor(),
-                                    Main.i18n("modpack.installing"), "", null);
-                            flag = false;
+                            TaskExecutor executor = ModpackHelper.getInstallTask(repository.getProfile(), modpackFile, modpack.getName(), modpack)
+                                    .with(Task.of(Schedulers.javafx(), () -> {
+                                        region.get().fireEvent(new DialogCloseEvent());
+                                        checkAccount();
+                                    })).executor();
+                            region.set(Controllers.taskDialog(executor, i18n("modpack.installing"), ""));
+                            executor.start();
+                            showNewAccount = false;
                         } catch (UnsupportedModpackException ignore) {
                         }
                     }
                 }
             }
 
-            if (flag)
+            if (showNewAccount) {
+                showNewAccount = false;
                 checkAccount();
+            }
         });
     }
-
-    private void checkAccount() {
-        if (Settings.INSTANCE.getAccounts().isEmpty())
-            Controllers.navigate(new AccountsPage());
-    }
 }

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

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

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

@@ -0,0 +1,90 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
+package org.jackhuang.hmcl.ui;
+
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXScrollPane;
+import com.jfoenix.controls.JFXSpinner;
+import javafx.beans.binding.Bindings;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.SkinBase;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+import org.jackhuang.hmcl.setting.Theme;
+
+public class ListPageSkin extends SkinBase<ListPage> {
+
+    public ListPageSkin(ListPage<?> skinnable) {
+        super(skinnable);
+
+        StackPane rootPane = new StackPane();
+
+        JFXSpinner spinner = new JFXSpinner();
+        spinner.setRadius(16);
+        spinner.getStyleClass().setAll("materialDesign-purple", "first-spinner");
+
+        StackPane contentPane = new StackPane();
+        {
+            ScrollPane scrollPane = new ScrollPane();
+            {
+                scrollPane.setFitToWidth(true);
+
+                VBox accountList = new VBox();
+                accountList.maxWidthProperty().bind(scrollPane.widthProperty());
+                accountList.setSpacing(10);
+                accountList.setStyle("-fx-padding: 10 10 10 10;");
+
+                Bindings.bindContent(accountList.getChildren(), skinnable.itemsProperty());
+
+                scrollPane.setContent(accountList);
+                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().setAll("jfx-button-raised-round");
+                btnAdd.setButtonType(JFXButton.ButtonType.RAISED);
+                btnAdd.setGraphic(SVG.plus(Theme.whiteFillBinding(), -1, -1));
+                btnAdd.setOnMouseClicked(e -> skinnable.add());
+
+                vBox.getChildren().setAll(btnAdd);
+            }
+
+            contentPane.getChildren().setAll(scrollPane, vBox);
+        }
+
+        rootPane.getChildren().setAll(contentPane);
+
+        skinnable.loadingProperty().addListener((a, b, newValue) -> {
+            if (newValue) rootPane.getChildren().setAll(spinner);
+            else rootPane.getChildren().setAll(contentPane);
+        });
+
+        getChildren().setAll(rootPane);
+    }
+}

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

@@ -30,7 +30,6 @@ import javafx.scene.layout.StackPane;
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebView;
 import javafx.stage.Stage;
-import org.jackhuang.hmcl.Main;
 import org.jackhuang.hmcl.event.Event;
 import org.jackhuang.hmcl.event.EventManager;
 import org.jackhuang.hmcl.game.LauncherHelper;
@@ -45,6 +44,9 @@ 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
@@ -62,8 +64,8 @@ public final class LogWindow extends Stage {
 
     public LogWindow() {
         setScene(new Scene(impl, 800, 480));
-        getScene().getStylesheets().addAll(Settings.INSTANCE.getTheme().getStylesheets());
-        setTitle(Main.i18n("logwindow.title"));
+        getScene().getStylesheets().addAll(config().getTheme().getStylesheets());
+        setTitle(i18n("logwindow.title"));
         getIcons().add(new Image("/assets/img/icon.png"));
     }
 
@@ -174,12 +176,12 @@ public final class LogWindow extends Stage {
 
             engine = webView.getEngine();
             engine.loadContent(Lang.ignoringException(() -> IOUtils.readFullyAsString(getClass().getResourceAsStream("/assets/log-window-content.html")))
-                    .replace("${FONT}", Settings.INSTANCE.getFont().getSize() + "px \"" + Settings.INSTANCE.getFont().getFamily() + "\""));
+                    .replace("${FONT}", Settings.instance().getFont().getSize() + "px \"" + Settings.instance().getFont().getFamily() + "\""));
             engine.getLoadWorker().stateProperty().addListener((a, b, newValue) -> {
                 if (newValue == Worker.State.SUCCEEDED) {
                     document = engine.getDocument();
                     body = document.getElementsByTagName("body").item(0);
-                    engine.executeScript("limitedLogs=" + Settings.INSTANCE.getLogLines());
+                    engine.executeScript("limitedLogs=" + config().getLogLines());
                     latch.countDown();
                     onDone.fireEvent(new Event(LogWindow.this));
                 }
@@ -187,14 +189,14 @@ public final class LogWindow extends Stage {
 
             boolean flag = false;
             for (String i : cboLines.getItems())
-                if (Integer.toString(Settings.INSTANCE.getLogLines()).equals(i)) {
+                if (Integer.toString(config().getLogLines()).equals(i)) {
                     cboLines.getSelectionModel().select(i);
                     flag = true;
                 }
 
             cboLines.getSelectionModel().selectedItemProperty().addListener((a, b, newValue) -> {
-                Settings.INSTANCE.setLogLines(newValue == null ? 100 : Integer.parseInt(newValue));
-                engine.executeScript("limitedLogs=" + Settings.INSTANCE.getLogLines());
+                config().setLogLines(newValue == null ? 100 : Integer.parseInt(newValue));
+                engine.executeScript("limitedLogs=" + config().getLogLines());
             });
 
             if (!flag)

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

@@ -17,197 +17,121 @@
  */
 package org.jackhuang.hmcl.ui;
 
+import com.jfoenix.concurrency.JFXUtilities;
 import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXListView;
-import com.jfoenix.controls.JFXMasonryPane;
 import com.jfoenix.controls.JFXPopup;
-import javafx.application.Platform;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
+import javafx.beans.property.ReadOnlyStringProperty;
+import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.fxml.FXML;
+import javafx.geometry.Pos;
 import javafx.scene.Node;
-import javafx.scene.image.Image;
-import javafx.scene.input.MouseButton;
+import javafx.scene.control.Label;
 import javafx.scene.layout.StackPane;
-import javafx.stage.FileChooser;
-import org.jackhuang.hmcl.Main;
+import javafx.scene.layout.VBox;
+import javafx.scene.shape.Rectangle;
 import org.jackhuang.hmcl.event.EventBus;
-import org.jackhuang.hmcl.event.ProfileChangedEvent;
-import org.jackhuang.hmcl.event.ProfileLoadingEvent;
 import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
-import org.jackhuang.hmcl.game.*;
-import org.jackhuang.hmcl.mod.MismatchedModpackTypeException;
-import org.jackhuang.hmcl.mod.UnsupportedModpackException;
+import org.jackhuang.hmcl.event.RefreshingVersionsEvent;
+import org.jackhuang.hmcl.game.HMCLGameRepository;
+import org.jackhuang.hmcl.setting.ConfigHolder;
 import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.setting.Settings;
-import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.task.TaskExecutor;
-import org.jackhuang.hmcl.ui.construct.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.OperatingSystem;
-import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.setting.Profiles;
+import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.ui.construct.IconedMenuItem;
+import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
+import org.jackhuang.hmcl.ui.versions.Versions;
+import org.jackhuang.hmcl.util.VersionNumber;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.LinkedList;
 import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class MainPage extends StackPane implements DecoratorPage {
+    private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper(this, "title", i18n("main_page"));
 
-    private final StringProperty title = new SimpleStringProperty(this, "title", Main.i18n("main_page"));
+    private final VBox menu = new VBox();
+    private final JFXPopup popup = new JFXPopup(menu);
+
+    @FXML
+    private StackPane main;
+    @FXML
+    private JFXButton btnLaunch;
+    @FXML
+    private JFXButton btnMenu;
+    @FXML
+    private Label lblCurrentGame;
 
     private Profile profile;
-    private String rightClickedVersion;
-
-    @FXML
-    private JFXButton btnRefresh;
-
-    @FXML
-    private JFXButton btnAdd;
-
-    @FXML
-    private JFXMasonryPane masonryPane;
-
-    @FXML
-    private JFXListView versionList;
-
-    private final JFXPopup versionPopup;
-
     {
         FXUtils.loadFXML(this, "/assets/fxml/main.fxml");
 
-        EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).register(() -> Platform.runLater(this::loadVersions));
-
-        versionPopup = new JFXPopup(versionList);
-        getChildren().remove(versionList);
-
-        btnAdd.setOnMouseClicked(e -> Controllers.getDecorator().startWizard(new DownloadWizardProvider(), Main.i18n("install")));
-        FXUtils.installTooltip(btnAdd, Main.i18n("install"));
-        btnRefresh.setOnMouseClicked(e -> Settings.INSTANCE.getSelectedProfile().getRepository().refreshVersionsAsync().start());
-        FXUtils.installTooltip(btnRefresh, Main.i18n("button.refresh"));
-    }
-
-    private Node buildNode(Profile profile, String version, String game) {
-        VersionItem item = new VersionItem();
-        item.setUpdate(profile.getRepository().isModpack(version));
-        item.setGameVersion(game);
-        item.setVersionName(version);
-
-        StringBuilder libraries = new StringBuilder();
-        for (Library library : profile.getRepository().getVersion(version).getLibraries()) {
-            if (library.getGroupId().equalsIgnoreCase("net.minecraftforge") && library.getArtifactId().equalsIgnoreCase("forge")) {
-                libraries.append(Main.i18n("install.installer.forge")).append(": ").append(StringUtils.removeSuffix(StringUtils.removePrefix(library.getVersion().replaceAll("(?i)forge", "").replace(game, "").trim(), "-"), "-")).append("\n");
-            }
-            if (library.getGroupId().equalsIgnoreCase("com.mumfrey") && library.getArtifactId().equalsIgnoreCase("liteloader")) {
-                libraries.append(Main.i18n("install.installer.liteloader")).append(": ").append(StringUtils.removeSuffix(StringUtils.removePrefix(library.getVersion().replaceAll("(?i)liteloader", "").replace(game, "").trim(), "-"), "-")).append("\n");
-            }
-            if (library.getGroupId().equalsIgnoreCase("net.optifine") && library.getArtifactId().equalsIgnoreCase("optifine")) {
-                libraries.append(Main.i18n("install.installer.optifine")).append(": ").append(StringUtils.removeSuffix(StringUtils.removePrefix(library.getVersion().replaceAll("(?i)optifine", "").replace(game, "").trim(), "-"), "-")).append("\n");
-            }
-        }
-
-        item.setLibraries(libraries.toString());
-        item.setOnLaunchButtonClicked(e -> {
-            if (Settings.INSTANCE.getSelectedAccount() == null)
-                Controllers.dialog(Main.i18n("login.empty_username"));
+        FXUtils.onChangeAndOperate(ConfigHolder.config().enableMainPageGameListProperty(), newValue -> {
+            if (newValue)
+                getChildren().setAll(new GameVersionListPage());
             else
-                LauncherHelper.INSTANCE.launch(version, null);
+                getChildren().setAll(main);
         });
-        item.setOnScriptButtonClicked(e -> {
-            if (Settings.INSTANCE.getSelectedAccount() == null)
-                Controllers.dialog(Main.i18n("login.empty_username"));
-            else {
-                FileChooser chooser = new FileChooser();
-                chooser.setInitialDirectory(profile.getRepository().getRunDirectory(version));
-                chooser.setTitle(Main.i18n("version.launch_script.save"));
-                chooser.getExtensionFilters().add(OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS
-                        ? new FileChooser.ExtensionFilter(Main.i18n("extension.bat"), "*.bat")
-                        : new FileChooser.ExtensionFilter(Main.i18n("extension.sh"), "*.sh"));
-                File file = chooser.showSaveDialog(Controllers.getStage());
-                if (file != null)
-                    LauncherHelper.INSTANCE.launch(version, file);
-            }
-        });
-        item.setOnSettingsButtonClicked(e -> {
-            Controllers.getDecorator().showPage(Controllers.getVersionPage());
-            Controllers.getVersionPage().load(version, profile);
-        });
-        item.setOnUpdateButtonClicked(event -> {
-            FileChooser chooser = new FileChooser();
-            chooser.setTitle(Main.i18n("modpack.choose"));
-            chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(Main.i18n("modpack"), "*.zip"));
-            File selectedFile = chooser.showOpenDialog(Controllers.getStage());
-            if (selectedFile != null) {
-                TaskExecutorDialogPane pane = new TaskExecutorDialogPane(null);
-                try {
-                    TaskExecutor executor = ModpackHelper.getUpdateTask(profile, selectedFile, version, ModpackHelper.readModpackConfiguration(profile.getRepository().getModpackConfiguration(version)))
-                            .then(Task.of(Schedulers.javafx(), Controllers::closeDialog)).executor();
-                    pane.setExecutor(executor);
-                    pane.setTitle(Main.i18n("modpack.update"));
-                    executor.start();
-                    Controllers.dialog(pane);
-                } catch (UnsupportedModpackException e) {
-                    Controllers.dialog(Main.i18n("modpack.unsupported"), Main.i18n("message.error"), MessageBox.ERROR_MESSAGE);
-                } catch (MismatchedModpackTypeException e) {
-                    Controllers.dialog(Main.i18n("modpack.mismatched_type"), Main.i18n("message.error"), MessageBox.ERROR_MESSAGE);
-                } catch (IOException e)  {
-                    Controllers.dialog(Main.i18n("modpack.invalid"), Main.i18n("message.error"), MessageBox.ERROR_MESSAGE);
-                }
-            }
-        });
-        item.setOnMouseClicked(event -> {
-            if (event.getButton() == MouseButton.SECONDARY) {
-                rightClickedVersion = version;
-                versionList.getSelectionModel().select(-1);
-                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(Main.i18n("login.empty_username"));
-                else
-                    LauncherHelper.INSTANCE.launch(version, null);
-            }
-        });
-        File iconFile = profile.getRepository().getVersionIcon(version);
-        if (iconFile.exists())
-            item.setImage(new Image("file:" + iconFile.getAbsolutePath()));
-        return item;
-    }
 
-    private void loadVersions() {
-        loadVersions(Settings.INSTANCE.getSelectedProfile());
-    }
+        btnLaunch.setClip(new Rectangle(-100, -100, 280, 200));
+        btnMenu.setClip(new Rectangle(180, -100, 100, 200));
+        menu.setMinWidth(200);
 
-    private void loadVersions(Profile profile) {
-        this.profile = profile;
-        List<Node> children = new LinkedList<>();
-        for (Version version : profile.getRepository().getVersions()) {
-            children.add(buildNode(profile, version.getId(), GameVersion.minecraftVersion(profile.getRepository().getVersionJar(version.getId())).orElse("Unknown")));
+        StackPane graphic = new StackPane();
+        Node svg = SVG.triangle(Theme.whiteFillBinding(), 10, 10);
+        StackPane.setAlignment(svg, Pos.CENTER_RIGHT);
+        graphic.getChildren().setAll(svg);
+        graphic.setTranslateX(11);
+        btnMenu.setGraphic(graphic);
+
+        Profiles.selectedVersionProperty().addListener((o, a, version) -> {
+            if (version != null) {
+                lblCurrentGame.setText(version);
+            } else {
+                lblCurrentGame.setText(i18n("version.empty"));
+            }
+        });
+
+        EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).register(event -> {
+            if (event.getSource() == profile.getRepository())
+                loadVersions((HMCLGameRepository) event.getSource());
+        });
+        Profiles.selectedProfileProperty().addListener((a, b, newValue) -> profile = newValue);
+
+        profile = Profiles.getSelectedProfile();
+        if (profile != null) {
+            if (profile.getRepository().isLoaded())
+                loadVersions(profile.getRepository());
+            else
+                profile.getRepository().refreshVersionsAsync().start();
         }
-        FXUtils.resetChildren(masonryPane, children);
+    }
+
+    private void loadVersions(HMCLGameRepository repository) {
+        List<IconedMenuItem> children = repository.getVersions().parallelStream()
+                .filter(version -> !version.isHidden())
+                .sorted((a, b) -> VersionNumber.COMPARATOR.compare(VersionNumber.asVersion(a.getId()), VersionNumber.asVersion(b.getId())))
+                .map(version -> new IconedMenuItem(null, version.getId(), () -> {
+                    repository.getProfile().setSelectedVersion(version.getId());
+                    Versions.launch(repository.getProfile(), version.getId());
+                    popup.hide();
+                }))
+                .collect(Collectors.toList());
+        JFXUtilities.runInFX(() -> {
+            if (profile == repository.getProfile())
+                menu.getChildren().setAll(children);
+        });
     }
 
     @FXML
-    private void onVersionManagement() {
-        versionPopup.hide();
-        switch (versionList.getSelectionModel().getSelectedIndex()) {
-            case 0:
-                VersionPage.renameVersion(profile, rightClickedVersion);
-                break;
-            case 1:
-                VersionPage.deleteVersion(profile, rightClickedVersion);
-                break;
-            case 2:
-                VersionPage.exportVersion(profile, rightClickedVersion);
-                break;
-            case 3:
-                FXUtils.openFolder(profile.getRepository().getRunDirectory(rightClickedVersion));
-                break;
-            default:
-                throw new Error();
-        }
+    private void launch() {
+        Profile profile = Profiles.getSelectedProfile();
+        Versions.launch(profile, profile.getSelectedVersion());
+    }
+
+    @FXML
+    private void onMenu() {
+        popup.show(btnMenu, JFXPopup.PopupVPosition.BOTTOM, JFXPopup.PopupHPosition.RIGHT, 0, -btnMenu.getHeight());
     }
 
     public String getTitle() {
@@ -215,8 +139,8 @@ public final class MainPage extends StackPane implements DecoratorPage {
     }
 
     @Override
-    public StringProperty titleProperty() {
-        return title;
+    public ReadOnlyStringProperty titleProperty() {
+        return title.getReadOnlyProperty();
     }
 
     public void setTitle(String title) {

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

@@ -18,8 +18,10 @@
 package org.jackhuang.hmcl.ui;
 
 import javafx.beans.binding.ObjectBinding;
+import javafx.geometry.Pos;
 import javafx.scene.Group;
 import javafx.scene.Node;
+import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Paint;
 import javafx.scene.shape.SVGPath;
 
@@ -33,6 +35,12 @@ public final class SVG {
         path.setContent(d);
         path.fillProperty().bind(fill);
 
+        if (width < 0 || height < 0) {
+            StackPane pane = new StackPane(path);
+            pane.setAlignment(Pos.CENTER);
+            return pane;
+        }
+
         Group svg = new Group(path);
         double scale = Math.min(width / svg.getBoundsInParent().getWidth(), height / svg.getBoundsInParent().getHeight());
         svg.setScaleX(scale);
@@ -83,6 +91,10 @@ public final class SVG {
         return createSVGPath("M1008 6.286q18.857 13.714 15.429 36.571l-146.286 877.714q-2.857 16.571-18.286 25.714-8 4.571-17.714 4.571-6.286 0-13.714-2.857l-258.857-105.714-138.286 168.571q-10.286 13.143-28 13.143-7.429 0-12.571-2.286-10.857-4-17.429-13.429t-6.571-20.857v-199.429l493.714-605.143-610.857 528.571-225.714-92.571q-21.143-8-22.857-31.429-1.143-22.857 18.286-33.714l950.857-548.571q8.571-5.143 18.286-5.14311.429 0 20.571 6.286z", fill, width, height);
     }
 
+    public static Node launch2(ObjectBinding<? extends Paint> fill, double width, double height) {
+        return createSVGPath("M14,3V5H17.59L7.76,14.83L9.17,16.24L19,6.41V10H21V3M19,19H5V5H12V3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V12H19V19Z", fill, width, height);
+    }
+
     public static Node script(ObjectBinding<? extends Paint> fill, double width, double height) {
         return createSVGPath("M14,20A2,2 0 0,0 16,18V5H9A1,1 0 0,0 8,6V16H5V5A3,3 0 0,1 8,2H19A3,3 0 0,1 22,5V6H18V18L18,19A3,3 0 0,1 15,22H5A3,3 0 0,1 2,19V18H12A2,2 0 0,0 14,20Z", fill, width, height);
     }
@@ -127,4 +139,19 @@ 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);
+    }
 }

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

@@ -17,206 +17,214 @@
  */
 package org.jackhuang.hmcl.ui;
 
-import com.jfoenix.controls.*;
+import com.jfoenix.controls.JFXColorPicker;
 import com.jfoenix.effects.JFXDepthManager;
 import javafx.application.Platform;
-import javafx.beans.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.beans.InvalidationListener;
+import javafx.beans.WeakInvalidationListener;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.When;
+import javafx.beans.property.*;
 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.Main;
+import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.setting.*;
-import org.jackhuang.hmcl.ui.construct.*;
-import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
+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.Lang;
+import org.jackhuang.hmcl.util.i18n.Locales;
 
 import java.net.Proxy;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.stream.Collectors;
+import java.util.Objects;
+import java.util.Optional;
 
-public final class SettingsPage extends StackPane implements DecoratorPage {
-    private final StringProperty title = new SimpleStringProperty(this, "title", Main.i18n("settings.launcher"));
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.util.SelectionModelSelectedItemProperty.selectedItemPropertyFor;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
-    @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;
+public final class SettingsPage extends SettingsView implements DecoratorPage {
+    private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper(this, "title", i18n("settings.launcher"));
 
-    {
-        FXUtils.loadFXML(this, "/assets/fxml/setting.fxml");
+    private ObjectProperty<Proxy.Type> selectedProxyType;
 
+    private InvalidationListener updateListener;
+
+    public SettingsPage() {
         FXUtils.smoothScrolling(scroll);
 
-        txtProxyHost.setText(Settings.INSTANCE.getProxyHost());
-        txtProxyHost.textProperty().addListener((a, b, newValue) -> Settings.INSTANCE.setProxyHost(newValue));
+        // ==== Download sources ====
+        cboDownloadSource.getItems().setAll(DownloadProviders.providersById.keySet());
+        selectedItemPropertyFor(cboDownloadSource).bindBidirectional(config().downloadTypeProperty());
+        // ====
 
-        txtProxyPort.setText(Settings.INSTANCE.getProxyPort());
-        txtProxyPort.textProperty().addListener((a, b, newValue) -> Settings.INSTANCE.setProxyPort(newValue));
+        chkEnableGameList.selectedProperty().bindBidirectional(config().enableMainPageGameListProperty());
 
-        txtProxyUsername.setText(Settings.INSTANCE.getProxyUser());
-        txtProxyUsername.textProperty().addListener((a, b, newValue) -> Settings.INSTANCE.setProxyUser(newValue));
-
-        txtProxyPassword.setText(Settings.INSTANCE.getProxyPass());
-        txtProxyPassword.textProperty().addListener((a, b, newValue) -> Settings.INSTANCE.setProxyPass(newValue));
-
-        cboDownloadSource.getSelectionModel().select(DownloadProviders.DOWNLOAD_PROVIDERS.indexOf(Settings.INSTANCE.getDownloadProvider()));
-        cboDownloadSource.getSelectionModel().selectedIndexProperty().addListener((a, b, newValue) -> Settings.INSTANCE.setDownloadProvider(DownloadProviders.getDownloadProvider(newValue.intValue())));
-
-        cboFont.getSelectionModel().select(Settings.INSTANCE.getFont().getFamily());
+        cboFont.initValue(Settings.instance().getFont());
         cboFont.valueProperty().addListener((a, b, newValue) -> {
-            Font font = Font.font(newValue, Settings.INSTANCE.getFont().getSize());
-            Settings.INSTANCE.setFont(font);
+            Font font = Font.font(newValue, Settings.instance().getFont().getSize());
+            Settings.instance().setFont(font);
             lblDisplay.setStyle("-fx-font: " + font.getSize() + " \"" + font.getFamily() + "\";");
         });
 
-        txtFontSize.setText(Double.toString(Settings.INSTANCE.getFont().getSize()));
+        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);
+                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() + "\";");
+        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())));
+        // ==== Languages ====
+        cboLanguage.getItems().setAll(Locales.LOCALES);
+        selectedItemPropertyFor(cboLanguage).bindBidirectional(config().localizationProperty());
+        // ====
 
-        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())));
+        // ==== Proxy ====
+        txtProxyHost.textProperty().bindBidirectional(config().proxyHostProperty());
+        txtProxyPort.textProperty().bindBidirectional(config().proxyPortProperty());
+        txtProxyUsername.textProperty().bindBidirectional(config().proxyUserProperty());
+        txtProxyPassword.textProperty().bindBidirectional(config().proxyPassProperty());
 
+        proxyPane.disableProperty().bind(chkDisableProxy.selectedProperty());
+        authPane.disableProperty().bind(chkProxyAuthentication.selectedProperty().not());
+
+        chkDisableProxy.setSelected(!config().hasProxy());
+        chkDisableProxy.selectedProperty().addListener(o -> config().setHasProxy(!chkDisableProxy.isSelected()));
+        config().hasProxyProperty().addListener(o -> chkDisableProxy.setSelected(!config().hasProxy()));
+        chkProxyAuthentication.selectedProperty().bindBidirectional(config().hasProxyAuthProperty());
+
+        selectedProxyType = new SimpleObjectProperty<Proxy.Type>(Proxy.Type.HTTP) {
+            {
+                invalidated();
+            }
+
+            @Override
+            protected void invalidated() {
+                Proxy.Type type = Objects.requireNonNull(get());
+                if (type == Proxy.Type.DIRECT) {
+                    set(Proxy.Type.HTTP); // HTTP by default
+                } else {
+                    chkProxyHttp.setSelected(type == Proxy.Type.HTTP);
+                    chkProxySocks.setSelected(type == Proxy.Type.SOCKS);
+                }
+            }
+        };
+        selectedProxyType.bindBidirectional(config().proxyTypeProperty());
 
         ToggleGroup proxyConfigurationGroup = new ToggleGroup();
         chkProxyHttp.setUserData(Proxy.Type.HTTP);
         chkProxyHttp.setToggleGroup(proxyConfigurationGroup);
         chkProxySocks.setUserData(Proxy.Type.SOCKS);
         chkProxySocks.setToggleGroup(proxyConfigurationGroup);
+        proxyConfigurationGroup.getToggles().forEach(
+                toggle -> toggle.selectedProperty().addListener((observable, oldValue, newValue) -> {
+                    if (newValue) {
+                        selectedProxyType.set((Proxy.Type) toggle.getUserData());
+                    }
+                }));
+        // ====
 
-        for (Toggle toggle : proxyConfigurationGroup.getToggles())
-            if (toggle.getUserData() == Settings.INSTANCE.getProxyType())
-                toggle.setSelected(true);
+        fileCommonLocation.loadChildren(Arrays.asList(
+                fileCommonLocation.createChildren(i18n("launcher.common_directory.default"), EnumCommonDirectory.DEFAULT)
+        ), EnumCommonDirectory.CUSTOM);
+        fileCommonLocation.selectedDataProperty().bindBidirectional(config().commonDirTypeProperty());
+        fileCommonLocation.customTextProperty().bindBidirectional(config().commonDirectoryProperty());
+        fileCommonLocation.subtitleProperty().bind(
+                Bindings.createObjectBinding(() -> Optional.ofNullable(Settings.instance().getCommonDirectory())
+                                .orElse(i18n("launcher.common_directory.disabled")),
+                        config().commonDirectoryProperty(), config().commonDirTypeProperty()));
 
-        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());
+        // ==== Update ====
+        FXUtils.installTooltip(btnUpdate, i18n("update.tooltip"));
+        updateListener = any -> {
+            btnUpdate.setVisible(UpdateChecker.isOutdated());
 
-        hasProxyGroup.selectedToggleProperty().addListener((a, b, newValue) ->
-                Settings.INSTANCE.setHasProxy(newValue != chkNoProxy));
+            if (UpdateChecker.isOutdated()) {
+                lblUpdateSub.setText(i18n("update.newest_version", UpdateChecker.getLatestVersion().getVersion()));
+                lblUpdateSub.getStyleClass().setAll("update-label");
 
-        proxyConfigurationGroup.selectedToggleProperty().addListener((a, b, newValue) ->
-                Settings.INSTANCE.setProxyType((Proxy.Type) newValue.getUserData()));
+                lblUpdate.setText(i18n("update.found"));
+                lblUpdate.getStyleClass().setAll("update-label");
+            } else if (UpdateChecker.isCheckingUpdate()) {
+                lblUpdateSub.setText(i18n("update.checking"));
+                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();
+            } else {
+                lblUpdateSub.setText(i18n("update.latest"));
+                lblUpdateSub.getStyleClass().setAll("subtitle-label");
 
-        fileCommonLocation.setProperty(Settings.INSTANCE.commonPathProperty());
+                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);
 
-        FXUtils.installTooltip(btnUpdate, Main.i18n("update.tooltip"));
-        checkUpdate();
+        lblUpdateNote.setWrappingWidth(470);
 
-        // background
+        ObjectProperty<UpdateChannel> updateChannel = new SimpleObjectProperty<UpdateChannel>() {
+            @Override
+            protected void invalidated() {
+                UpdateChannel updateChannel = Objects.requireNonNull(get());
+                chkUpdateDev.setSelected(updateChannel == UpdateChannel.DEVELOPMENT);
+                chkUpdateStable.setSelected(updateChannel == UpdateChannel.STABLE);
+            }
+        };
+
+        ToggleGroup updateChannelGroup = new ToggleGroup();
+        chkUpdateDev.setToggleGroup(updateChannelGroup);
+        chkUpdateDev.setUserData(UpdateChannel.DEVELOPMENT);
+        chkUpdateStable.setToggleGroup(updateChannelGroup);
+        chkUpdateStable.setUserData(UpdateChannel.STABLE);
+        updateChannelGroup.getToggles().forEach(
+                toggle -> toggle.selectedProperty().addListener((observable, oldValue, newValue) -> {
+                    if (newValue) {
+                        updateChannel.set((UpdateChannel) toggle.getUserData());
+                    }
+                }));
+        updateChannel.bindBidirectional(ConfigHolder.config().updateChannelProperty());
+        // ====
+
+        // ==== Background ====
         backgroundItem.loadChildren(Collections.singletonList(
-                backgroundItem.createChildren(Main.i18n("launcher.background.default"), EnumBackgroundImage.DEFAULT)
-        ));
+                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()));
+        // ====
 
-        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(Main.i18n("color.custom"));
-        picker.setRecentColorsText(Main.i18n("color.recent"));
-        picker.getCustomColors().setAll(Arrays.stream(Theme.VALUES).map(Theme::getColor).map(Color::web).collect(Collectors.toList()));
+        // ==== 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);
         picker.setOnAction(e -> {
             Theme theme = Theme.custom(Theme.getColorDisplayName(picker.getValue()));
-            Settings.INSTANCE.setTheme(theme);
+            config().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(Main.i18n("launcher.background.default"));
-                break;
-            case CUSTOM:
-                backgroundItem.setSubtitle(Settings.INSTANCE.getBackgroundImage());
-                break;
-        }
+        // ====
     }
 
     public String getTitle() {
@@ -224,34 +232,25 @@ public final class SettingsPage extends StackPane implements DecoratorPage {
     }
 
     @Override
-    public StringProperty titleProperty() {
-        return title;
+    public ReadOnlyStringProperty titleProperty() {
+        return title.getReadOnlyProperty();
     }
 
     public void setTitle(String title) {
         this.title.set(title);
     }
 
-    public void checkUpdate() {
-        btnUpdate.setVisible(Main.UPDATE_CHECKER.isOutOfDate());
-
-        if (Main.UPDATE_CHECKER.isOutOfDate()) {
-            lblUpdateSub.setText(Main.i18n("update.newest_version", Main.UPDATE_CHECKER.getNewVersion().toString()));
-            lblUpdateSub.getStyleClass().setAll("update-label");
-
-            lblUpdate.setText(Main.i18n("update.found"));
-            lblUpdate.getStyleClass().setAll("update-label");
-        } else {
-            lblUpdateSub.setText(Main.i18n("update.latest"));
-            lblUpdateSub.getStyleClass().setAll("subtitle-label");
-
-            lblUpdate.setText(Main.i18n("update"));
-            lblUpdate.getStyleClass().setAll();
+    @Override
+    protected void onUpdate() {
+        RemoteVersion target = UpdateChecker.getLatestVersion();
+        if (target == null) {
+            return;
         }
+        UpdateHandler.updateFrom(target);
     }
 
-    @FXML
-    private void onUpdate() {
-        Main.UPDATE_CHECKER.checkOutdate();
+    @Override
+    protected void onHelp() {
+        FXUtils.openLink(Metadata.HELP_URL);
     }
 }

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

@@ -0,0 +1,502 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
+package org.jackhuang.hmcl.ui;
+
+import com.jfoenix.controls.*;
+import javafx.geometry.HPos;
+import javafx.geometry.Pos;
+import javafx.geometry.VPos;
+import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.layout.*;
+import javafx.scene.text.Text;
+import javafx.scene.text.TextAlignment;
+
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.ui.FXUtils.stringConverter;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+import org.jackhuang.hmcl.setting.EnumBackgroundImage;
+import org.jackhuang.hmcl.setting.EnumCommonDirectory;
+import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.ui.construct.*;
+import org.jackhuang.hmcl.util.i18n.I18n;
+import org.jackhuang.hmcl.util.i18n.Locales.SupportedLocale;
+
+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;
+    protected final JFXToggleButton chkEnableGameList;
+
+    public SettingsView() {
+        scroll = new ScrollPane();
+        getChildren().setAll(scroll);
+        scroll.setStyle("-fx-font-size: 14;");
+        scroll.setFitToWidth(true);
+
+        {
+            VBox rootPane = new VBox();
+            rootPane.setStyle("-fx-padding: 18;");
+            {
+                ComponentList settingsPane = new ComponentList();
+                {
+                    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().setAll("subtitle-label");
+
+                        headerLeft.getChildren().setAll(lblUpdate, lblUpdateSub);
+                        updatePane.setHeaderLeft(headerLeft);
+                    }
+
+                    {
+                        btnUpdate = new JFXButton();
+                        btnUpdate.setOnMouseClicked(e -> onUpdate());
+                        btnUpdate.getStyleClass().setAll("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().setAll("subtitle-label");
+
+                        headerLeft.getChildren().setAll(help, helpSubtitle);
+                        updatePane.setLeft(headerLeft);
+                    }
+
+                    {
+                        JFXButton btnExternal = new JFXButton();
+                        btnExternal.setOnMouseClicked(e -> onHelp());
+                        btnExternal.getStyleClass().setAll("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.common_directory"));
+                    fileCommonLocation.setDirectory(true);
+                    fileCommonLocation.setChooserTitle(i18n("launcher.common_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 borderPane = new BorderPane();
+
+                    Label left = new Label(i18n("settings.launcher.enable_game_list"));
+                    BorderPane.setAlignment(left, Pos.CENTER_LEFT);
+                    borderPane.setLeft(left);
+
+                    chkEnableGameList = new JFXToggleButton();
+                    chkEnableGameList.setSize(8);
+                    FXUtils.setLimitHeight(chkEnableGameList, 20);
+                    borderPane.setRight(chkEnableGameList);
+
+                    // Do not uncomment this line,
+                    // since option for user to enable game list in main page is unnecessary
+                    // settingsPane.addChildren(borderPane);
+                }
+
+                {
+                    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();
+                                txtProxyHost.getStyleClass().setAll("fit-width");
+                                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();
+                                txtProxyPort.getStyleClass().setAll("fit-width");
+                                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();
+                                txtProxyUsername.getStyleClass().setAll("fit-width");
+                                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();
+                                txtProxyPassword.getStyleClass().setAll("fit-width");
+                                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);
+                }
+
+                {
+                    VBox fontPane = new VBox();
+                    fontPane.setSpacing(5);
+                    settingsPane.getContent().add(fontPane);
+
+                    {
+                        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, false);
+                            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);
+                }
+
+                {
+                    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();
+}

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

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

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

@@ -1,72 +0,0 @@
-/*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
- */
-package org.jackhuang.hmcl.ui;
-
-import javafx.fxml.FXML;
-import javafx.geometry.Rectangle2D;
-import javafx.scene.control.Label;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-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;
-    private Runnable handler;
-
-    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);
-    }
-
-    @FXML
-    private void onSettings() {
-        handler.run();
-    }
-
-    public void setOnSettingsButtonClicked(Runnable handler) {
-        this.handler = 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/WeakListenerHolder.java

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

@@ -21,14 +21,15 @@ import javafx.scene.Scene;
 import javafx.scene.image.Image;
 import javafx.scene.web.WebView;
 import javafx.stage.Stage;
-import org.jackhuang.hmcl.setting.Settings;
+
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 
 public class WebStage extends Stage {
     private final WebView webView = new WebView();
 
     public WebStage() {
         setScene(new Scene(webView, 800, 480));
-        getScene().getStylesheets().addAll(Settings.INSTANCE.getTheme().getStylesheets());
+        getScene().getStylesheets().addAll(config().getTheme().getStylesheets());
         getIcons().add(new Image("/assets/img/icon.png"));
     }
 

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

@@ -0,0 +1,75 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
+package org.jackhuang.hmcl.ui.account;
+
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.image.Image;
+import org.jackhuang.hmcl.auth.Account;
+import org.jackhuang.hmcl.auth.offline.OfflineAccount;
+import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
+import org.jackhuang.hmcl.game.AccountHelper;
+import org.jackhuang.hmcl.task.Schedulers;
+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().set(i18n("account.missing"));
+                subtitleProperty().set(i18n("account.missing.add"));
+                imageProperty().set(new Image("/assets/img/craft_table.png"));
+                viewportProperty().set(null);
+            } else {
+                titleProperty().set(account.getCharacter());
+                subtitleProperty().set(accountSubtitle(account));
+
+                imageProperty().set(AccountHelper.getDefaultSkin(account.getUUID(), 4));
+                viewportProperty().set(AccountHelper.getViewport(4));
+
+                if (account instanceof YggdrasilAccount) {
+                    AccountHelper.loadSkinAsync((YggdrasilAccount) account).subscribe(Schedulers.javafx(), () -> {
+                        Image image = AccountHelper.getSkin((YggdrasilAccount) account, 4);
+                        imageProperty().set(image);
+                    });
+                }
+            }
+        }
+    };
+
+    public AccountAdvancedListItem() {
+    }
+
+    public ObjectProperty<Account> accountProperty() {
+        return account;
+    }
+
+    private static String accountSubtitle(Account account) {
+        if (account instanceof OfflineAccount)
+            return i18n("account.methods.offline");
+        else if (account instanceof YggdrasilAccount)
+            return account.getUsername();
+        else
+            return "";
+    }
+}

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

@@ -0,0 +1,83 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
+package org.jackhuang.hmcl.ui.account;
+
+import javafx.beans.property.*;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.scene.control.ToggleGroup;
+import org.jackhuang.hmcl.auth.Account;
+import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.ListPage;
+import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
+import org.jackhuang.hmcl.util.MappedObservableList;
+
+import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+public class AccountList extends ListPage<AccountListItem> implements DecoratorPage {
+    private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper(i18n("account.manage"));
+    private ObjectProperty<Account> selectedAccount = new SimpleObjectProperty<Account>() {
+        {
+            itemsProperty().addListener(onInvalidating(this::invalidated));
+        }
+
+        @Override
+        protected void invalidated() {
+            Account selected = get();
+            itemsProperty().forEach(item -> item.selectedProperty().set(item.getAccount() == selected));
+        }
+    };
+    private final ListProperty<Account> accounts = new SimpleListProperty<>(FXCollections.observableArrayList());
+
+    private ToggleGroup toggleGroup;
+    private final ObservableList<AccountListItem> accountItems;
+
+    public AccountList() {
+        toggleGroup = new ToggleGroup();
+
+        accountItems = MappedObservableList.create(
+                accountsProperty(),
+                account -> new AccountListItem(toggleGroup, account));
+
+        itemsProperty().bindContent(accountItems);
+
+        toggleGroup.selectedToggleProperty().addListener((o, a, toggle) -> {
+            if (toggle == null || toggle.getUserData() == null) return;
+            selectedAccount.set(((AccountListItem) toggle.getUserData()).getAccount());
+        });
+    }
+
+    public ObjectProperty<Account> selectedAccountProperty() {
+        return selectedAccount;
+    }
+
+    public ListProperty<Account> accountsProperty() {
+        return accounts;
+    }
+
+    @Override
+    public void add() {
+        Controllers.dialog(new AddAccountPane());
+    }
+
+    @Override
+    public ReadOnlyStringProperty titleProperty() {
+        return title.getReadOnlyProperty();
+    }
+}

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

@@ -0,0 +1,123 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
+package org.jackhuang.hmcl.ui.account;
+
+import javafx.beans.property.*;
+import javafx.geometry.Rectangle2D;
+import javafx.scene.control.Control;
+import javafx.scene.control.Skin;
+import javafx.scene.control.ToggleGroup;
+import javafx.scene.image.Image;
+import org.jackhuang.hmcl.auth.Account;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
+import org.jackhuang.hmcl.auth.offline.OfflineAccount;
+import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
+import org.jackhuang.hmcl.game.AccountHelper;
+import org.jackhuang.hmcl.setting.Accounts;
+import org.jackhuang.hmcl.task.Schedulers;
+
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+public class AccountListItem extends Control {
+    private final Account account;
+    private final ToggleGroup toggleGroup;
+    private final StringProperty title = new SimpleStringProperty();
+    private final StringProperty subtitle = new SimpleStringProperty();
+    private final BooleanProperty selected = new SimpleBooleanProperty();
+    private final ObjectProperty<Image> image = new SimpleObjectProperty<>();
+    private final ObjectProperty<Rectangle2D> viewport = new SimpleObjectProperty<>();
+
+    public AccountListItem(ToggleGroup toggleGroup, Account account) {
+        this.account = account;
+        this.toggleGroup = toggleGroup;
+
+        StringBuilder subtitleString = new StringBuilder(Accounts.getAccountTypeName(account));
+        if (account instanceof AuthlibInjectorAccount) {
+            AuthlibInjectorServer server = ((AuthlibInjectorAccount) account).getServer();
+            subtitleString.append(", ").append(i18n("account.injector.server")).append(": ").append(server.getName());
+        }
+
+        if (account instanceof OfflineAccount)
+            title.set(account.getCharacter());
+        else
+            title.set(account.getUsername() + " - " + account.getCharacter());
+        subtitle.set(subtitleString.toString());
+        selected.set(Accounts.selectedAccountProperty().get() == account);
+
+        viewport.set(AccountHelper.getViewport(4));
+        if (account instanceof YggdrasilAccount) {
+            Image image = AccountHelper.getSkin((YggdrasilAccount) account, 4);
+            this.image.set(image);
+        } else {
+            this.image.set(AccountHelper.getDefaultSkin(account.getUUID(), 4));
+        }
+    }
+
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new AccountListItemSkin(this);
+    }
+
+    public ToggleGroup getToggleGroup() {
+        return toggleGroup;
+    }
+
+    public Account getAccount() {
+        return account;
+    }
+
+    public StringProperty titleProperty() {
+        return title;
+    }
+
+    public StringProperty subtitleProperty() {
+        return subtitle;
+    }
+
+    public BooleanProperty selectedProperty() {
+        return selected;
+    }
+
+    public ObjectProperty<Image> imageProperty() {
+        return image;
+    }
+
+    public ObjectProperty<Rectangle2D> viewportProperty() {
+        return viewport;
+    }
+
+    public void refresh() {
+        if (account instanceof YggdrasilAccount) {
+            // progressBar.setVisible(true);
+            AccountHelper.refreshSkinAsync((YggdrasilAccount) account)
+                    .finalized(Schedulers.javafx(), (variables, isDependentsSucceeded) -> {
+                        // progressBar.setVisible(false);
+
+                        if (isDependentsSucceeded) {
+                            Image image = AccountHelper.getSkin((YggdrasilAccount) account, 4);
+                            this.image.set(image);
+                        }
+                    }).start();
+        }
+    }
+
+    public void remove() {
+        Accounts.getAccounts().remove(account);
+    }
+}

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

@@ -0,0 +1,95 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
+package org.jackhuang.hmcl.ui.account;
+
+import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXRadioButton;
+import com.jfoenix.effects.JFXDepthManager;
+import javafx.geometry.Pos;
+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 org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.SVG;
+import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
+
+import 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();
+        BorderPane.setAlignment(chkSelected, Pos.CENTER);
+        chkSelected.setUserData(skinnable);
+        chkSelected.selectedProperty().bindBidirectional(skinnable.selectedProperty());
+        chkSelected.setToggleGroup(skinnable.getToggleGroup());
+        root.setLeft(chkSelected);
+
+        HBox center = new HBox();
+        center.setSpacing(8);
+        center.setAlignment(Pos.CENTER_LEFT);
+
+        StackPane imageViewContainer = new StackPane();
+        FXUtils.setLimitWidth(imageViewContainer, 32);
+        FXUtils.setLimitHeight(imageViewContainer, 32);
+
+        ImageView imageView = new ImageView();
+        FXUtils.limitSize(imageView, 32, 32);
+        imageView.imageProperty().bind(skinnable.imageProperty());
+        imageView.viewportProperty().bind(skinnable.viewportProperty());
+        imageViewContainer.getChildren().setAll(imageView);
+
+        TwoLineListItem item = new TwoLineListItem();
+        BorderPane.setAlignment(item, Pos.CENTER);
+        center.getChildren().setAll(imageView, item);
+        root.setCenter(center);
+
+        HBox right = new HBox();
+        right.setAlignment(Pos.CENTER_RIGHT);
+        JFXButton btnRefresh = new JFXButton();
+        btnRefresh.setOnMouseClicked(e -> skinnable.refresh());
+        btnRefresh.getStyleClass().add("toggle-icon4");
+        btnRefresh.setGraphic(SVG.refresh(Theme.blackFillBinding(), -1, -1));
+        JFXUtilities.runInFX(() -> FXUtils.installTooltip(btnRefresh, i18n("button.refresh")));
+        right.getChildren().add(btnRefresh);
+
+        JFXButton btnRemove = new JFXButton();
+        btnRemove.setOnMouseClicked(e -> skinnable.remove());
+        btnRemove.getStyleClass().add("toggle-icon4");
+        BorderPane.setAlignment(btnRemove, Pos.CENTER);
+        btnRemove.setGraphic(SVG.delete(Theme.blackFillBinding(), -1, -1));
+        JFXUtilities.runInFX(() -> FXUtils.installTooltip(btnRemove, i18n("button.delete")));
+        right.getChildren().add(btnRemove);
+        root.setRight(right);
+
+        root.setStyle("-fx-background-color: white; -fx-padding: 8 8 8 0;");
+        JFXDepthManager.setDepth(root, 1);
+        item.titleProperty().bind(skinnable.titleProperty());
+        item.subtitleProperty().bind(skinnable.subtitleProperty());
+
+        getChildren().setAll(root);
+    }
+}

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

@@ -15,9 +15,8 @@
  * 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;
+package org.jackhuang.hmcl.ui.account;
 
-import com.jfoenix.controls.JFXDialog;
 import com.jfoenix.controls.JFXPasswordField;
 import com.jfoenix.controls.JFXProgressBar;
 import javafx.fxml.FXML;
@@ -28,6 +27,8 @@ import org.jackhuang.hmcl.auth.AuthInfo;
 import org.jackhuang.hmcl.auth.NoSelectedCharacterException;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 
 import java.util.function.Consumer;
 
@@ -41,7 +42,6 @@ public class AccountLoginPane extends StackPane {
     @FXML private JFXPasswordField txtPassword;
     @FXML private Label lblCreationWarning;
     @FXML private JFXProgressBar progressBar;
-    private JFXDialog dialog;
 
     public AccountLoginPane(Account oldAccount, Consumer<AuthInfo> success, Runnable failed) {
         this.oldAccount = oldAccount;
@@ -69,11 +69,11 @@ public class AccountLoginPane extends StackPane {
             Object account = variable.get("login");
             if (account instanceof AuthInfo) {
                 success.accept(((AuthInfo) account));
-                dialog.close();
+                fireEvent(new DialogCloseEvent());
             } else if (account instanceof NoSelectedCharacterException) {
-                dialog.close();
+                fireEvent(new DialogCloseEvent());
             } else if (account instanceof Exception) {
-                lblCreationWarning.setText(AccountsPage.accountException((Exception) account));
+                lblCreationWarning.setText(AddAccountPane.accountException((Exception) account));
             }
 
             progressBar.setVisible(false);
@@ -83,10 +83,6 @@ public class AccountLoginPane extends StackPane {
     @FXML
     private void onCancel() {
         failed.run();
-        dialog.close();
-    }
-
-    public void setDialog(JFXDialog dialog) {
-        this.dialog = dialog;
+        fireEvent(new DialogCloseEvent());
     }
 }

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

@@ -0,0 +1,288 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
+package org.jackhuang.hmcl.ui.account;
+
+import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.controls.*;
+import javafx.beans.binding.Bindings;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.fxml.FXML;
+import javafx.geometry.Pos;
+import javafx.scene.control.Hyperlink;
+import javafx.scene.control.Label;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.StackPane;
+import org.jackhuang.hmcl.auth.*;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
+import org.jackhuang.hmcl.auth.yggdrasil.GameProfile;
+import org.jackhuang.hmcl.auth.yggdrasil.RemoteAuthenticationException;
+import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
+import org.jackhuang.hmcl.game.AccountHelper;
+import org.jackhuang.hmcl.setting.Accounts;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.construct.*;
+import org.jackhuang.hmcl.util.Constants;
+import org.jackhuang.hmcl.util.Logging;
+
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.logging.Level;
+
+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 Hyperlink linkManageInjectorServers;
+    @FXML private JFXDialogLayout layout;
+    @FXML private JFXButton btnAccept;
+    @FXML private SpinnerPane acceptPane;
+
+    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_YGGDRASIL, Accounts.FACTORY_AUTHLIB_INJECTOR);
+        cboType.setConverter(stringConverter(Accounts::getAccountTypeName));
+        cboType.getSelectionModel().select(0);
+
+        cboServers.getItems().addListener(onInvalidating(this::checkIfNoServer));
+        checkIfNoServer();
+
+        ReadOnlyObjectProperty<AccountFactory<?>> loginType = cboType.getSelectionModel().selectedItemProperty();
+
+        txtPassword.visibleProperty().bind(loginType.isNotEqualTo(Accounts.FACTORY_OFFLINE));
+        lblPassword.visibleProperty().bind(txtPassword.visibleProperty());
+
+        cboServers.visibleProperty().bind(loginType.isEqualTo(Accounts.FACTORY_AUTHLIB_INJECTOR));
+        lblInjectorServer.visibleProperty().bind(cboServers.visibleProperty());
+        linkManageInjectorServers.visibleProperty().bind(cboServers.visibleProperty());
+
+        txtUsername.getValidators().add(new Validator(i18n("input.email"), str -> !txtPassword.isVisible() || str.contains("@")));
+
+        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()));
+    }
+
+    /**
+     * 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("create_account", () -> factory.create(new Selector(), username, password, additionalData))
+                .finalized(Schedulers.javafx(), variables -> {
+
+                    Account account = variables.get("create_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());
+    }
+
+    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(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(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);
+                } catch (Exception e) {
+                    Logging.LOG.log(Level.WARNING, "Failed to get skin for " + profile.getName(), e);
+                    image = null;
+                }
+                ImageView portraitView = new ImageView();
+                portraitView.setSmooth(false);
+                if (image == null) {
+                    portraitView.setImage(Constants.DEFAULT_ICON.get());
+                } else {
+                    portraitView.setImage(image);
+                    portraitView.setViewport(AccountHelper.getViewport(4));
+                }
+                FXUtils.limitSize(portraitView, 32, 32);
+
+                IconedItem accountItem = new IconedItem(portraitView, profile.getName());
+                accountItem.setOnMouseClicked(e -> {
+                    selectedProfile = profile;
+                    latch.countDown();
+                });
+                listBox.add(accountItem);
+            }
+
+            JFXUtilities.runInFX(() -> Controllers.dialog(this));
+
+            try {
+                latch.await();
+
+                if (selectedProfile == null)
+                    throw new NoSelectedCharacterException(account);
+
+                return selectedProfile;
+            } catch (InterruptedException ignore) {
+                throw new NoSelectedCharacterException(account);
+            } finally {
+                JFXUtilities.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 {
+            return exception.getClass().getName() + ": " + exception.getLocalizedMessage();
+        }
+    }
+}

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

@@ -0,0 +1,140 @@
+/*
+ * 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.account;
+
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXDialogLayout;
+import com.jfoenix.controls.JFXTextField;
+import javafx.beans.binding.Bindings;
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.layout.StackPane;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
+import org.jackhuang.hmcl.ui.animation.TransitionHandler;
+import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
+import org.jackhuang.hmcl.ui.construct.SpinnerPane;
+import org.jackhuang.hmcl.util.NetworkUtils;
+
+import java.io.IOException;
+
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.ui.FXUtils.loadFXML;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+public class AddAuthlibInjectorServerPane extends StackPane {
+
+    @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(
+                Bindings.createBooleanBinding(txtServerUrl::validate, txtServerUrl.textProperty()).not());
+        nextPane.hideSpinner();
+    }
+
+    private String fixInputUrl(String url) {
+        if (!url.endsWith("/")) {
+            url += "/";
+        }
+        return url;
+    }
+
+    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 = fixInputUrl(txtServerUrl.getText());
+
+        nextPane.showSpinner();
+        addServerPane.setDisable(true);
+
+        Task.of(() -> {
+            serverBeingAdded = AuthlibInjectorServer.fetchServerInfo(url);
+        }).finalized(Schedulers.javafx(), (variables, isDependentsSucceeded) -> {
+            addServerPane.setDisable(false);
+            nextPane.hideSpinner();
+
+            if (isDependentsSucceeded) {
+                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 {
+                lblCreationWarning.setText(resolveFetchExceptionMessage(variables.<Exception>get("lastException")));
+            }
+        }).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/AuthlibInjectorServerItem.java

@@ -15,7 +15,7 @@
  * 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;
+package org.jackhuang.hmcl.ui.account;
 
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.effects.JFXDepthManager;
@@ -23,19 +23,20 @@ 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.AuthlibInjectorServerInfo;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 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 AuthlibInjectorServerInfo info;
+    private final AuthlibInjectorServer server;
 
     private final Label lblServerName = new Label();
     private final Label lblServerIp = new Label();
 
-    public AuthlibInjectorServerItem(AuthlibInjectorServerInfo info, Consumer<AuthlibInjectorServerItem> deleteCallback) {
-        this.info = info;
+    public AuthlibInjectorServerItem(AuthlibInjectorServer server, Consumer<AuthlibInjectorServerItem> deleteCallback) {
+        this.server = server;
 
         lblServerName.setStyle("-fx-font-size: 15;");
         lblServerIp.setStyle("-fx-font-size: 10;");
@@ -54,11 +55,11 @@ public final class AuthlibInjectorServerItem extends BorderPane {
 
         setStyle("-fx-background-radius: 2; -fx-background-color: white; -fx-padding: 8;");
         JFXDepthManager.setDepth(this, 1);
-        lblServerName.setText(info.getServerName());
-        lblServerIp.setText(info.getServerIp());
+        lblServerName.setText(server.getName());
+        lblServerIp.setText(server.getUrl());
     }
 
-    public AuthlibInjectorServerInfo getInfo() {
-        return info;
+    public AuthlibInjectorServer getServer() {
+        return server;
     }
 }

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

@@ -0,0 +1,77 @@
+/*
+ * 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.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.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/AnimationProducer.java

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

@@ -24,27 +24,60 @@ 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 -> Collections.emptyList()),
+    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()),
     /**
      * A fade between the old and new view
      */
-    FADE(c ->
+    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 ->
             Arrays.asList(new KeyFrame(Duration.ZERO,
-                            new KeyValue(c.getPreviousNode().opacityProperty(), 1.0D, Interpolator.EASE_BOTH),
-                            new KeyValue(c.getCurrentNode().opacityProperty(), 0.0D, Interpolator.EASE_BOTH)),
+                            new KeyValue(c.getPreviousNode().opacityProperty(), 1, Interpolator.EASE_BOTH),
+                            new KeyValue(c.getCurrentNode().opacityProperty(), 0, Interpolator.EASE_BOTH)),
                     new KeyFrame(c.getDuration(),
-                            new KeyValue(c.getPreviousNode().opacityProperty(), 0.0D, Interpolator.EASE_BOTH),
-                            new KeyValue(c.getCurrentNode().opacityProperty(), 1.0D, Interpolator.EASE_BOTH)))),
+                            new KeyValue(c.getPreviousNode().opacityProperty(), 0, Interpolator.EASE_BOTH),
+                            new KeyValue(c.getCurrentNode().opacityProperty(), 1, Interpolator.EASE_BOTH)))),
     /**
      * A zoom effect
      */
-    ZOOM_IN(c ->
+    ZOOM_IN(c -> {
+        c.getPreviousNode().setTranslateX(0);
+        c.getPreviousNode().setTranslateY(0);
+        c.getPreviousNode().setScaleX(1);
+        c.getPreviousNode().setScaleY(1);
+        c.getPreviousNode().setOpacity(1);
+        c.getCurrentNode().setTranslateX(0);
+        c.getCurrentNode().setTranslateY(0);
+    }, c ->
             Arrays.asList(new KeyFrame(Duration.ZERO,
                             new KeyValue(c.getPreviousNode().scaleXProperty(), 1, Interpolator.EASE_BOTH),
                             new KeyValue(c.getPreviousNode().scaleYProperty(), 1, Interpolator.EASE_BOTH),
-                            new KeyValue(c.getPreviousNode().opacityProperty(), 1.0D, Interpolator.EASE_BOTH)),
+                            new KeyValue(c.getPreviousNode().opacityProperty(), 1, Interpolator.EASE_BOTH)),
                     new KeyFrame(c.getDuration(),
                             new KeyValue(c.getPreviousNode().scaleXProperty(), 4, Interpolator.EASE_BOTH),
                             new KeyValue(c.getPreviousNode().scaleYProperty(), 4, Interpolator.EASE_BOTH),
@@ -52,11 +85,19 @@ public enum ContainerAnimations {
     /**
      * A zoom effect
      */
-    ZOOM_OUT(c ->
+    ZOOM_OUT(c -> {
+        c.getPreviousNode().setTranslateX(0);
+        c.getPreviousNode().setTranslateY(0);
+        c.getPreviousNode().setScaleX(1);
+        c.getPreviousNode().setScaleY(1);
+        c.getPreviousNode().setOpacity(1);
+        c.getCurrentNode().setTranslateX(0);
+        c.getCurrentNode().setTranslateY(0);
+    }, c ->
             (Arrays.asList(new KeyFrame(Duration.ZERO,
                             new KeyValue(c.getPreviousNode().scaleXProperty(), 1, Interpolator.EASE_BOTH),
                             new KeyValue(c.getPreviousNode().scaleYProperty(), 1, Interpolator.EASE_BOTH),
-                            new KeyValue(c.getPreviousNode().opacityProperty(), 1.0D, Interpolator.EASE_BOTH)),
+                            new KeyValue(c.getPreviousNode().opacityProperty(), 1, Interpolator.EASE_BOTH)),
                     new KeyFrame(c.getDuration(),
                             new KeyValue(c.getPreviousNode().scaleXProperty(), 0, Interpolator.EASE_BOTH),
                             new KeyValue(c.getPreviousNode().scaleYProperty(), 0, Interpolator.EASE_BOTH),
@@ -64,7 +105,16 @@ public enum ContainerAnimations {
     /**
      * A swipe effect
      */
-    SWIPE_LEFT(c ->
+    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 ->
             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)),
@@ -75,7 +125,16 @@ public enum ContainerAnimations {
     /**
      * A swipe effect
      */
-    SWIPE_RIGHT(c ->
+    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 ->
             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)),
@@ -85,8 +144,18 @@ public enum ContainerAnimations {
 
     private final AnimationProducer animationProducer;
 
-    ContainerAnimations(AnimationProducer animationProducer) {
-        this.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);
+            }
+        };
     }
 
     public AnimationProducer getAnimationProducer() {

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

@@ -19,9 +19,11 @@ 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 {
@@ -36,6 +38,12 @@ 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
@@ -71,28 +79,38 @@ public final class TransitionHandler implements AnimationHandler {
 
         updateContent(newView);
 
-        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;
+        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;
+        });
     }
 
     private void updateContent(Node newView) {
         if (view.getWidth() > 0 && view.getHeight() > 0) {
             previousNode = currentNode;
             if (previousNode == null)
-                previousNode = NULL;
+                previousNode = EMPTY_PANE;
         } else
-            previousNode = NULL;
+            previousNode = EMPTY_PANE;
 
-        if (previousNode == currentNode)
-            previousNode = NULL;
+        if (previousNode == newView)
+            previousNode = EMPTY_PANE;
+
+        view.setMouseTransparent(true);
 
         currentNode = newView;
 
         view.getChildren().setAll(previousNode, currentNode);
     }
 
-    private static final StackPane NULL = new StackPane();
+    private final StackPane EMPTY_PANE = new StackPane();
 }

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

@@ -42,7 +42,7 @@ public class AdvancedListBox extends ScrollPane {
     }
 
     public AdvancedListBox add(Node child) {
-        if (child instanceof Pane)
+        if (child instanceof Pane || child instanceof AdvancedListItem)
             container.getChildren().add(child);
         else {
             StackPane pane = new StackPane();

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

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

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

@@ -0,0 +1,104 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
+package org.jackhuang.hmcl.ui.construct;
+
+import com.jfoenix.controls.JFXButton;
+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.setting.Theme;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.SVG;
+
+public class AdvancedListItemSkin extends SkinBase<AdvancedListItem> {
+
+    public AdvancedListItemSkin(AdvancedListItem skinnable) {
+        super(skinnable);
+
+        StackPane stackPane = new 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());
+        imageView.viewportProperty().bind(skinnable.viewportProperty());
+        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.setPickOnBounds(false);
+
+        JFXButton settings = new JFXButton();
+        FXUtils.setLimitWidth(settings, 40);
+        settings.getStyleClass().setAll("toggle-icon4");
+        settings.setGraphic(SVG.dotsVertical(Theme.blackFillBinding(), -1, -1));
+        right.getChildren().setAll(settings);
+        root.setRight(right);
+
+        stackPane.setStyle("-fx-padding: 10 16 10 16;");
+        stackPane.getStyleClass().setAll("transparent");
+        stackPane.setPickOnBounds(false);
+        stackPane.getChildren().setAll(root);
+
+        getChildren().setAll(stackPane);
+    }
+}

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

@@ -18,11 +18,13 @@
 package org.jackhuang.hmcl.ui.construct;
 
 import javafx.scene.Node;
+import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
 import javafx.scene.text.Text;
+import org.jackhuang.hmcl.util.Lang;
 
 /**
  * @author huangyuhui
@@ -48,6 +50,13 @@ public class ClassTitle extends StackPane {
         getStyleClass().add("class-title");
     }
 
+    public ClassTitle(String text, Node rightNode) {
+        this(Lang.apply(new BorderPane(), borderPane -> {
+            borderPane.setLeft(Lang.apply(new VBox(), vBox -> vBox.getChildren().setAll(new Text(text))));
+            borderPane.setRight(rightNode);
+        }));
+    }
+
     public Node getContent() {
         return content;
     }

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

@@ -18,6 +18,7 @@
 package org.jackhuang.hmcl.ui.construct;
 
 import javafx.beans.DefaultProperty;
+import javafx.beans.binding.Bindings;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -26,12 +27,15 @@ import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.scene.Node;
+import javafx.scene.control.Control;
+import javafx.scene.control.Skin;
+import javafx.scene.control.SkinBase;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
+import org.jackhuang.hmcl.util.MappedObservableList;
 
 @DefaultProperty("content")
-public class ComponentList extends StackPane {
-    private final VBox vbox = new VBox();
+public class ComponentList extends Control {
     private final StringProperty title = new SimpleStringProperty(this, "title", "Group");
     private final StringProperty subtitle = new SimpleStringProperty(this, "subtitle", "");
     private final IntegerProperty depth = new SimpleIntegerProperty(this, "depth", 0);
@@ -39,30 +43,9 @@ public class ComponentList extends StackPane {
     public final ObservableList<Node> content = FXCollections.observableArrayList();
 
     public ComponentList() {
-        getChildren().setAll(vbox);
-        content.addListener((ListChangeListener<? super Node>) change -> {
-            while (change.next()) {
-                for (int i = change.getFrom(); i < change.getTo(); ++i)
-                    addChildren(change.getList().get(i));
-            }
-        });
         getStyleClass().add("options-list");
     }
 
-    public void addChildren(Node node) {
-        if (node instanceof ComponentList) {
-            node.getProperties().put("title", ((ComponentList) node).getTitle());
-            node.getProperties().put("subtitle", ((ComponentList) node).getSubtitle());
-        }
-        StackPane child = new StackPane();
-        child.getChildren().add(new ComponentListCell(node));
-        if (vbox.getChildren().isEmpty())
-            child.getStyleClass().add("options-list-item-ahead");
-        else
-            child.getStyleClass().add("options-list-item");
-        vbox.getChildren().add(child);
-    }
-
     public String getTitle() {
         return title.get();
     }
@@ -110,4 +93,30 @@ public class ComponentList extends StackPane {
     public ObservableList<Node> getContent() {
         return content;
     }
+
+    @Override
+    protected javafx.scene.control.Skin<?> createDefaultSkin() {
+        return new Skin(this);
+    }
+
+    protected static class Skin extends SkinBase<ComponentList> {
+        private final ObservableList<Node> list;
+
+        protected Skin(ComponentList control) {
+            super(control);
+
+            list = MappedObservableList.create(control.getContent(), this::mapper);
+
+            VBox vbox = new VBox();
+            Bindings.bindContent(vbox.getChildren(), list);
+            getChildren().setAll(vbox);
+        }
+
+        private Node mapper(Node node) {
+            StackPane child = new StackPane();
+            child.getChildren().add(new ComponentListCell(node));
+            child.getStyleClass().add("options-list-item");
+            return child;
+        }
+    }
 }

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

@@ -27,6 +27,8 @@ import javafx.beans.property.SimpleBooleanProperty;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.shape.Rectangle;
@@ -38,13 +40,13 @@ import org.jackhuang.hmcl.ui.SVG;
 /**
  * @author huangyuhui
  */
-public class ComponentListCell extends StackPane {
+class ComponentListCell extends StackPane {
     private final Node content;
     private Animation expandAnimation;
     private Rectangle clipRect;
     private final BooleanProperty expanded = new SimpleBooleanProperty(this, "expanded", false);
 
-    public ComponentListCell(Node content) {
+    ComponentListCell(Node content) {
         this.content = content;
 
         updateLayout();
@@ -75,31 +77,47 @@ public class ComponentListCell extends StackPane {
             content.getStyleClass().remove("options-list");
             content.getStyleClass().add("options-sublist");
 
-            StackPane groupNode = new StackPane();
+            BorderPane groupNode = new BorderPane();
             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();
-            Label label = new Label();
-            label.textProperty().bind(list.titleProperty());
-            label.setMouseTransparent(true);
-            labelVBox.getChildren().add(label);
 
-            if (list.isHasSubtitle()) {
-                Label subtitleLabel = new Label();
-                subtitleLabel.textProperty().bind(list.subtitleProperty());
-                subtitleLabel.setMouseTransparent(true);
-                subtitleLabel.getStyleClass().add("subtitle-label");
-                labelVBox.getChildren().add(subtitleLabel);
+            if (list instanceof ComponentSublist) {
+                Node leftNode = ((ComponentSublist) list).getHeaderLeft();
+                if (leftNode != null)
+                    labelVBox.getChildren().setAll(leftNode);
+            } else {
+                Label label = new Label();
+                label.textProperty().bind(list.titleProperty());
+                label.setMouseTransparent(true);
+                labelVBox.getChildren().add(label);
+
+                if (list.isHasSubtitle()) {
+                    Label subtitleLabel = new Label();
+                    subtitleLabel.textProperty().bind(list.subtitleProperty());
+                    subtitleLabel.setMouseTransparent(true);
+                    subtitleLabel.getStyleClass().add("subtitle-label");
+                    labelVBox.getChildren().add(subtitleLabel);
+                }
             }
 
-            StackPane.setAlignment(labelVBox, Pos.CENTER_LEFT);
-            groupNode.getChildren().setAll(labelVBox, expandButton);
+            groupNode.setLeft(labelVBox);
+
+            HBox right = new HBox();
+            if (list instanceof ComponentSublist) {
+                Node rightNode = ((ComponentSublist) list).getHeaderRight();
+                if (rightNode != null)
+                    right.getChildren().add(rightNode);
+            }
+            right.getChildren().add(expandButton);
+            groupNode.setRight(right);
+            labelVBox.setAlignment(Pos.CENTER_LEFT);
+            right.setAlignment(Pos.CENTER_RIGHT);
 
             VBox container = new VBox();
             container.setStyle("-fx-padding: 8 0 0 0;");

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

@@ -0,0 +1,41 @@
+package org.jackhuang.hmcl.ui.construct;
+
+import javafx.beans.DefaultProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.Node;
+
+@DefaultProperty("content")
+public final class ComponentSublist extends ComponentList {
+
+    private final ObjectProperty<Node> headerLeft = new SimpleObjectProperty<>(this, "headerLeft");
+    private final ObjectProperty<Node> headerRight = new SimpleObjectProperty<>(this, "headerRight");
+
+    public ComponentSublist() {
+        super();
+    }
+
+    public Node getHeaderLeft() {
+        return headerLeft.get();
+    }
+
+    public ObjectProperty<Node> headerLeftProperty() {
+        return headerLeft;
+    }
+
+    public void setHeaderLeft(Node headerLeft) {
+        this.headerLeft.set(headerLeft);
+    }
+
+    public Node getHeaderRight() {
+        return headerRight.get();
+    }
+
+    public ObjectProperty<Node> headerRightProperty() {
+        return headerRight;
+    }
+
+    public void setHeaderRight(Node headerRight) {
+        this.headerRight.set(headerRight);
+    }
+}

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

@@ -15,26 +15,30 @@
  * 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;
+package org.jackhuang.hmcl.ui.construct;
 
-import org.jackhuang.hmcl.download.DefaultGameBuilder;
-import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.task.Task;
+import javafx.event.Event;
+import javafx.event.EventTarget;
+import javafx.event.EventType;
+import javafx.scene.layout.Region;
+import org.jackhuang.hmcl.ui.Controllers;
 
 /**
- * @author huangyuhui
+ * Indicates a close operation on the dialog.
+ *
+ * @author yushijinhun
+ * @see Controllers#dialog(Region)
  */
-public class HMCLGameBuilder extends DefaultGameBuilder {
-    private final Profile profile;
+public class DialogCloseEvent extends Event {
 
-    public HMCLGameBuilder(Profile profile) {
-        super(profile.getDependency());
+    public static final EventType<DialogCloseEvent> CLOSE = new EventType<>("DIALOG_CLOSE");
 
-        this.profile = profile;
+    public DialogCloseEvent() {
+        super(CLOSE);
     }
 
-    @Override
-    protected Task downloadGameAsync(String gameVersion, Version version) {
-        return new HMCLGameDownloadTask(profile, gameVersion, version);
+    public DialogCloseEvent(Object source, EventTarget target) {
+        super(source, target, CLOSE);
     }
+
 }

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

@@ -18,7 +18,8 @@
 package org.jackhuang.hmcl.ui.construct;
 
 import com.jfoenix.controls.JFXButton;
-import javafx.beans.property.Property;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.scene.control.Label;
@@ -26,46 +27,69 @@ import javafx.scene.control.Tooltip;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.VBox;
 import javafx.stage.DirectoryChooser;
-import org.jackhuang.hmcl.Main;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
 
 import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public class FileItem extends BorderPane {
-    private Property<String> property;
-    private final Label x = new Label();
+    private final Label lblPath = new Label();
 
     private final SimpleStringProperty name = new SimpleStringProperty(this, "name");
     private final SimpleStringProperty title = new SimpleStringProperty(this, "title");
     private final SimpleStringProperty tooltip = new SimpleStringProperty(this, "tooltip");
+    private final SimpleStringProperty path = new SimpleStringProperty(this, "path");
+    private final SimpleBooleanProperty convertToRelativePath = new SimpleBooleanProperty(this, "convertToRelativePath");
 
     public FileItem() {
         VBox left = new VBox();
         Label name = new Label();
         name.textProperty().bind(nameProperty());
-        x.getStyleClass().addAll("subtitle-label");
-        left.getChildren().addAll(name, x);
+        lblPath.getStyleClass().addAll("subtitle-label");
+        lblPath.textProperty().bind(path);
+        left.getChildren().addAll(name, lblPath);
         setLeft(left);
 
         JFXButton right = new JFXButton();
         right.setGraphic(SVG.pencil(Theme.blackFillBinding(), 15, 15));
         right.getStyleClass().add("toggle-icon4");
         right.setOnMouseClicked(e -> onExplore());
-        FXUtils.installTooltip(right, Main.i18n("button.edit"));
+        FXUtils.installTooltip(right, i18n("button.edit"));
         setRight(right);
 
         Tooltip tip = new Tooltip();
         tip.textProperty().bind(tooltipProperty());
         Tooltip.install(this, tip);
+
+        convertToRelativePath.addListener(onInvalidating(() -> path.set(processPath(path.get()))));
+    }
+
+    /**
+     * Converts the given path to absolute/relative(if possible) path according to {@link #convertToRelativePathProperty()}.
+     */
+    private String processPath(String path) {
+        Path given = Paths.get(path).toAbsolutePath();
+        if (isConvertToRelativePath()) {
+            try {
+                return Paths.get(".").normalize().toAbsolutePath().relativize(given).normalize().toString();
+            } catch (IllegalArgumentException e) {
+                // the given path can't be relativized against current path
+            }
+        }
+        return given.normalize().toString();
     }
 
     public void onExplore() {
         DirectoryChooser chooser = new DirectoryChooser();
-        if (property.getValue() != null) {
-            File file = new File(property.getValue());
+        if (path.get() != null) {
+            File file = new File(path.get());
             if (file.exists()) {
                 if (file.isFile())
                     file = file.getAbsoluteFile().getParentFile();
@@ -76,16 +100,12 @@ public class FileItem extends BorderPane {
         }
         chooser.titleProperty().bind(titleProperty());
         File selectedDir = chooser.showDialog(Controllers.getStage());
-        if (selectedDir != null)
-            property.setValue(selectedDir.getAbsolutePath());
+        if (selectedDir != null) {
+            path.set(processPath(selectedDir.toString()));
+        }
         chooser.titleProperty().unbind();
     }
 
-    public void setProperty(Property<String> property) {
-        this.property = property;
-        x.textProperty().bind(property);
-    }
-
     public String getName() {
         return name.get();
     }
@@ -121,4 +141,28 @@ public class FileItem extends BorderPane {
     public void setTooltip(String tooltip) {
         this.tooltip.set(tooltip);
     }
+
+    public String getPath() {
+        return path.get();
+    }
+
+    public StringProperty pathProperty() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path.set(path);
+    }
+
+    public boolean isConvertToRelativePath() {
+        return convertToRelativePath.get();
+    }
+
+    public BooleanProperty convertToRelativePathProperty() {
+        return convertToRelativePath;
+    }
+
+    public void setConvertToRelativePath(boolean convertToRelativePath) {
+        this.convertToRelativePath.set(convertToRelativePath);
+    }
 }

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

@@ -19,16 +19,14 @@ package org.jackhuang.hmcl.ui.construct;
 
 import com.jfoenix.controls.JFXComboBox;
 import javafx.beans.NamedArg;
-import javafx.collections.FXCollections;
 import javafx.scene.control.ListCell;
 import javafx.scene.text.Font;
 
 public class FontComboBox extends JFXComboBox<String> {
+    private boolean loaded = false;
 
     public FontComboBox(@NamedArg(value = "fontSize", defaultValue = "12.0") double fontSize,
                         @NamedArg(value = "enableStyle", defaultValue = "false") boolean enableStyle) {
-        super(FXCollections.observableArrayList(Font.getFamilies()));
-
         valueProperty().addListener((a, b, newValue) -> {
             if (enableStyle)
                 setStyle("-fx-font-family: \"" + newValue + "\";");
@@ -44,5 +42,16 @@ public class FontComboBox extends JFXComboBox<String> {
                 }
             }
         });
+
+        setOnMouseClicked(e -> {
+            if (loaded) return;
+            getItems().setAll(Font.getFamilies());
+            loaded = true;
+        });
+    }
+
+    public void initValue(Font font) {
+        getItems().setAll(font.getFamily());
+        getSelectionModel().select(font.getFamily());
     }
 }

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

@@ -23,24 +23,37 @@ import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
 
 public class IconedItem extends RipplerContainer {
-    private final Node icon;
-    private final String text;
+
+    private Label label;
 
     public IconedItem(Node icon, String text) {
-        super(createHBox(icon, text));
-        this.icon = icon;
-        this.text = text;
+        this(icon);
+        label.setText(text);
     }
 
-    private static HBox createHBox(Node icon, String text) {
+    public IconedItem(Node icon) {
+        super(createHBox(icon));
+        label = ((Label) lookup("#label"));
+        getStyleClass().setAll("iconed-item");
+    }
+
+    private static HBox createHBox(Node icon) {
         HBox hBox = new HBox();
-        icon.setMouseTransparent(true);
-        Label textLabel = new Label(text);
-        textLabel.setAlignment(Pos.CENTER);
+
+        if (icon != null) {
+            icon.setMouseTransparent(true);
+            hBox.getChildren().add(icon);
+        }
+
+        hBox.getStyleClass().setAll("iconed-item-container");
+        Label textLabel = new Label();
+        textLabel.setId("label");
         textLabel.setMouseTransparent(true);
-        hBox.getChildren().addAll(icon, textLabel);
-        hBox.setStyle("-fx-padding: 10 16 10 16; -fx-spacing: 10; -fx-font-size: 14;");
-        hBox.setAlignment(Pos.CENTER_LEFT);
+        hBox.getChildren().addAll(textLabel);
         return hBox;
     }
+
+    public Label getLabel() {
+        return label;
+    }
 }

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

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

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

@@ -15,20 +15,20 @@ import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.Main;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
 
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
 @DefaultProperty("image")
 public final class ImagePickerItem extends BorderPane {
 
     private final ImageView imageView;
-    private final JFXButton selectButton;
-    private final Label label;
 
     private final StringProperty title = new SimpleStringProperty(this, "title");
     private final ObjectProperty<EventHandler<? super MouseEvent>> onSelectButtonClicked = new SimpleObjectProperty<>(this, "onSelectButtonClicked");
+    private final ObjectProperty<EventHandler<? super MouseEvent>> onDeleteButtonClicked = new SimpleObjectProperty<>(this, "onDeleteButtonClicked");
     private final ObjectProperty<Image> image = new SimpleObjectProperty<>(this, "image");
 
     public ImagePickerItem() {
@@ -36,21 +36,26 @@ public final class ImagePickerItem extends BorderPane {
         imageView.setSmooth(false);
         imageView.setPreserveRatio(true);
 
-        selectButton = new JFXButton();
+        JFXButton selectButton = new JFXButton();
         selectButton.setGraphic(SVG.pencil(Theme.blackFillBinding(), 15, 15));
         selectButton.onMouseClickedProperty().bind(onSelectButtonClicked);
         selectButton.getStyleClass().add("toggle-icon4");
 
-        FXUtils.installTooltip(selectButton, Main.i18n("button.edit"));
+        JFXButton deleteButton = new JFXButton();
+        deleteButton.setGraphic(SVG.close(Theme.blackFillBinding(), 15, 15));
+        deleteButton.onMouseClickedProperty().bind(onDeleteButtonClicked);
+        deleteButton.getStyleClass().add("toggle-icon4");
+
+        FXUtils.installTooltip(selectButton, i18n("button.edit"));
 
         HBox hBox = new HBox();
-        hBox.getChildren().setAll(imageView, selectButton);
+        hBox.getChildren().setAll(imageView, selectButton, deleteButton);
         hBox.setAlignment(Pos.CENTER_RIGHT);
         hBox.setSpacing(8);
         setRight(hBox);
 
         VBox vBox = new VBox();
-        label = new Label();
+        Label label = new Label();
         label.textProperty().bind(title);
         vBox.getChildren().setAll(label);
         vBox.setAlignment(Pos.CENTER_LEFT);
@@ -83,6 +88,18 @@ public final class ImagePickerItem extends BorderPane {
         this.onSelectButtonClicked.set(onSelectButtonClicked);
     }
 
+    public EventHandler<? super MouseEvent> getOnDeleteButtonClicked() {
+        return onDeleteButtonClicked.get();
+    }
+
+    public ObjectProperty<EventHandler<? super MouseEvent>> onDeleteButtonClickedProperty() {
+        return onDeleteButtonClicked;
+    }
+
+    public void setOnDeleteButtonClicked(EventHandler<? super MouseEvent> onDeleteButtonClicked) {
+        this.onDeleteButtonClicked.set(onDeleteButtonClicked);
+    }
+
     public Image getImage() {
         return image.get();
     }

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

@@ -18,18 +18,15 @@
 package org.jackhuang.hmcl.ui.construct;
 
 import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXDialog;
 import com.jfoenix.controls.JFXTextField;
+import javafx.beans.binding.Bindings;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.ui.FXUtils;
-
-import java.util.function.Consumer;
+import org.jackhuang.hmcl.util.FutureCallback;
 
 public class InputDialogPane extends StackPane {
-    private final String text;
-    private final JFXDialog dialog;
 
     @FXML
     private JFXButton acceptButton;
@@ -39,17 +36,28 @@ public class InputDialogPane extends StackPane {
     private JFXTextField textField;
     @FXML
     private Label content;
+    @FXML
+    private Label lblCreationWarning;
 
-    public InputDialogPane(String text, JFXDialog dialog, Consumer<String> onResult) {
-        this.text = text;
-        this.dialog = dialog;
-
+    public InputDialogPane(String text, FutureCallback<String> onResult) {
         FXUtils.loadFXML(this, "/assets/fxml/input-dialog.fxml");
         content.setText(text);
-        cancelButton.setOnMouseClicked(e -> dialog.close());
+        cancelButton.setOnMouseClicked(e -> fireEvent(new DialogCloseEvent()));
         acceptButton.setOnMouseClicked(e -> {
-            onResult.accept(textField.getText());
-            dialog.close();
+            onResult.call(textField.getText(), () -> {
+                fireEvent(new DialogCloseEvent());
+            }, msg -> {
+                lblCreationWarning.setText(msg);
+            });
         });
+
+        acceptButton.disableProperty().bind(Bindings.createBooleanBinding(
+                () -> !textField.validate(),
+                textField.textProperty()
+        ));
+    }
+
+    public void setInitialText(String text) {
+        textField.setText(text);
     }
 }

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

@@ -20,16 +20,18 @@ package org.jackhuang.hmcl.ui.construct;
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.TextInputDialog;
-import org.jackhuang.hmcl.Main;
+import org.jackhuang.hmcl.ui.FXUtils;
 
 import javax.swing.*;
 import java.util.Optional;
 
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
 public final class MessageBox {
     private MessageBox() {
     }
 
-    private static final String TITLE = Main.i18n("message.info");
+    private static final String TITLE = i18n("message.info");
 
     /**
      * User Operation: Yes
@@ -123,30 +125,32 @@ public final class MessageBox {
     }
 
     public static int confirm(String message, String title, int option) {
-        Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
-        alert.setTitle(title);
-        alert.setHeaderText(title);
-        alert.setContentText(message);
-        switch (option) {
-            case YES_NO_OPTION:
-                alert.getButtonTypes().setAll(ButtonType.YES, ButtonType.NO);
-                break;
-            case YES_NO_CANCEL_OPTION:
-                alert.getButtonTypes().setAll(ButtonType.YES, ButtonType.NO, ButtonType.CANCEL);
-                break;
-            case OK_CANCEL_OPTION:
-                alert.getButtonTypes().setAll(ButtonType.OK, ButtonType.CANCEL);
-                break;
-            default:
-                throw new IllegalArgumentException("Unrecognized message box option " + option);
-        }
-        Optional<ButtonType> buttonType = alert.showAndWait();
-        if (!buttonType.isPresent()) return CLOSED_OPTION;
-        else if (buttonType.get() == ButtonType.OK) return OK_OPTION;
-        else if (buttonType.get() == ButtonType.YES) return YES_OPTION;
-        else if (buttonType.get() == ButtonType.NO) return NO_OPTION;
-        else if (buttonType.get() == ButtonType.CANCEL) return CANCEL_OPTION;
-        else throw new IllegalStateException("Unrecognized button type:" + buttonType.get());
+        return FXUtils.runInUIThread(() -> {
+            Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
+            alert.setTitle(title);
+            alert.setHeaderText(title);
+            alert.setContentText(message);
+            switch (option) {
+                case YES_NO_OPTION:
+                    alert.getButtonTypes().setAll(ButtonType.YES, ButtonType.NO);
+                    break;
+                case YES_NO_CANCEL_OPTION:
+                    alert.getButtonTypes().setAll(ButtonType.YES, ButtonType.NO, ButtonType.CANCEL);
+                    break;
+                case OK_CANCEL_OPTION:
+                    alert.getButtonTypes().setAll(ButtonType.OK, ButtonType.CANCEL);
+                    break;
+                default:
+                    throw new IllegalArgumentException("Unrecognized message box option " + option);
+            }
+            Optional<ButtonType> buttonType = alert.showAndWait();
+            if (!buttonType.isPresent()) return CLOSED_OPTION;
+            else if (buttonType.get() == ButtonType.OK) return OK_OPTION;
+            else if (buttonType.get() == ButtonType.YES) return YES_OPTION;
+            else if (buttonType.get() == ButtonType.NO) return NO_OPTION;
+            else if (buttonType.get() == ButtonType.CANCEL) return CANCEL_OPTION;
+            else throw new IllegalStateException("Unexpected button type:" + buttonType.get());
+        });
     }
 
     public static Optional<String> input(String message) {

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

@@ -18,20 +18,19 @@
 package org.jackhuang.hmcl.ui.construct;
 
 import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXDialog;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
-import org.jackhuang.hmcl.Main;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
 
 import java.util.Optional;
 
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
 public final class MessageDialogPane extends StackPane {
-    private boolean closingDialog = true;
 
     @FXML
     private JFXButton acceptButton;
@@ -46,7 +45,7 @@ public final class MessageDialogPane extends StackPane {
     @FXML
     private HBox actions;
 
-    public MessageDialogPane(String text, String title, JFXDialog dialog, int type, Runnable onAccept) {
+    public MessageDialogPane(String text, String title, int type, Runnable onAccept) {
         FXUtils.loadFXML(this, "/assets/fxml/message-dialog.fxml");
 
         if (title != null)
@@ -54,8 +53,7 @@ public final class MessageDialogPane extends StackPane {
 
         content.setText(text);
         acceptButton.setOnMouseClicked(e -> {
-            if (closingDialog)
-                dialog.close();
+            fireEvent(new DialogCloseEvent());
             Optional.ofNullable(onAccept).ifPresent(Runnable::run);
         });
 
@@ -82,23 +80,18 @@ public final class MessageDialogPane extends StackPane {
         }
     }
 
-    public MessageDialogPane(String text, String title, JFXDialog dialog, Runnable onAccept, Runnable onCancel) {
-        this(text, title, dialog, MessageBox.QUESTION_MESSAGE, onAccept);
+    public MessageDialogPane(String text, String title, Runnable onAccept, Runnable onCancel) {
+        this(text, title, MessageBox.QUESTION_MESSAGE, onAccept);
 
         cancelButton.setVisible(true);
         cancelButton.setOnMouseClicked(e -> {
-            if (closingDialog)
-                dialog.close();
+            fireEvent(new DialogCloseEvent());
             Optional.ofNullable(onCancel).ifPresent(Runnable::run);
         });
 
-        acceptButton.setText(Main.i18n("button.yes"));
-        cancelButton.setText(Main.i18n("button.no"));
+        acceptButton.setText(i18n("button.yes"));
+        cancelButton.setText(i18n("button.no"));
 
         actions.getChildren().add(cancelButton);
     }
-
-    public void disableClosingDialog() {
-        closingDialog = false;
-    }
 }

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

@@ -5,26 +5,25 @@ import com.jfoenix.controls.JFXRadioButton;
 import javafx.beans.NamedArg;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.control.Toggle;
 import javafx.scene.control.ToggleGroup;
-import javafx.scene.control.Tooltip;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
-import org.jackhuang.hmcl.Main;
 import org.jackhuang.hmcl.ui.FXUtils;
 
 import java.util.Collection;
 import java.util.Optional;
 import java.util.function.Consumer;
 
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
 public class MultiColorItem extends ComponentList {
-    private final StringProperty customTitle = new SimpleStringProperty(this, "customTitle", Main.i18n("selector.custom"));
-    private final StringProperty chooserTitle = new SimpleStringProperty(this, "chooserTitle", Main.i18n("selector.choose_file"));
+    private final StringProperty customTitle = new SimpleStringProperty(this, "customTitle", i18n("selector.custom"));
+    private final StringProperty chooserTitle = new SimpleStringProperty(this, "chooserTitle", i18n("selector.choose_file"));
 
     private final ToggleGroup group = new ToggleGroup();
     private final JFXColorPicker colorPicker = new JFXColorPicker();
@@ -58,7 +57,7 @@ public class MultiColorItem extends ComponentList {
 
         if (hasCustom)
             pane.getChildren().add(custom);
-        addChildren(pane);
+        getContent().add(pane);
 
         group.selectedToggleProperty().addListener((a, b, newValue) -> {
             if (toggleSelectedListener != null)

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

@@ -21,10 +21,7 @@ import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXRadioButton;
 import com.jfoenix.controls.JFXTextField;
 import javafx.beans.NamedArg;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
+import javafx.beans.property.*;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.geometry.Pos;
@@ -32,13 +29,11 @@ import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.control.Toggle;
 import javafx.scene.control.ToggleGroup;
-import javafx.scene.control.Tooltip;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.stage.DirectoryChooser;
 import javafx.stage.FileChooser;
-import org.jackhuang.hmcl.Main;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
@@ -46,13 +41,17 @@ import org.jackhuang.hmcl.ui.SVG;
 
 import java.io.File;
 import java.util.Collection;
+import java.util.Optional;
 import java.util.function.Consumer;
 
-public class MultiFileItem extends ComponentList {
-    private final StringProperty customTitle = new SimpleStringProperty(this, "customTitle", Main.i18n("selector.custom"));
-    private final StringProperty chooserTitle = new SimpleStringProperty(this, "chooserTitle", Main.i18n("selector.choose_file"));
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+public class MultiFileItem<T> extends ComponentList {
+    private final StringProperty customTitle = new SimpleStringProperty(this, "customTitle", i18n("selector.custom"));
+    private final StringProperty chooserTitle = new SimpleStringProperty(this, "chooserTitle", i18n("selector.choose_file"));
     private final BooleanProperty directory = new SimpleBooleanProperty(this, "directory", false);
-    private final SimpleStringProperty tooltip = new SimpleStringProperty(this, "tooltip");
+    private final ObjectProperty<T> selectedData = new SimpleObjectProperty<>(this, "selectedData");
+    private final ObjectProperty<T> fallbackData = new SimpleObjectProperty<>(this, "fallbackData");
     private final ObservableList<FileChooser.ExtensionFilter> extensionFilters = FXCollections.observableArrayList();
 
     private final ToggleGroup group = new ToggleGroup();
@@ -65,6 +64,7 @@ public class MultiFileItem extends ComponentList {
 
     private Consumer<Toggle> toggleSelectedListener;
 
+    @SuppressWarnings("unchecked")
     public MultiFileItem(@NamedArg(value = "hasCustom", defaultValue = "true") boolean hasCustom) {
         this.hasCustom = hasCustom;
 
@@ -106,27 +106,37 @@ public class MultiFileItem extends ComponentList {
 
         if (hasCustom)
             pane.getChildren().add(custom);
-        addChildren(pane);
+        getContent().add(pane);
 
         group.selectedToggleProperty().addListener((a, b, newValue) -> {
             if (toggleSelectedListener != null)
                 toggleSelectedListener.accept(newValue);
-        });
 
-        Tooltip tip = new Tooltip();
-        tip.textProperty().bind(tooltipProperty());
-        Tooltip.install(this, tip);
+            selectedData.set((T) newValue.getUserData());
+        });
+        selectedData.addListener((a, b, newValue) -> {
+            Optional<Toggle> selecting = group.getToggles().stream()
+                    .filter(it -> it.getUserData() == newValue)
+                    .findFirst();
+            if (!selecting.isPresent()) {
+                selecting = group.getToggles().stream()
+                        .filter(it -> it.getUserData() == getFallbackData())
+                        .findFirst();
+            }
+
+            selecting.ifPresent(toggle -> toggle.setSelected(true));
+        });
     }
 
     public Node createChildren(String title) {
         return createChildren(title, null);
     }
 
-    public Node createChildren(String title, Object userData) {
+    public Node createChildren(String title, T userData) {
         return createChildren(title, "", userData);
     }
 
-    public Node createChildren(String title, String subtitle, Object userData) {
+    public Node createChildren(String title, String subtitle, T userData) {
         BorderPane pane = new BorderPane();
         pane.setStyle("-fx-padding: 3;");
         FXUtils.setLimitHeight(pane, 20);
@@ -151,12 +161,9 @@ public class MultiFileItem extends ComponentList {
             pane.getChildren().add(custom);
     }
 
-    public void onExploreJavaDir() {
-        DirectoryChooser chooser = new DirectoryChooser();
-        chooser.setTitle(Main.i18n(getChooserTitle()));
-        File selectedDir = chooser.showDialog(Controllers.getStage());
-        if (selectedDir != null)
-            txtCustom.setText(selectedDir.getAbsolutePath());
+    public void loadChildren(Collection<Node> list, T customUserData) {
+        loadChildren(list);
+        setCustomUserData(customUserData);
     }
 
     public ToggleGroup getGroup() {
@@ -187,7 +194,7 @@ public class MultiFileItem extends ComponentList {
         this.chooserTitle.set(chooserTitle);
     }
 
-    public void setCustomUserData(Object userData) {
+    public void setCustomUserData(T userData) {
         radioCustom.setUserData(userData);
     }
 
@@ -231,15 +238,27 @@ public class MultiFileItem extends ComponentList {
         return extensionFilters;
     }
 
-    public String getTooltip() {
-        return tooltip.get();
+    public T getSelectedData() {
+        return selectedData.get();
     }
 
-    public StringProperty tooltipProperty() {
-        return tooltip;
+    public ObjectProperty<T> selectedDataProperty() {
+        return selectedData;
     }
 
-    public void setTooltip(String tooltip) {
-        this.tooltip.set(tooltip);
+    public void setSelectedData(T selectedData) {
+        this.selectedData.set(selectedData);
+    }
+
+    public T getFallbackData() {
+        return fallbackData.get();
+    }
+
+    public ObjectProperty<T> fallbackDataProperty() {
+        return fallbackData;
+    }
+
+    public void setFallbackData(T fallbackData) {
+        this.fallbackData.set(fallbackData);
     }
 }

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

@@ -0,0 +1,154 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
+package org.jackhuang.hmcl.ui.construct;
+
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyBooleanWrapper;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.event.Event;
+import javafx.event.EventHandler;
+import javafx.event.EventType;
+import javafx.scene.Node;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
+import org.jackhuang.hmcl.ui.animation.TransitionHandler;
+
+import java.util.Optional;
+import java.util.Stack;
+
+public class Navigator extends StackPane {
+    private static final String PROPERTY_DIALOG_CLOSE_HANDLER = Navigator.class.getName() + ".closeListener";
+
+    private final Stack<Node> stack = new Stack<>();
+    private final TransitionHandler animationHandler = new TransitionHandler(this);
+    private final ReadOnlyBooleanWrapper canGoBack = new ReadOnlyBooleanWrapper();
+
+    public Navigator(Node init) {
+        stack.push(init);
+        getChildren().setAll(init);
+    }
+
+    public void navigate(Node node) {
+        FXUtils.checkFxUserThread();
+
+        Node from = stack.peek();
+        if (from == node)
+            return;
+
+        stack.push(node);
+        fireEvent(new NavigationEvent(this, from, NavigationEvent.NAVIGATING));
+        setContent(node);
+        fireEvent(new NavigationEvent(this, node, NavigationEvent.NAVIGATED));
+
+        EventHandler<PageCloseEvent> handler = event -> close(node);
+        node.getProperties().put(PROPERTY_DIALOG_CLOSE_HANDLER, handler);
+        node.addEventHandler(PageCloseEvent.CLOSE, handler);
+    }
+
+    public void close() {
+        close(stack.peek());
+    }
+
+    @SuppressWarnings("unchecked")
+    public void close(Node from) {
+        FXUtils.checkFxUserThread();
+
+        stack.remove(from);
+        Node node = stack.peek();
+        fireEvent(new NavigationEvent(this, from, NavigationEvent.NAVIGATING));
+        setContent(node);
+        fireEvent(new NavigationEvent(this, node, NavigationEvent.NAVIGATED));
+
+        Optional.ofNullable(from.getProperties().get(PROPERTY_DIALOG_CLOSE_HANDLER))
+                .ifPresent(handler -> from.removeEventHandler(PageCloseEvent.CLOSE, (EventHandler<PageCloseEvent>) handler));
+    }
+
+    public Node getCurrentPage() {
+        return stack.peek();
+    }
+
+    public boolean canGoBack() {
+        return stack.size() > 1;
+    }
+
+    private void setContent(Node content) {
+        animationHandler.setContent(content, ContainerAnimations.FADE.getAnimationProducer());
+
+        if (content instanceof Region) {
+            ((Region) content).setMinSize(0, 0);
+            FXUtils.setOverflowHidden((Region) content, true);
+        }
+    }
+
+    public EventHandler<NavigationEvent> getOnNavigated() {
+        return onNavigated.get();
+    }
+
+    public ObjectProperty<EventHandler<NavigationEvent>> onNavigatedProperty() {
+        return onNavigated;
+    }
+
+    public void setOnNavigated(EventHandler<NavigationEvent> onNavigated) {
+        this.onNavigated.set(onNavigated);
+    }
+
+    private ObjectProperty<EventHandler<NavigationEvent>> onNavigated = new SimpleObjectProperty<EventHandler<NavigationEvent>>(this, "onNavigated") {
+        @Override
+        protected void invalidated() {
+            setEventHandler(NavigationEvent.NAVIGATED, get());
+        }
+    };
+
+    public EventHandler<NavigationEvent> getOnNavigating() {
+        return onNavigating.get();
+    }
+
+    public ObjectProperty<EventHandler<NavigationEvent>> onNavigatingProperty() {
+        return onNavigating;
+    }
+
+    public void setOnNavigating(EventHandler<NavigationEvent> onNavigating) {
+        this.onNavigating.set(onNavigating);
+    }
+
+    private ObjectProperty<EventHandler<NavigationEvent>> onNavigating = new SimpleObjectProperty<EventHandler<NavigationEvent>>(this, "onNavigating") {
+        @Override
+        protected void invalidated() {
+            setEventHandler(NavigationEvent.NAVIGATING, get());
+        }
+    };
+
+    public static class NavigationEvent extends Event {
+        public static final EventType<NavigationEvent> NAVIGATED = new EventType<>("NAVIGATED");
+        public static final EventType<NavigationEvent> NAVIGATING = new EventType<>("NAVIGATING");
+
+        private final Node node;
+
+        public NavigationEvent(Object source, Node target, EventType<? extends Event> eventType) {
+            super(source, target, eventType);
+
+            this.node = target;
+        }
+
+        public Node getNode() {
+            return node;
+        }
+    }
+}

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

@@ -1,7 +1,7 @@
 /*
  * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -15,31 +15,27 @@
  * 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;
+package org.jackhuang.hmcl.ui.construct;
 
-import org.jackhuang.hmcl.util.VersionNumber;
+import javafx.event.Event;
+import javafx.event.EventTarget;
+import javafx.event.EventType;
 
 /**
- *
- * Result: Deny if do not upgrade HMCL.
+ * Indicates a close operation on the navigator page.
  *
  * @author huangyuhui
  */
-public final class OutOfDateEvent extends Event {
-    private final VersionNumber version;
+public class PageCloseEvent extends Event {
 
-    public OutOfDateEvent(Object source, VersionNumber version) {
-        super(source);
-        this.version = version;
+    public static final EventType<PageCloseEvent> CLOSE = new EventType<>("PAGE_CLOSE");
+
+    public PageCloseEvent() {
+        super(CLOSE);
     }
 
-    public VersionNumber getVersion() {
-        return version;
-    }
-
-    @Override
-    public boolean hasResult() {
-        return true;
+    public PageCloseEvent(Object source, EventTarget target) {
+        super(source, target, CLOSE);
     }
 
 }

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

@@ -0,0 +1,61 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
+package org.jackhuang.hmcl.ui.construct;
+
+import com.jfoenix.controls.JFXSpinner;
+import javafx.beans.DefaultProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.Node;
+import javafx.scene.layout.StackPane;
+import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
+import org.jackhuang.hmcl.ui.animation.TransitionHandler;
+
+@DefaultProperty("content")
+public class SpinnerPane extends StackPane {
+    private final TransitionHandler transitionHandler = new TransitionHandler(this);
+    private final JFXSpinner spinner = new JFXSpinner();
+    private final StackPane contentPane = new StackPane();
+    private final ObjectProperty<Node> content = new SimpleObjectProperty<>(this, "content");
+
+    public SpinnerPane() {
+        getChildren().setAll(contentPane);
+
+        content.addListener((a, b, newValue) -> contentPane.getChildren().setAll(newValue));
+    }
+
+    public void showSpinner() {
+        transitionHandler.setContent(spinner, ContainerAnimations.FADE.getAnimationProducer());
+    }
+
+    public void hideSpinner() {
+        transitionHandler.setContent(contentPane, ContainerAnimations.FADE.getAnimationProducer());
+    }
+
+    public Node getContent() {
+        return content.get();
+    }
+
+    public ObjectProperty<Node> contentProperty() {
+        return content;
+    }
+
+    public void setContent(Node content) {
+        this.content.set(content);
+    }
+}

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

@@ -0,0 +1,49 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
+package org.jackhuang.hmcl.ui.construct;
+
+import javafx.scene.Node;
+import javafx.scene.layout.StackPane;
+import org.jackhuang.hmcl.util.Logging;
+
+import java.util.Stack;
+
+public class StackContainerPane extends StackPane {
+    private final Stack<Node> stack = new Stack<>();
+
+    public void push(Node node) {
+        stack.push(node);
+        getChildren().setAll(node);
+
+        Logging.LOG.info(this + " " + stack);
+    }
+
+    public void pop(Node node) {
+        boolean flag = stack.remove(node);
+        if (stack.isEmpty())
+            getChildren().setAll();
+        else
+            getChildren().setAll(stack.peek());
+
+        Logging.LOG.info(this + " " + stack + ", removed: " + flag + ", object: " + node);
+    }
+
+    public boolean isEmpty() {
+        return stack.isEmpty();
+    }
+}

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

@@ -20,18 +20,21 @@ package org.jackhuang.hmcl.ui.construct;
 import com.jfoenix.concurrency.JFXUtilities;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXProgressBar;
+import javafx.beans.binding.Bindings;
 import javafx.beans.property.StringProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
+import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.ui.FXUtils;
 
 import java.util.Optional;
+import java.util.function.Consumer;
 
 public class TaskExecutorDialogPane extends StackPane {
     private TaskExecutor executor;
-    private Runnable onCancel;
+    private Consumer<Region> onCancel;
 
     @FXML
     private JFXProgressBar progressBar;
@@ -40,24 +43,33 @@ public class TaskExecutorDialogPane extends StackPane {
     @FXML
     private Label lblSubtitle;
     @FXML
+    private Label lblProgress;
+    @FXML
     private JFXButton btnCancel;
     @FXML
     private TaskListPane taskListPane;
 
-    public TaskExecutorDialogPane(Runnable cancel) {
+    public TaskExecutorDialogPane(Consumer<Region> cancel) {
         FXUtils.loadFXML(this, "/assets/fxml/task-dialog.fxml");
 
         setCancel(cancel);
 
         btnCancel.setOnMouseClicked(e -> {
             Optional.ofNullable(executor).ifPresent(TaskExecutor::cancel);
-            onCancel.run();
+            onCancel.accept(this);
         });
+
+        lblProgress.textProperty().bind(Bindings.createStringBinding(
+                () -> taskListPane.finishedTasksProperty().get() + "/" + taskListPane.totTasksProperty().get(),
+                taskListPane.finishedTasksProperty(), taskListPane.totTasksProperty()
+        ));
     }
 
     public void setExecutor(TaskExecutor executor) {
         this.executor = executor;
-        taskListPane.setExecutor(executor);
+
+        if (executor != null)
+            taskListPane.setExecutor(executor);
     }
 
     public StringProperty titleProperty() {
@@ -91,7 +103,7 @@ public class TaskExecutorDialogPane extends StackPane {
             progressBar.setProgress(progress);
     }
 
-    public void setCancel(Runnable onCancel) {
+    public void setCancel(Consumer<Region> onCancel) {
         this.onCancel = onCancel;
 
         JFXUtilities.runInFX(() -> btnCancel.setDisable(onCancel == null));

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

@@ -19,14 +19,14 @@ package org.jackhuang.hmcl.ui.construct;
 
 import com.jfoenix.controls.JFXProgressBar;
 import javafx.application.Platform;
+import javafx.beans.property.ReadOnlyIntegerProperty;
+import javafx.beans.property.ReadOnlyIntegerWrapper;
 import javafx.scene.control.Label;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.Main;
 import org.jackhuang.hmcl.download.forge.ForgeInstallTask;
 import org.jackhuang.hmcl.download.game.GameAssetDownloadTask;
-import org.jackhuang.hmcl.download.game.GameAssetRefreshTask;
 import org.jackhuang.hmcl.download.liteloader.LiteLoaderInstallTask;
 import org.jackhuang.hmcl.download.optifine.OptiFineInstallTask;
 import org.jackhuang.hmcl.game.HMCLModpackExportTask;
@@ -39,9 +39,13 @@ import org.jackhuang.hmcl.task.TaskListener;
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
 public final class TaskListPane extends StackPane {
     private final AdvancedListBox listBox = new AdvancedListBox();
     private final Map<Task, ProgressListNode> nodes = new HashMap<>();
+    private final ReadOnlyIntegerWrapper finishedTasks = new ReadOnlyIntegerWrapper();
+    private final ReadOnlyIntegerWrapper totTasks = new ReadOnlyIntegerWrapper();
 
     public TaskListPane() {
         listBox.setSpacing(0);
@@ -49,11 +53,28 @@ public final class TaskListPane extends StackPane {
         getChildren().setAll(listBox);
     }
 
+    public ReadOnlyIntegerProperty finishedTasksProperty() {
+        return finishedTasks.getReadOnlyProperty();
+    }
+
+    public ReadOnlyIntegerProperty totTasksProperty() {
+        return totTasks.getReadOnlyProperty();
+    }
+
     public void setExecutor(TaskExecutor executor) {
         executor.addTaskListener(new TaskListener() {
             @Override
             public void onStart() {
-                Platform.runLater(listBox::clear);
+                Platform.runLater(() -> {
+                    listBox.clear();
+                    finishedTasks.set(0);
+                    totTasks.set(0);
+                });
+            }
+
+            @Override
+            public void onReady(Task task) {
+                Platform.runLater(() -> totTasks.set(totTasks.getValue() + 1));
             }
 
             @Override
@@ -61,30 +82,28 @@ public final class TaskListPane extends StackPane {
                 if (!task.getSignificance().shouldShow())
                     return;
 
-                if (task instanceof GameAssetRefreshTask) {
-                    task.setName(Main.i18n("assets.download"));
-                } else if (task instanceof GameAssetDownloadTask) {
-                    task.setName(Main.i18n("assets.download_all"));
+                if (task instanceof GameAssetDownloadTask) {
+                    task.setName(i18n("assets.download_all"));
                 } else if (task instanceof ForgeInstallTask) {
-                    task.setName(Main.i18n("install.installer.install", Main.i18n("install.installer.forge")));
+                    task.setName(i18n("install.installer.install", i18n("install.installer.forge")));
                 } else if (task instanceof LiteLoaderInstallTask) {
-                    task.setName(Main.i18n("install.installer.install", Main.i18n("install.installer.liteloader")));
+                    task.setName(i18n("install.installer.install", i18n("install.installer.liteloader")));
                 } else if (task instanceof OptiFineInstallTask) {
-                    task.setName(Main.i18n("install.installer.install", Main.i18n("install.installer.optifine")));
+                    task.setName(i18n("install.installer.install", i18n("install.installer.optifine")));
                 } else if (task instanceof CurseCompletionTask) {
-                    task.setName(Main.i18n("modpack.type.curse.completion"));
+                    task.setName(i18n("modpack.type.curse.completion"));
                 } else if (task instanceof ModpackInstallTask) {
-                    task.setName(Main.i18n("modpack.installing"));
+                    task.setName(i18n("modpack.installing"));
                 } else if (task instanceof CurseInstallTask) {
-                    task.setName(Main.i18n("modpack.install", Main.i18n("modpack.type.curse")));
+                    task.setName(i18n("modpack.install", i18n("modpack.type.curse")));
                 } else if (task instanceof MultiMCModpackInstallTask) {
-                    task.setName(Main.i18n("modpack.install", Main.i18n("modpack.type.multimc")));
+                    task.setName(i18n("modpack.install", i18n("modpack.type.multimc")));
                 } else if (task instanceof HMCLModpackInstallTask) {
-                    task.setName(Main.i18n("modpack.install", Main.i18n("modpack.type.hmcl")));
+                    task.setName(i18n("modpack.install", i18n("modpack.type.hmcl")));
                 } else if (task instanceof HMCLModpackExportTask) {
-                    task.setName(Main.i18n("modpack.export"));
+                    task.setName(i18n("modpack.export"));
                 } else if (task instanceof MinecraftInstanceTask) {
-                    task.setName(Main.i18n("modpack.scan"));
+                    task.setName(i18n("modpack.scan"));
                 }
 
                 ProgressListNode node = new ProgressListNode(task);
@@ -99,7 +118,10 @@ public final class TaskListPane extends StackPane {
                 if (node == null)
                     return;
                 node.unbind();
-                Platform.runLater(() -> listBox.remove(node));
+                Platform.runLater(() -> {
+                    listBox.remove(node);
+                    finishedTasks.set(finishedTasks.getValue() + 1);
+                });
             }
 
             @Override
@@ -107,7 +129,10 @@ public final class TaskListPane extends StackPane {
                 ProgressListNode node = nodes.remove(task);
                 if (node == null)
                     return;
-                Platform.runLater(() -> node.setThrowable(throwable));
+                Platform.runLater(() -> {
+                    node.setThrowable(throwable);
+                    finishedTasks.set(finishedTasks.getValue() + 1);
+                });
             }
         });
     }

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

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

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

@@ -1,7 +1,6 @@
 package org.jackhuang.hmcl.ui.construct;
 
 import com.jfoenix.validation.base.ValidatorBase;
-import javafx.beans.NamedArg;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.control.TextInputControl;
@@ -17,10 +16,6 @@ public class URLValidator extends ValidatorBase {
         super();
     }
 
-    public URLValidator(@NamedArg("message") String message) {
-        super(message);
-    }
-
     public ObservableList<String> getProtocols() {
         return protocols;
     }

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

@@ -0,0 +1,201 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
+package org.jackhuang.hmcl.ui.decorator;
+
+import javafx.beans.property.*;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+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.layout.Background;
+import javafx.scene.layout.StackPane;
+import javafx.stage.Stage;
+import javafx.stage.StageStyle;
+
+public class DecoratorControl extends Control {
+    private final ListProperty<Node> drawer = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<Node> content = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<Node> container = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ObjectProperty<Background> contentBackground = new SimpleObjectProperty<>();
+    private final StringProperty title = new SimpleStringProperty();
+    private final StringProperty drawerTitle = new SimpleStringProperty();
+    private final ObjectProperty<Runnable> onCloseButtonAction = new SimpleObjectProperty<>();
+    private final ObjectProperty<EventHandler<ActionEvent>> onCloseNavButtonAction = new SimpleObjectProperty<>();
+    private final ObjectProperty<EventHandler<ActionEvent>> onBackNavButtonAction = new SimpleObjectProperty<>();
+    private final ObjectProperty<EventHandler<ActionEvent>> onRefreshNavButtonAction = new SimpleObjectProperty<>();
+    private final BooleanProperty closeNavButtonVisible = new SimpleBooleanProperty(true);
+    private final BooleanProperty canRefresh = new SimpleBooleanProperty(false);
+    private final BooleanProperty canBack = new SimpleBooleanProperty(false);
+    private final BooleanProperty canClose = new SimpleBooleanProperty(false);
+    private final Stage primaryStage;
+    private StackPane drawerWrapper;
+
+    public DecoratorControl(Stage primaryStage) {
+        this.primaryStage = primaryStage;
+
+        primaryStage.initStyle(StageStyle.UNDECORATED);
+    }
+
+    public Stage getPrimaryStage() {
+        return primaryStage;
+    }
+
+    public StackPane getDrawerWrapper() {
+        return drawerWrapper;
+    }
+
+    void setDrawerWrapper(StackPane drawerWrapper) {
+        this.drawerWrapper = drawerWrapper;
+    }
+
+    public ObservableList<Node> getDrawer() {
+        return drawer.get();
+    }
+
+    public ListProperty<Node> drawerProperty() {
+        return drawer;
+    }
+
+    public void setDrawer(ObservableList<Node> drawer) {
+        this.drawer.set(drawer);
+    }
+
+    public ObservableList<Node> getContent() {
+        return content.get();
+    }
+
+    public ListProperty<Node> contentProperty() {
+        return content;
+    }
+
+    public void setContent(ObservableList<Node> content) {
+        this.content.set(content);
+    }
+
+    public String getTitle() {
+        return title.get();
+    }
+
+    public StringProperty titleProperty() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title.set(title);
+    }
+
+    public String getDrawerTitle() {
+        return drawerTitle.get();
+    }
+
+    public StringProperty drawerTitleProperty() {
+        return drawerTitle;
+    }
+
+    public void setDrawerTitle(String drawerTitle) {
+        this.drawerTitle.set(drawerTitle);
+    }
+
+    public Runnable getOnCloseButtonAction() {
+        return onCloseButtonAction.get();
+    }
+
+    public ObjectProperty<Runnable> onCloseButtonActionProperty() {
+        return onCloseButtonAction;
+    }
+
+    public void setOnCloseButtonAction(Runnable onCloseButtonAction) {
+        this.onCloseButtonAction.set(onCloseButtonAction);
+    }
+
+    public boolean isCloseNavButtonVisible() {
+        return closeNavButtonVisible.get();
+    }
+
+    public BooleanProperty closeNavButtonVisibleProperty() {
+        return closeNavButtonVisible;
+    }
+
+    public void setCloseNavButtonVisible(boolean closeNavButtonVisible) {
+        this.closeNavButtonVisible.set(closeNavButtonVisible);
+    }
+
+    public ObservableList<Node> getContainer() {
+        return container.get();
+    }
+
+    public ListProperty<Node> containerProperty() {
+        return container;
+    }
+
+    public void setContainer(ObservableList<Node> container) {
+        this.container.set(container);
+    }
+
+    public Background getContentBackground() {
+        return contentBackground.get();
+    }
+
+    public ObjectProperty<Background> contentBackgroundProperty() {
+        return contentBackground;
+    }
+
+    public void setContentBackground(Background contentBackground) {
+        this.contentBackground.set(contentBackground);
+    }
+
+    public BooleanProperty canRefreshProperty() {
+        return canRefresh;
+    }
+
+    public BooleanProperty canBackProperty() {
+        return canBack;
+    }
+
+    public BooleanProperty canCloseProperty() {
+        return canClose;
+    }
+
+    public ObjectProperty<EventHandler<ActionEvent>> onBackNavButtonActionProperty() {
+        return onBackNavButtonAction;
+    }
+
+    public ObjectProperty<EventHandler<ActionEvent>> onCloseNavButtonActionProperty() {
+        return onCloseNavButtonAction;
+    }
+
+    public ObjectProperty<EventHandler<ActionEvent>> onRefreshNavButtonActionProperty() {
+        return onRefreshNavButtonAction;
+    }
+
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new DecoratorSkin(this);
+    }
+
+    public void minimize() {
+        primaryStage.setIconified(true);
+    }
+
+    public void close() {
+        onCloseButtonAction.get().run();
+    }
+}

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

@@ -0,0 +1,380 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
+package org.jackhuang.hmcl.ui.decorator;
+
+import com.jfoenix.controls.JFXDialog;
+import javafx.animation.Interpolator;
+import javafx.animation.KeyFrame;
+import javafx.animation.KeyValue;
+import javafx.animation.Timeline;
+import javafx.application.Platform;
+import javafx.beans.binding.Bindings;
+import javafx.event.EventHandler;
+import javafx.geometry.Insets;
+import javafx.scene.Cursor;
+import javafx.scene.Node;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.DragEvent;
+import javafx.scene.layout.*;
+import javafx.scene.paint.Color;
+import javafx.stage.Stage;
+import javafx.util.Duration;
+import org.jackhuang.hmcl.Launcher;
+import org.jackhuang.hmcl.Metadata;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDnD;
+import org.jackhuang.hmcl.setting.ConfigHolder;
+import org.jackhuang.hmcl.setting.EnumBackgroundImage;
+import org.jackhuang.hmcl.task.TaskExecutor;
+import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.account.AddAuthlibInjectorServerPane;
+import org.jackhuang.hmcl.ui.construct.*;
+import org.jackhuang.hmcl.ui.wizard.Refreshable;
+import org.jackhuang.hmcl.ui.wizard.WizardProvider;
+import org.jackhuang.hmcl.util.FutureCallback;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Locale;
+import java.util.Optional;
+import java.util.Random;
+import java.util.function.Consumer;
+import java.util.logging.Level;
+
+import static java.util.stream.Collectors.toList;
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.util.Logging.LOG;
+
+public class DecoratorController {
+    private static final String PROPERTY_DIALOG_CLOSE_HANDLER = DecoratorController.class.getName() + ".dialog.closeListener";
+
+    private final DecoratorControl decorator;
+    private final ImageView welcomeView;
+    private final Navigator navigator;
+    private final Node mainPage;
+
+    private JFXDialog dialog;
+    private StackContainerPane dialogPane;
+
+    public DecoratorController(Stage stage, Node mainPage) {
+        this.mainPage = mainPage;
+
+        decorator = new DecoratorControl(stage);
+        decorator.titleProperty().set(Metadata.TITLE);
+        decorator.setOnCloseButtonAction(Launcher::stopApplication);
+
+        navigator = new Navigator(mainPage);
+        navigator.setOnNavigating(this::onNavigating);
+        navigator.setOnNavigated(this::onNavigated);
+
+        decorator.getContent().setAll(navigator);
+        decorator.onCloseNavButtonActionProperty().set(e -> close());
+        decorator.onBackNavButtonActionProperty().set(e -> back());
+        decorator.onRefreshNavButtonActionProperty().set(e -> refresh());
+
+        welcomeView = new ImageView();
+        welcomeView.setImage(new Image("/assets/img/welcome.png"));
+        welcomeView.setCursor(Cursor.HAND);
+        welcomeView.setOnMouseClicked(e -> {
+            Timeline nowAnimation = new Timeline();
+            nowAnimation.getKeyFrames().addAll(
+                    new KeyFrame(Duration.ZERO, new KeyValue(welcomeView.opacityProperty(), 1.0D, Interpolator.EASE_BOTH)),
+                    new KeyFrame(new Duration(300), new KeyValue(welcomeView.opacityProperty(), 0.0D, Interpolator.EASE_BOTH)),
+                    new KeyFrame(new Duration(300), e2 -> decorator.getContainer().remove(welcomeView))
+            );
+            nowAnimation.play();
+        });
+        if (ConfigHolder.isNewlyCreated() && config().getLocalization().getLocale() == Locale.CHINA)
+            decorator.getContainer().setAll(welcomeView);
+
+        setupBackground();
+
+        setupAuthlibInjectorDnD();
+    }
+
+    public DecoratorControl getDecorator() {
+        return decorator;
+    }
+
+    // ==== Background ====
+
+    private void setupBackground() {
+        decorator.backgroundProperty().bind(
+                Bindings.createObjectBinding(
+                        () -> {
+                            Image image = null;
+                            if (config().getBackgroundImageType() == EnumBackgroundImage.CUSTOM && config().getBackgroundImage() != null) {
+                                image = tryLoadImage(Paths.get(config().getBackgroundImage()))
+                                        .orElse(null);
+                            }
+                            if (image == null) {
+                                image = loadDefaultBackgroundImage();
+                            }
+                            return new Background(new BackgroundImage(image, BackgroundRepeat.NO_REPEAT, BackgroundRepeat.NO_REPEAT, BackgroundPosition.DEFAULT, new BackgroundSize(800, 480, false, false, true, true)));
+                        },
+                        config().backgroundImageTypeProperty(),
+                        config().backgroundImageProperty()));
+    }
+
+    private Image defaultBackground = new Image("/assets/img/background.jpg");
+
+    /**
+     * Load background image from bg/, background.png, background.jpg
+     */
+    private Image loadDefaultBackgroundImage() {
+        Optional<Image> image = randomImageIn(Paths.get("bg"));
+        if (!image.isPresent()) {
+            image = tryLoadImage(Paths.get("background.png"));
+        }
+        if (!image.isPresent()) {
+            image = tryLoadImage(Paths.get("background.jpg"));
+        }
+        return image.orElse(defaultBackground);
+    }
+
+    private Optional<Image> randomImageIn(Path imageDir) {
+        if (!Files.isDirectory(imageDir)) {
+            return Optional.empty();
+        }
+
+        List<Path> candidates;
+        try {
+            candidates = Files.list(imageDir)
+                    .filter(Files::isRegularFile)
+                    .filter(it -> {
+                        String filename = it.getFileName().toString();
+                        return filename.endsWith(".png") || filename.endsWith(".jpg");
+                    })
+                    .collect(toList());
+        } catch (IOException e) {
+            LOG.log(Level.WARNING, "Failed to list files in ./bg", e);
+            return Optional.empty();
+        }
+
+        Random rnd = new Random();
+        while (candidates.size() > 0) {
+            int selected = rnd.nextInt(candidates.size());
+            Optional<Image> loaded = tryLoadImage(candidates.get(selected));
+            if (loaded.isPresent()) {
+                return loaded;
+            } else {
+                candidates.remove(selected);
+            }
+        }
+        return Optional.empty();
+    }
+
+    private Optional<Image> tryLoadImage(Path path) {
+        if (Files.isRegularFile(path)) {
+            try {
+                return Optional.of(new Image(path.toAbsolutePath().toUri().toString()));
+            } catch (IllegalArgumentException ignored) {
+            }
+        }
+        return Optional.empty();
+    }
+
+    // ==== Navigation ====
+
+    public Navigator getNavigator() {
+        return navigator;
+    }
+
+    private void close() {
+        if (navigator.getCurrentPage() instanceof DecoratorPage) {
+            DecoratorPage page = (DecoratorPage) navigator.getCurrentPage();
+
+            page.onForceToClose();
+        } else {
+            navigator.close();
+        }
+    }
+
+    private void back() {
+        if (navigator.getCurrentPage() instanceof DecoratorPage) {
+            DecoratorPage page = (DecoratorPage) navigator.getCurrentPage();
+
+            if (page.onClose())
+                navigator.close();
+        } else {
+            navigator.close();
+        }
+    }
+
+    private void refresh() {
+        if (navigator.getCurrentPage() instanceof Refreshable) {
+            Refreshable refreshable = (Refreshable) navigator.getCurrentPage();
+
+            if (refreshable.canRefreshProperty().get())
+                refreshable.refresh();
+        }
+    }
+
+    private void onNavigating(Navigator.NavigationEvent event) {
+        Node from = event.getNode();
+
+        if (from instanceof DecoratorPage)
+            ((DecoratorPage) from).onClose();
+    }
+
+    private void onNavigated(Navigator.NavigationEvent event) {
+        Node to = event.getNode();
+
+        if (to instanceof Refreshable) {
+            decorator.canRefreshProperty().bind(((Refreshable) to).canRefreshProperty());
+        } else {
+            decorator.canRefreshProperty().unbind();
+            decorator.canRefreshProperty().set(false);
+        }
+
+        if (to instanceof DecoratorPage) {
+            decorator.drawerTitleProperty().bind(((DecoratorPage) to).titleProperty());
+            decorator.canCloseProperty().set(((DecoratorPage) to).canForceToClose());
+        } else {
+            decorator.drawerTitleProperty().unbind();
+            decorator.drawerTitleProperty().set("");
+            decorator.canCloseProperty().set(false);
+        }
+
+        decorator.canBackProperty().set(navigator.canGoBack());
+
+        if (navigator.canGoBack()) {
+            decorator.setContentBackground(new Background(new BackgroundFill(Color.rgb(244, 244, 244, 0.5), CornerRadii.EMPTY, Insets.EMPTY)));
+        } else {
+            decorator.setContentBackground(null);
+        }
+
+        if (to instanceof Region) {
+            Region region = (Region) to;
+            // Let root pane fix window size.
+            StackPane parent = (StackPane) region.getParent();
+            region.prefWidthProperty().bind(parent.widthProperty());
+            region.prefHeightProperty().bind(parent.heightProperty());
+        }
+    }
+
+    // ==== Dialog ====
+
+    public void showDialog(Node node) {
+        FXUtils.checkFxUserThread();
+
+        if (dialog == null) {
+            if (decorator.getDrawerWrapper() == null) {
+                // Sometimes showDialog will be invoked before decorator was initialized.
+                // Keep trying again.
+                Platform.runLater(() -> showDialog(node));
+                return;
+            }
+
+            dialog = new JFXDialog();
+            dialogPane = new StackContainerPane();
+
+            dialog.setContent(dialogPane);
+            dialog.setDialogContainer(decorator.getDrawerWrapper());
+            dialog.setOverlayClose(false);
+            dialog.show();
+        }
+
+        dialogPane.push(node);
+
+        EventHandler<DialogCloseEvent> handler = event -> closeDialog(node);
+        node.getProperties().put(PROPERTY_DIALOG_CLOSE_HANDLER, handler);
+        node.addEventHandler(DialogCloseEvent.CLOSE, handler);
+    }
+
+    @SuppressWarnings("unchecked")
+    private void closeDialog(Node node) {
+        FXUtils.checkFxUserThread();
+
+        Optional.ofNullable(node.getProperties().get(PROPERTY_DIALOG_CLOSE_HANDLER))
+                .ifPresent(handler -> node.removeEventHandler(DialogCloseEvent.CLOSE, (EventHandler<DialogCloseEvent>) handler));
+
+        if (dialog != null) {
+            dialogPane.pop(node);
+
+            if (dialogPane.getChildren().isEmpty()) {
+                dialog.close();
+                dialog = null;
+                dialogPane = null;
+            }
+        }
+    }
+
+    public void showDialog(String text) {
+        showDialog(text, null);
+    }
+
+    public void showDialog(String text, String title) {
+        showDialog(text, title, MessageBox.INFORMATION_MESSAGE);
+    }
+
+    public void showDialog(String text, String title, int type) {
+        showDialog(text, title, type, null);
+    }
+
+    public void showDialog(String text, String title, int type, Runnable onAccept) {
+        showDialog(new MessageDialogPane(text, title, type, onAccept));
+    }
+
+    public void showConfirmDialog(String text, String title, Runnable onAccept, Runnable onCancel) {
+        showDialog(new MessageDialogPane(text, title, onAccept, onCancel));
+    }
+
+    public InputDialogPane showInputDialog(String text, FutureCallback<String> onResult) {
+        InputDialogPane pane = new InputDialogPane(text, onResult);
+        showDialog(pane);
+        return pane;
+    }
+
+    public Region showTaskDialog(TaskExecutor executor, String title, String subtitle) {
+        return showTaskDialog(executor, title, subtitle, null);
+    }
+
+    public Region showTaskDialog(TaskExecutor executor, String title, String subtitle, Consumer<Region> onCancel) {
+        TaskExecutorDialogPane pane = new TaskExecutorDialogPane(onCancel);
+        pane.setTitle(title);
+        pane.setSubtitle(subtitle);
+        pane.setExecutor(executor);
+        showDialog(pane);
+        return pane;
+    }
+
+    // ==== Wizard ====
+
+    public void startWizard(WizardProvider wizardProvider) {
+        startWizard(wizardProvider, null);
+    }
+
+    public void startWizard(WizardProvider wizardProvider, String category) {
+        FXUtils.checkFxUserThread();
+
+        getNavigator().navigate(new DecoratorWizardDisplayer(wizardProvider, category));
+    }
+
+    // ==== Authlib Injector DnD ====
+
+    private void setupAuthlibInjectorDnD() {
+        decorator.addEventFilter(DragEvent.DRAG_OVER, AuthlibInjectorDnD.dragOverHandler());
+        decorator.addEventFilter(DragEvent.DRAG_DROPPED, AuthlibInjectorDnD.dragDroppedHandler(
+                url -> Controllers.dialog(new AddAuthlibInjectorServerPane(url))));
+    }
+}

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

@@ -15,11 +15,21 @@
  * 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.auth;
+package org.jackhuang.hmcl.ui.decorator;
 
-/**
- * throws if wrong password or logging fails for too many times.
- * @author huangyuhui
- */
-public final class InvalidCredentialsException extends AuthenticationException {
+import javafx.beans.property.ReadOnlyStringProperty;
+
+public interface DecoratorPage {
+    ReadOnlyStringProperty titleProperty();
+
+    default boolean canForceToClose() {
+        return false;
+    }
+
+    default boolean onClose() {
+        return true;
+    }
+
+    default void onForceToClose() {
+    }
 }