Fix installing MultiMC modpack

Add doublequotes when doublequotes exist in windows batch
Add doublequotes when special characters exist in launch script. Closes #420
2018-08-18 01:12:22 +08:00 · 2018-08-18 00:43:55 +08:00 · 2018-08-18 00:32:37 +08:00 · 2018-08-17 23:48:01 +08:00 · 2018-08-17 22:11:46 +08:00 · 2018-08-17 22:10:11 +08:00
222 changed files with 7155 additions and 3937 deletions
@@ -1,163 +1,137 @@
-import org.apache.tools.ant.filters.ReplaceTokens
-import proguard.gradle.ProGuardTask
-
-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.1"
+import org.tukaani.xz.LZMA2Options
+import org.tukaani.xz.XZOutputStream

-String mavenVersion = versionroot + '.' + buildnumber
-version = mavenVersion
+def buildnumber = System.getenv("BUILD_NUMBER") ?: "SNAPSHOT"
+def versionroot = System.getenv("VERSION_ROOT") ?: "3.1"
+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(ReplaceTokens, tokens: [
-            'HELLO_MINECRAFT_LAUNCHER_VERSION_FOR_GRADLE_REPLACING': mavenVersion
-    ])
+def digest(String algorithm, byte[] bytes) {
+    return MessageDigest.getInstance(algorithm).digest(bytes)
 }

-compileJava.setSource "$buildDir/generated-src"
-compileJava.dependsOn generateSources
+def createChecksum(File file) {
+    def algorithm = "SHA-1"
+    def suffix = "sha1"
+    new File(file.parentFile, file.name + "." + suffix).text = digest(algorithm, file.bytes).encodeHex().toString() + "\n"
+}

-configurations {
-    coreCompile.extendsFrom compile
-    coreRuntime.extendsFrom runtime
+def attachSignature(File jar) {
+    def keyLocation = System.getenv("HMCL_SIGNATURE_KEY");
+    if (keyLocation == null)
+        return
+    def privatekey = KeyFactory.getInstance("RSA").generatePrivate(new PKCS8EncodedKeySpec(new File(keyLocation).bytes))
+
+    def signer = Signature.getInstance("SHA512withRSA")
+    signer.initSign(privatekey)
+    new ZipFile(jar).withCloseable { zip ->
+        zip.stream()
+                .sorted(Comparator.comparing { it.name })
+                .filter { it.name != "META-INF/hmcl_signature" }
+                .forEach {
+                    signer.update(digest("SHA-512", it.name.getBytes("UTF-8")))
+                    signer.update(digest("SHA-512", zip.getInputStream(it).bytes))
+                }
+    }
+    def signature = signer.sign()
+
+    FileSystems.newFileSystem(URI.create("jar:" + jar.toURI()), [:]).withCloseable { zipfs ->
+        Files.newOutputStream(zipfs.getPath("META-INF/hmcl_signature")).withCloseable { it << signature }
+    }
+}
+
+ext.packer = Pack200.newPacker()
+packer.properties()["pack.effort"] = "9"
+ext.unpacker = Pack200.newUnpacker()
+
+def repack(File file) {
+    def packed = new ByteArrayOutputStream()
+    new JarFile(file).withCloseable { packer.pack(it, packed) }
+    new JarOutputStream(file.newOutputStream()).withCloseable { unpacker.unpack(new ByteArrayInputStream(packed.toByteArray()), it) }
 }

 jar {
-    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
-
    manifest {
-        attributes 'Created-By'        : 'Copyright(c) 2013-2018 huangyuhui.',
-                'Main-Class'        : mainClass,
-                'Multi-Release': "true"
+        attributes 'Created-By': 'Copyright(c) 2013-2018 huangyuhui.',
+                'Main-Class': '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: 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
@@ -1,15 +0,0 @@
-target 1.8
-dontoptimize
-dontobfuscate
-
-# JFoenix
-keep class com.jfoenix.** {
-    <fields>;
-    <methods>;
-}
-
-# HMCL
-keep class org.jackhuang.** {
-    <fields>;
-    <methods>;
-}
@@ -17,27 +17,29 @@
 */
 package org.jackhuang.hmcl;

+import static org.jackhuang.hmcl.util.Lang.thread;
+import static org.jackhuang.hmcl.util.Logging.LOG;
+
 import com.jfoenix.concurrency.JFXUtilities;
 import javafx.application.Application;
 import javafx.application.Platform;
+import javafx.beans.binding.Bindings;
 import javafx.stage.Stage;
-import org.jackhuang.hmcl.setting.Settings;
+
+import org.jackhuang.hmcl.setting.ConfigHolder;
 import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.Controllers;
-import org.jackhuang.hmcl.upgrade.AppDataUpgrader;
-import org.jackhuang.hmcl.upgrade.IUpgrader;
 import org.jackhuang.hmcl.upgrade.UpdateChecker;
 import org.jackhuang.hmcl.util.*;

 import java.io.File;
+import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.Arrays;
+import java.nio.file.Paths;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.ResourceBundle;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;

@@ -55,12 +57,24 @@ public final class Launcher extends Application {
            primaryStage.setResizable(false);
            primaryStage.setScene(Controllers.getScene());

-            UPDATE_CHECKER.process(false)
-                    .then(Task.of(Schedulers.javafx(), () -> {
-                        if (UPDATE_CHECKER.isOutOfDate())
-                            Controllers.showUpdate();
-                    }))
-                    .start();
+            UpdateChecker.updateChannelProperty().addListener(observable -> {
+                thread(() -> {
+                    try {
+                        UpdateChecker.checkUpdate();
+                    } catch (IOException e) {
+                        LOG.log(Level.WARNING, "Failed to check for update", e);
+                    }
+                });
+            });
+
+            UpdateChecker.updateChannelProperty().bind(Bindings.createStringBinding(() -> {
+                switch (ConfigHolder.config().getUpdateChannel()) {
+                    case DEVELOPMENT:
+                        return UpdateChecker.CHANNEL_DEV;
+                    default:
+                        return UpdateChecker.CHANNEL_STABLE;
+                }
+            }, ConfigHolder.config().updateChannelProperty()));

            primaryStage.show();
        } catch (Throwable e) {
@@ -79,9 +93,14 @@ public final class Launcher extends Application {

            // 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 + " ***");
+            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);

            launch(args);
        } catch (Throwable e) { // Fucking JavaFX will suppress the exception and will break our crash reporter.
@@ -90,7 +109,7 @@ public final class Launcher extends Application {
    }

    public static void stopApplication() {
-        Logging.LOG.info("Stopping application.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
+        LOG.info("Stopping application.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));

        JFXUtilities.runInFX(() -> {
            if (Controllers.getStage() == null)
@@ -104,7 +123,7 @@ public final class Launcher extends Application {
    }

    public static void stopWithoutPlatform() {
-        Logging.LOG.info("Stopping application without JavaFX Toolkit.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
+        LOG.info("Stopping application without JavaFX Toolkit.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));

        JFXUtilities.runInFX(() -> {
            if (Controllers.getStage() == null)
@@ -135,32 +154,9 @@ public final class Launcher extends Application {
            return result;
    }

-    public static String i18n(String key) {
-        try {
-            return RESOURCE_BUNDLE.getString(key);
-        } catch (Exception e) {
-            Logging.LOG.log(Level.SEVERE, "Cannot find key " + key + " in resource bundle", e);
-            return key;
-        }
-    }
-
-    public static String i18n(String key, Object... formatArgs) {
-        return String.format(i18n(key), formatArgs);
-    }
-
    public static final File MINECRAFT_DIRECTORY = OperatingSystem.getWorkingDirectory("minecraft");
    public static final File HMCL_DIRECTORY = OperatingSystem.getWorkingDirectory("hmcl");
    public static final File LOG_DIRECTORY = new File(Launcher.HMCL_DIRECTORY, "logs");

-    public static final String VERSION = System.getProperty("hmcl.version.override", "@HELLO_MINECRAFT_LAUNCHER_VERSION_FOR_GRADLE_REPLACING@");
-    public static final String NAME = "HMCL";
-    public static final String TITLE = NAME + " " + VERSION;
-    public static final ResourceBundle RESOURCE_BUNDLE = Settings.INSTANCE.getLocale().getResourceBundle();
-    public static final UpdateChecker UPDATE_CHECKER = new UpdateChecker(VersionNumber.asVersion(VERSION));
-    public static final IUpgrader UPGRADER = new AppDataUpgrader();
    public static final CrashReporter CRASH_REPORTER = new CrashReporter();
-
-    public static final String UPDATE_SERVER = "https://hmcl.huangyuhui.net";
-    public static final String CONTACT = UPDATE_SERVER + "/hmcl.php";
-    public static final String PUBLISH = "http://www.mcbbs.net/thread-142335-1-1.html";
 }
@@ -17,14 +17,45 @@
 */
 package org.jackhuang.hmcl;

-import javax.swing.*;
+import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
 import java.io.File;
+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;
+
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509TrustManager;
+import javax.swing.JOptionPane;
+
+import org.jackhuang.hmcl.setting.ConfigHolder;
+import org.jackhuang.hmcl.upgrade.UpdateHandler;

 public final class Main {

    public static void main(String[] args) {
+        System.setProperty("java.net.useSystemProxies", "true");
+
        checkJavaFX();
        checkDirectoryPath();
+        checkDSTRootCAX3();
+
+        if (UpdateHandler.processArguments(args)) {
+            return;
+        }
+
+        try {
+            ConfigHolder.init();
+        } catch (IOException e) {
+            showErrorAndExit(i18n("fatal.config_loading_failure", Paths.get("").toAbsolutePath().normalize()));
+        }
+
        Launcher.main(args);
    }

@@ -41,12 +72,35 @@ public final class Main {
        try {
            Class.forName("javafx.application.Application");
        } catch (ClassNotFoundException e) {
-            showErrorAndExit("JavaFX is missing.\n"
-                    + "If you are using Java 11 or above, please downgrade to Java 8 or 10.\n"
-                    + "If you are using OpenJDK, please ensure OpenJFX is included.");
+            showErrorAndExit(i18n("fatal.missing_javafx"));
        }
    }

+    private static void checkDSTRootCAX3() {
+        TrustManagerFactory tmf;
+        try {
+            tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+            tmf.init((KeyStore) null);
+        } catch (NoSuchAlgorithmException | KeyStoreException e) {
+            LOG.log(Level.WARNING, "Failed to init TrustManagerFactory", e);
+            // don't know what to do here
+            return;
+        }
+        for (TrustManager tm : tmf.getTrustManagers()) {
+            if (tm instanceof X509TrustManager) {
+                for (X509Certificate cert : ((X509TrustManager) tm).getAcceptedIssuers()) {
+                    if ("CN=DST Root CA X3, O=Digital Signature Trust Co.".equals((cert.getSubjectDN().getName()))) {
+                        return;
+                    }
+                }
+            }
+        }
+        showWarningAndContinue(i18n("fatal.missing_dst_root_ca_x3"));
+    }
+
+    /**
+     * Indicates that a fatal error has occurred, and that the application cannot start.
+     */
    private static void showErrorAndExit(String message) {
        System.err.println(message);
        System.err.println("A fatal error has occurred, forcibly exiting.");
@@ -54,4 +108,13 @@ public final class Main {
        System.exit(1);
    }

+    /**
+     * Indicates that potential issues have been detected, and that the application may not function properly (but it can still run).
+     */
+    private static void showWarningAndContinue(String message) {
+        System.err.println(message);
+        System.err.println("Potential issues have been detected.");
+        JOptionPane.showMessageDialog(null, message, "Warning", JOptionPane.WARNING_MESSAGE);
+    }
+
 }
@@ -0,0 +1,35 @@
+/*
+ * 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://www.huangyuhui.net/hmcl.php";
+    public static final String PUBLISH_URL = "http://www.mcbbs.net/thread-142335-1-1.html";
+}
@@ -1,57 +0,0 @@
-/*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
- */
-package org.jackhuang.hmcl.event;
-
-import org.jackhuang.hmcl.auth.Account;
-import org.jackhuang.hmcl.util.ToStringBuilder;
-
-/**
- * This event gets fired when added accounts.
- * <br>
- * This event is fired on the {@link org.jackhuang.hmcl.event.EventBus#EVENT_BUS}
- *
- * @author huangyuhui
- */
-public class AccountAddedEvent extends Event {
-
-    private final Account account;
-
-    /**
-     * Constructor.
-     *
-     * @param source {@link org.jackhuang.hmcl.setting.Settings}
-     */
-    public AccountAddedEvent(Object source, Account account) {
-        super(source);
-        this.account = account;
-    }
-
-
-    public Account getAccount() {
-        return account;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this)
-                .append("source", source)
-                .append("account", account)
-                .toString();
-    }
-}
-
@@ -1,60 +0,0 @@
-/*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
- */
-package org.jackhuang.hmcl.event;
-
-import org.jackhuang.hmcl.auth.Account;
-import org.jackhuang.hmcl.util.ToStringBuilder;
-
-import java.util.Collection;
-import java.util.Collections;
-
-/**
- * This event gets fired when loading accounts.
- * <br>
- * This event is fired on the {@link org.jackhuang.hmcl.event.EventBus#EVENT_BUS}
- *
- * @author huangyuhui
- */
-public class AccountLoadingEvent extends Event {
-
-    private final Collection<Account> accounts;
-
-    /**
-     * Constructor.
-     *
-     * @param source {@link org.jackhuang.hmcl.setting.Settings}
-     */
-    public AccountLoadingEvent(Object source, Collection<Account> accounts) {
-        super(source);
-        this.accounts = Collections.unmodifiableCollection(accounts);
-    }
-
-
-    public Collection<Account> getAccounts() {
-        return accounts;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this)
-                .append("source", source)
-                .append("accounts", accounts)
-                .toString();
-    }
-}
-
@@ -24,7 +24,7 @@ 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,7 +33,6 @@ import org.jackhuang.hmcl.ui.DialogController;
 import org.jackhuang.hmcl.util.NetworkUtils;

 import java.io.File;
-import java.net.Proxy;
 import java.util.*;

 public final class AccountHelper {
@@ -43,31 +42,19 @@ public final class AccountHelper {
    public static final File SKIN_DIR = new File(Launcher.HMCL_DIRECTORY, "skins");

    public static void loadSkins() {
-        loadSkins(Proxy.NO_PROXY);
-    }
-
-    public static void loadSkins(Proxy proxy) {
-        for (Account account : Settings.INSTANCE.getAccounts()) {
+        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());
-    }
-
-    public static Task refreshSkinAsync(YggdrasilAccount account, Proxy proxy) {
-        return new SkinLoadTask(account, proxy, true);
+        return new SkinLoadTask(account, true);
    }

    private static File getSkinFile(UUID uuid) {
@@ -94,9 +81,9 @@ public final class AccountHelper {
        return getDefaultSkin(uuid, scaleRatio);
    }

-    public static Image getSkinImmediately(YggdrasilAccount account, GameProfile profile, double scaleRatio, Proxy proxy) throws Exception {
+    public static Image getSkinImmediately(YggdrasilAccount account, GameProfile profile, double scaleRatio) throws Exception {
        File file = getSkinFile(profile.getId());
-        downloadSkin(account, profile, true, proxy);
+        downloadSkin(account, profile, true);
        if (!file.exists())
            return getDefaultSkin(profile.getId(), scaleRatio);

@@ -111,17 +98,15 @@ 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) {
+            this(account, false);
        }

-        public SkinLoadTask(YggdrasilAccount account, Proxy proxy, boolean refresh) {
+        public SkinLoadTask(YggdrasilAccount account, boolean refresh) {
            this.account = account;
-            this.proxy = proxy;
            this.refresh = refresh;
        }

@@ -140,11 +125,11 @@ 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);
@@ -153,10 +138,10 @@ public final class AccountHelper {
        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;
@@ -166,7 +151,7 @@ public final class AccountHelper {
        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) {
@@ -22,8 +22,6 @@ import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.download.GameBuilder;
 import org.jackhuang.hmcl.setting.Profile;

-import java.net.Proxy;
-
 /**
 * @author huangyuhui
 */
@@ -31,11 +29,7 @@ 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);
+        super(profile.getRepository(), downloadProvider);

        this.profile = profile;
    }
@@ -20,6 +20,7 @@ package org.jackhuang.hmcl.game;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.task.FileDownloadTask;
+import org.jackhuang.hmcl.task.FileDownloadTask.IntegrityCheck;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.util.FileUtils;
 import org.jackhuang.hmcl.util.Logging;
@@ -29,8 +30,11 @@ import java.io.File;
 import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Optional;
 import java.util.logging.Level;

+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+
 /**
 * @author huangyuhui
 */
@@ -57,7 +61,11 @@ public class HMCLGameDownloadTask extends Task {
    public void execute() {
        File jar = profile.getRepository().getVersionJar(version);

-        File cache = new File(Settings.INSTANCE.getCommonPath(), "jars/" + gameVersion + ".jar");
+        // Force using common directory will not affect the behaviour that repository acts
+        // Since we always copy the downloaded jar to .minecraft/versions/<version>/
+        File cache = new File(Optional.ofNullable(Settings.instance().getCommonDirectory())
+                .orElse(Settings.getDefaultCommonDirectory()),
+                "jars/" + gameVersion + ".jar");
        if (cache.exists())
            try {
                FileUtils.copyFile(cache, jar);
@@ -69,8 +77,7 @@ public class HMCLGameDownloadTask extends Task {
        dependencies.add(new FileDownloadTask(
                NetworkUtils.toURL(profile.getDependency().getDownloadProvider().injectURL(version.getDownloadInfo().getUrl())),
                cache,
-                profile.getDependency().getProxy(),
-                version.getDownloadInfo().getSha1()
+                new IntegrityCheck("SHA-1", version.getDownloadInfo().getSha1())
        ).then(Task.of(v -> FileUtils.copyFile(cache, jar))));
    }

@@ -17,12 +17,14 @@
 */
 package org.jackhuang.hmcl.game;

-import org.jackhuang.hmcl.Launcher;
+import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.auth.AuthInfo;
 import org.jackhuang.hmcl.launch.DefaultLauncher;
 import org.jackhuang.hmcl.launch.ProcessListener;
+import org.jackhuang.hmcl.util.CommandBuilder;

 import java.util.List;
+import java.util.Map;

 /**
 * @author huangyuhui
@@ -42,10 +44,10 @@ public final class HMCLGameLauncher extends DefaultLauncher {
    }

    @Override
-    protected void appendJvmArgs(List<String> result) {
-        super.appendJvmArgs(result);
-
-        result.add("-Dminecraft.launcher.version=" + Launcher.VERSION);
-        result.add("-Dminecraft.launcher.brand=" + Launcher.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;
    }
 }
@@ -34,6 +34,8 @@ import java.io.IOException;
 import java.util.*;
 import java.util.logging.Level;

+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+
 public class HMCLGameRepository extends DefaultGameRepository {
    private final Profile profile;
    private final Map<String, VersionSetting> versionSettings = new HashMap<>();
@@ -50,17 +52,16 @@ 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();
+    private boolean useSelf(String assetId) {
+        return new File(getBaseDirectory(), "assets/indexes/" + assetId + ".json").exists();
    }

    @Override
    public File getAssetDirectory(String version, String assetId) {
-        if (useSelf(version, assetId))
+        if (Settings.instance().isCommonDirectoryDisabled() || useSelf(assetId))
            return super.getAssetDirectory(version, assetId);
        else
-            return new File(Settings.INSTANCE.getCommonPath(), "assets");
+            return new File(Settings.instance().getCommonDirectory(), "assets");
    }

    @Override
@@ -82,10 +83,10 @@ public class HMCLGameRepository extends DefaultGameRepository {
    public File getLibraryFile(Version version, Library lib) {
        VersionSetting vs = profile.getVersionSetting(version.getId());
        File self = super.getLibraryFile(version, lib);
-        if (self.exists() || vs.isNoCommon())
+        if (Settings.instance().isCommonDirectoryDisabled() || self.exists())
            return self;
        else
-            return new File(Settings.INSTANCE.getCommonPath(), "libraries/" + lib.getPath());
+            return new File(Settings.instance().getCommonDirectory(), "libraries/" + lib.getPath());
    }


@@ -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";
 }
@@ -74,7 +74,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
@@ -90,9 +90,9 @@ public final class HMCLModpackInstallTask extends Task {
    @Override
    public void execute() throws Exception {
        String json = CompressingUtils.readTextZipEntry(zipFile, "minecraft/pack.json");
-        Version version = 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";
@@ -39,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
    );
@@ -22,10 +22,12 @@ 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;
@@ -36,6 +38,7 @@ 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.TaskExecutorDialogPane;
 import org.jackhuang.hmcl.util.*;
@@ -49,6 +52,7 @@ import java.util.concurrent.atomic.AtomicInteger;

 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();
@@ -61,6 +65,8 @@ public final class LauncherHelper {
        if (account == null)
            throw new IllegalArgumentException("No account");

+        Logging.LOG.info("Launching game version: " + selectedVersion);
+
        GameRepository repository = profile.getRepository();

        Version version = repository.getResolvedVersion(selectedVersion);
@@ -104,16 +110,14 @@ public final class LauncherHelper {
                    }
                })
                .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.LOGGING_IN)))
-                .then(Task.of(Launcher.i18n("account.methods"), variables -> {
+                .then(Task.of(i18n("account.methods"), variables -> {
                    try {
-                        try {
-                            variables.set("account", account.logIn());
-                        } catch (ServerDisconnectException e) {
-                            variables.set("account",
-                                    account.playOffline().orElseThrow(() -> e));
-                        }
-                    } catch (AuthenticationException e) {
+                        variables.set("account", account.logIn());
+                    } catch (CredentialExpiredException e) {
                        variables.set("account", DialogController.logIn(account));
+                    } catch (AuthenticationException e) {
+                        variables.set("account",
+                                account.playOffline().orElseThrow(() -> e));
                    }
                }))
                .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.LAUNCHING)))
@@ -131,12 +135,12 @@ public final class LauncherHelper {
                .then(variables -> {
                    DefaultLauncher launcher = variables.get("launcher");
                    if (scriptFile == null) {
-                        return new LaunchTask<>(launcher::launch).setName(Launcher.i18n("version.launch"));
+                        return new LaunchTask<>(launcher::launch).setName(i18n("version.launch"));
                    } else {
                        return new LaunchTask<>(() -> {
                            launcher.makeLaunchScript(scriptFile);
                            return null;
-                        }).setName(Launcher.i18n("version.launch_script"));
+                        }).setName(i18n("version.launch_script"));
                    }
                })
                .then(Task.of(variables -> {
@@ -148,12 +152,12 @@ public final class LauncherHelper {
                        else
                            launchingStepsPane.setCancel(it -> {
                                process.stop();
-                                Controllers.closeDialog(it);
+                                it.fireEvent(new DialogCloseEvent());
                            });
                    } else
                        Platform.runLater(() -> {
-                            Controllers.closeDialog(launchingStepsPane);
-                            Controllers.dialog(Launcher.i18n("version.launch_script.success", scriptFile.getAbsolutePath()));
+                            launchingStepsPane.fireEvent(new DialogCloseEvent());
+                            Controllers.dialog(i18n("version.launch_script.success", scriptFile.getAbsolutePath()));
                        });

                }))
@@ -172,13 +176,33 @@ public final class LauncherHelper {

            @Override
            public void onStop(boolean success, TaskExecutor executor) {
-                if (!success) {
+                if (!success && !Controllers.isStopped()) {
                    Platform.runLater(() -> {
-                        Controllers.closeDialog(launchingStepsPane);
-                        if (executor.getLastException() != null)
-                            Controllers.dialog(I18nException.getStackTrace(executor.getLastException()),
-                                    scriptFile == null ? Launcher.i18n("launch.failed") : Launcher.i18n("version.launch_script.failed"),
-                                    MessageBox.ERROR_MESSAGE);
+                        // 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);
+                            }
+                        }
                    });
                }
                launchingStepsPane.setExecutor(null);
@@ -196,7 +220,7 @@ public final class LauncherHelper {
        VersionNumber gameVersion = VersionNumber.asVersion(GameVersion.minecraftVersion(profile.getRepository().getVersionJar(version)).orElse("Unknown"));
        JavaVersion java = setting.getJavaVersion();
        if (java == null) {
-            Controllers.dialog(Launcher.i18n("launch.wrong_javadir"), Launcher.i18n("message.error"), MessageBox.WARNING_MESSAGE, onAccept);
+            Controllers.dialog(i18n("launch.wrong_javadir"), i18n("message.warning"), MessageBox.WARNING_MESSAGE, onAccept);
            setting.setJava(null);
            setting.setDefaultJavaPath(null);
            java = JavaVersion.fromCurrentEnvironment();
@@ -207,10 +231,10 @@ public final class LauncherHelper {
            if (gameVersion.compareTo(VersionNumber.asVersion("1.13")) >= 0) {
                // Minecraft 1.13 and later versions only support Java 8 or later.
                // Terminate launching operation.
-                Controllers.dialog(Launcher.i18n("launch.advice.java8_1_13"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE, null);
+                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(Launcher.i18n("launch.advice.newer_java"), Launcher.i18n("message.error"), MessageBox.WARNING_MESSAGE, onAccept);
+                Controllers.dialog(i18n("launch.advice.newer_java"), i18n("message.warning"), MessageBox.WARNING_MESSAGE, onAccept);
            }
            flag = true;
        }
@@ -218,24 +242,30 @@ public final class LauncherHelper {
        // LaunchWrapper will crash because of assuming the system class loader is an instance of URLClassLoader.
        // cpw has claimed that he will make MinecraftForge of 1.13 and later versions able to run on Java 9.
        if (!flag && java.getParsedVersion() >= JavaVersion.JAVA_9 && gameVersion.compareTo(VersionNumber.asVersion("1.12.5")) < 0 && version.getMainClass().contains("launchwrapper")) {
-            Controllers.dialog(Launcher.i18n("launch.advice.java9"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE, null);
+            Optional<JavaVersion> java8 = JavaVersion.getJREs().stream().filter(javaVersion -> javaVersion.getParsedVersion() == JavaVersion.JAVA_8).findAny();
+            if (java8.isPresent()) {
+                setting.setJavaVersion(java8.get());
+                Controllers.dialog(i18n("launch.advice.java9"), i18n("message.warning"), MessageBox.WARNING_MESSAGE, onAccept);
+            } else {
+                Controllers.dialog(i18n("launch.advice.java9"), i18n("message.error"), MessageBox.ERROR_MESSAGE, null);
+            }
            flag = true;
        }

        if (!flag && java.getPlatform() == org.jackhuang.hmcl.util.Platform.BIT_32 &&
                org.jackhuang.hmcl.util.Platform.IS_64_BIT) {
-            Controllers.dialog(Launcher.i18n("launch.advice.different_platform"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
+            Controllers.dialog(i18n("launch.advice.different_platform"), i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
            flag = true;
        }
        if (!flag && java.getPlatform() == org.jackhuang.hmcl.util.Platform.BIT_32 &&
                setting.getMaxMemory() > 1.5 * 1024) {
            // 1.5 * 1024 is an inaccurate number.
            // Actual memory limit depends on operating system and memory.
-            Controllers.dialog(Launcher.i18n("launch.advice.too_large_memory_for_32bit"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
+            Controllers.dialog(i18n("launch.advice.too_large_memory_for_32bit"), i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
            flag = true;
        }
        if (!flag && OperatingSystem.TOTAL_MEMORY > 0 && OperatingSystem.TOTAL_MEMORY < setting.getMaxMemory()) {
-            Controllers.dialog(Launcher.i18n("launch.advice.not_enough_space", OperatingSystem.TOTAL_MEMORY), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
+            Controllers.dialog(i18n("launch.advice.not_enough_space", OperatingSystem.TOTAL_MEMORY), i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
            flag = true;
        }

@@ -249,8 +279,9 @@ public final class LauncherHelper {
    }

    public void emitStatus(LoadingState state) {
-        if (state == LoadingState.DONE)
-            Controllers.closeDialog(launchingStepsPane);
+        if (state == LoadingState.DONE) {
+            launchingStepsPane.fireEvent(new DialogCloseEvent());
+        }

        launchingStepsPane.setTitle(state.getLocalizedMessage());
        launchingStepsPane.setSubtitle((state.ordinal() + 1) + " / " + LoadingState.values().length);
@@ -286,15 +317,7 @@ public final class LauncherHelper {

        @Override
        public void execute() throws Exception {
-            try {
-                setResult(supplier.get());
-            } catch (PermissionException e) {
-                throw new I18nException(Launcher.i18n("launch.failed.executable_permission"), e);
-            } catch (ProcessCreationException e) {
-                throw new I18nException(Launcher.i18n("launch.failed.creating_process") + e.getLocalizedMessage(), e);
-            } catch (NotDecompressingNativesException e) {
-                throw new I18nException(Launcher.i18n("launch.failed.decompressing_natives") + e.getLocalizedMessage(), e);
-            }
+            setResult(supplier.get());
        }

        @Override
@@ -363,19 +386,22 @@ public final class LauncherHelper {
                System.out.print(log);

            logs.add(pair(log, level));
-            if (logs.size() > Settings.INSTANCE.getLogLines())
+            if (logs.size() > Settings.instance().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:
@@ -413,16 +439,16 @@ public final class LauncherHelper {

                    switch (exitType) {
                        case JVM_ERROR:
-                            logWindow.setTitle(Launcher.i18n("launch.failed.cannot_create_jvm"));
+                            logWindow.setTitle(i18n("launch.failed.cannot_create_jvm"));
                            break;
                        case APPLICATION_ERROR:
-                            logWindow.setTitle(Launcher.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());
                    });
@@ -17,7 +17,7 @@
 */
 package org.jackhuang.hmcl.game;

-import org.jackhuang.hmcl.Launcher;
+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 Launcher.i18n(key);
+        return i18n(key);
    }
 }
@@ -86,11 +86,13 @@ 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) {
+                profile.getRepository().refreshVersions();
+                VersionSetting vs = profile.specializeVersionSetting(name);
+                profile.getRepository().undoMark(name);
+                if (vs != null)
+                    vs.setGameDirType(EnumGameDirectory.VERSION_FOLDER);
+            }
        };

        if (modpack.getManifest() instanceof CurseManifest)
@@ -102,7 +104,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);
    }

@@ -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
@@ -22,25 +22,34 @@ 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.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.FileUtils;

-import java.io.File;
+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 java.io.IOException;
-import java.net.URL;
 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
@@ -48,49 +57,161 @@ import static org.jackhuang.hmcl.util.Pair.pair;
 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(), () -> Settings.instance().getDownloadProvider())::getArtifactInfo,
+            Accounts::getOrCreateAuthlibInjectorServer);

-    public static final Map<String, AccountFactory<?>> ACCOUNT_FACTORY = mapOf(
-            pair(OFFLINE_ACCOUNT_KEY, OfflineAccountFactory.INSTANCE),
-            pair(YGGDRASIL_ACCOUNT_KEY, new YggdrasilAccountFactory(MojangYggdrasilProvider.INSTANCE)),
-            pair(AUTHLIB_INJECTOR_ACCOUNT_KEY, new AuthlibInjectorAccountFactory(Accounts::downloadAuthlibInjector, Accounts::getOrCreateAuthlibInjectorServer))
-    );
+    private static final String TYPE_OFFLINE = "offline";
+    private static final String TYPE_YGGDRASIL_ACCOUNT = "yggdrasil";
+    private static final String TYPE_AUTHLIB_INJECTOR = "authlibInjector";

-    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 Map<String, AccountFactory<?>> type2factory = mapOf(
+            pair(TYPE_OFFLINE, FACTORY_OFFLINE),
+            pair(TYPE_YGGDRASIL_ACCOUNT, FACTORY_YGGDRASIL),
+            pair(TYPE_AUTHLIB_INJECTOR, FACTORY_AUTHLIB_INJECTOR));
+
+    private static String accountType(Account account) {
+        if (account instanceof OfflineAccount)
+            return TYPE_OFFLINE;
+        else if (account instanceof AuthlibInjectorAccount)
+            return TYPE_AUTHLIB_INJECTOR;
+        else if (account instanceof YggdrasilAccount)
+            return TYPE_YGGDRASIL_ACCOUNT;
+        else
+            throw new IllegalArgumentException("Failed to determine account type: " + account);
    }

-    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(Launcher.HMCL_DIRECTORY, "authlib-injector.jar");
-        File local = new File(Launcher.HMCL_DIRECTORY, "authlib-injector.txt");
-        int buildNumber = 0;
-        try {
-            buildNumber = Integer.parseInt(FileUtils.readText(local));
-        } catch (IOException | NumberFormatException ignore) {
+    private static ObservableList<Account> accounts = observableArrayList(account -> new Observable[] { account });
+    private static ReadOnlyListProperty<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()));
+
+        @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));
        }
-        return jar.getAbsolutePath();
+    };
+
+    /**
+     * 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;
+    }
+
+    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 Settings.SETTINGS.authlibInjectorServers.stream()
+        return config().getAuthlibInjectorServers().stream()
                .filter(server -> url.equals(server.getUrl()))
                .findFirst()
                .orElseGet(() -> {
@@ -104,8 +225,38 @@ public final class Accounts {
                        LOG.log(Level.WARNING, "Failed to migrate authlib injector server " + url, e);
                    }

-                    Settings.SETTINGS.authlibInjectorServers.add(server);
+                    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));
+    }
+    // ====
 }
@@ -17,92 +17,436 @@
 */
 package org.jackhuang.hmcl.setting;

+import java.io.File;
+import java.lang.reflect.Modifier;
+import java.net.Proxy;
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.stream.Stream;

+import org.hildan.fxgson.creators.ObservableListCreator;
+import org.hildan.fxgson.creators.ObservableMapCreator;
+import org.hildan.fxgson.creators.ObservableSetCreator;
+import org.hildan.fxgson.factories.JavaFxPropertyTypeAdapterFactory;
 import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
+import org.jackhuang.hmcl.util.EnumOrdinalDeserializer;
+import org.jackhuang.hmcl.util.FileTypeAdapter;
+import org.jackhuang.hmcl.util.ObservableHelper;
+import org.jackhuang.hmcl.util.i18n.Locales;
+import org.jackhuang.hmcl.util.i18n.Locales.SupportedLocale;

+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonParseException;
 import com.google.gson.annotations.SerializedName;

+import javafx.beans.InvalidationListener;
+import javafx.beans.Observable;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleIntegerProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.collections.ObservableMap;
+import javafx.collections.ObservableSet;

-public final class Config implements Cloneable {
+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")
-    public final StringProperty selectedProfile = new SimpleStringProperty("");
+    private StringProperty selectedProfile = new SimpleStringProperty("");

    @SerializedName("backgroundType")
-    public final IntegerProperty backgroundImageType = new SimpleIntegerProperty(0);
+    private ObjectProperty<EnumBackgroundImage> backgroundImageType = new SimpleObjectProperty<>(EnumBackgroundImage.DEFAULT);

    @SerializedName("bgpath")
-    public final StringProperty backgroundImage = new SimpleStringProperty();
+    private StringProperty backgroundImage = new SimpleStringProperty();
+
+    @SerializedName("commonDirType")
+    private ObjectProperty<EnumCommonDirectory> commonDirType = new SimpleObjectProperty<>(EnumCommonDirectory.DEFAULT);

    @SerializedName("commonpath")
-    public final StringProperty commonDirectory = new SimpleStringProperty(Launcher.MINECRAFT_DIRECTORY.getAbsolutePath());
+    private StringProperty commonDirectory = new SimpleStringProperty(Launcher.MINECRAFT_DIRECTORY.getAbsolutePath());

    @SerializedName("hasProxy")
-    public final BooleanProperty hasProxy = new SimpleBooleanProperty();
+    private BooleanProperty hasProxy = new SimpleBooleanProperty();

    @SerializedName("hasProxyAuth")
-    public final BooleanProperty hasProxyAuth = new SimpleBooleanProperty();
+    private BooleanProperty hasProxyAuth = new SimpleBooleanProperty();

    @SerializedName("proxyType")
-    public final IntegerProperty proxyType = new SimpleIntegerProperty();
+    private ObjectProperty<Proxy.Type> proxyType = new SimpleObjectProperty<>(Proxy.Type.DIRECT);

    @SerializedName("proxyHost")
-    public final StringProperty proxyHost = new SimpleStringProperty();
+    private StringProperty proxyHost = new SimpleStringProperty();

    @SerializedName("proxyPort")
-    public final StringProperty proxyPort = new SimpleStringProperty();
+    private StringProperty proxyPort = new SimpleStringProperty();

    @SerializedName("proxyUserName")
-    public final StringProperty proxyUser = new SimpleStringProperty();
+    private StringProperty proxyUser = new SimpleStringProperty();

    @SerializedName("proxyPassword")
-    public final StringProperty proxyPass = new SimpleStringProperty();
+    private StringProperty proxyPass = new SimpleStringProperty();

    @SerializedName("theme")
-    public final StringProperty theme = new SimpleStringProperty();
+    private ObjectProperty<Theme> theme = new SimpleObjectProperty<>(Theme.BLUE);

    @SerializedName("localization")
-    public final StringProperty localization = new SimpleStringProperty();
+    private ObjectProperty<SupportedLocale> localization = new SimpleObjectProperty<>(Locales.DEFAULT);

    @SerializedName("downloadtype")
-    public final IntegerProperty downloadType = new SimpleIntegerProperty();
+    private IntegerProperty downloadType = new SimpleIntegerProperty(1);

    @SerializedName("configurations")
-    public final ObservableMap<String, Profile> configurations = FXCollections.observableMap(new TreeMap<>());
+    private ObservableMap<String, Profile> configurations = FXCollections.observableMap(new TreeMap<>());

    @SerializedName("accounts")
-    public final ObservableList<Map<Object, Object>> accounts = FXCollections.observableArrayList();
+    private ObservableList<Map<Object, Object>> accountStorages = FXCollections.observableArrayList();

    @SerializedName("selectedAccount")
-    public final StringProperty selectedAccount = new SimpleStringProperty("");
+    private StringProperty selectedAccount = new SimpleStringProperty("");

    @SerializedName("fontFamily")
-    public final StringProperty fontFamily = new SimpleStringProperty("Consolas");
+    private StringProperty fontFamily = new SimpleStringProperty("Consolas");

    @SerializedName("fontSize")
-    public final DoubleProperty fontSize = new SimpleDoubleProperty(12);
+    private DoubleProperty fontSize = new SimpleDoubleProperty(12);

    @SerializedName("logLines")
-    public final IntegerProperty logLines = new SimpleIntegerProperty(100);
+    private IntegerProperty logLines = new SimpleIntegerProperty(100);

-    public final ObservableList<AuthlibInjectorServer> authlibInjectorServers = FXCollections.observableArrayList();
+    @SerializedName("authlibInjectorServers")
+    private ObservableList<AuthlibInjectorServer> authlibInjectorServers = FXCollections.observableArrayList();
+
+    @SerializedName("updateChannel")
+    private ObjectProperty<EnumUpdateChannel> updateChannel = new SimpleObjectProperty<>(EnumUpdateChannel.STABLE);
+
+    @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 Settings.GSON.fromJson(Settings.GSON.toJson(this), Config.class);
+        return fromJson(this.toJson());
+    }
+
+    // Getters & Setters & Properties
+    public String getSelectedProfile() {
+        return selectedProfile.get();
+    }
+
+    public void setSelectedProfile(String selectedProfile) {
+        this.selectedProfile.set(selectedProfile);
+    }
+
+    public StringProperty selectedProfileProperty() {
+        return selectedProfile;
+    }
+
+    public EnumBackgroundImage getBackgroundImageType() {
+        return backgroundImageType.get();
+    }
+
+    public void setBackgroundImageType(EnumBackgroundImage backgroundImageType) {
+        this.backgroundImageType.set(backgroundImageType);
+    }
+
+    public ObjectProperty<EnumBackgroundImage> backgroundImageTypeProperty() {
+        return backgroundImageType;
+    }
+
+    public 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.get();
+    }
+
+    public void setCommonDirectory(String commonDirectory) {
+        this.commonDirectory.set(commonDirectory);
+    }
+
+    public StringProperty commonDirectoryProperty() {
+        return commonDirectory;
+    }
+
+    public boolean hasProxy() {
+        return hasProxy.get();
+    }
+
+    public void setHasProxy(boolean hasProxy) {
+        this.hasProxy.set(hasProxy);
+    }
+
+    public BooleanProperty hasProxyProperty() {
+        return hasProxy;
+    }
+
+    public boolean hasProxyAuth() {
+        return hasProxyAuth.get();
+    }
+
+    public void setHasProxyAuth(boolean hasProxyAuth) {
+        this.hasProxyAuth.set(hasProxyAuth);
+    }
+
+    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 String getProxyHost() {
+        return proxyHost.get();
+    }
+
+    public void setProxyHost(String proxyHost) {
+        this.proxyHost.set(proxyHost);
+    }
+
+    public StringProperty proxyHostProperty() {
+        return proxyHost;
+    }
+
+    public String getProxyPort() {
+        return proxyPort.get();
+    }
+
+    public void setProxyPort(String proxyPort) {
+        this.proxyPort.set(proxyPort);
+    }
+
+    public StringProperty proxyPortProperty() {
+        return proxyPort;
+    }
+
+    public String getProxyUser() {
+        return proxyUser.get();
+    }
+
+    public void setProxyUser(String proxyUser) {
+        this.proxyUser.set(proxyUser);
+    }
+
+    public StringProperty proxyUserProperty() {
+        return proxyUser;
+    }
+
+    public String getProxyPass() {
+        return proxyPass.get();
+    }
+
+    public void setProxyPass(String proxyPass) {
+        this.proxyPass.set(proxyPass);
+    }
+
+    public StringProperty proxyPassProperty() {
+        return proxyPass;
+    }
+
+    public Theme getTheme() {
+        return theme.get();
+    }
+
+    public void setTheme(Theme theme) {
+        this.theme.set(theme);
+    }
+
+    public ObjectProperty<Theme> themeProperty() {
+        return theme;
+    }
+
+    public SupportedLocale getLocalization() {
+        return localization.get();
+    }
+
+    public void setLocalization(SupportedLocale localization) {
+        this.localization.set(localization);
+    }
+
+    public ObjectProperty<SupportedLocale> localizationProperty() {
+        return localization;
+    }
+
+    public int getDownloadType() {
+        return downloadType.get();
+    }
+
+    public void setDownloadType(int downloadType) {
+        this.downloadType.set(downloadType);
+    }
+
+    public IntegerProperty downloadTypeProperty() {
+        return downloadType;
+    }
+
+    public ObservableMap<String, Profile> getConfigurations() {
+        return configurations;
+    }
+
+    public ObservableList<Map<Object, Object>> getAccountStorages() {
+        return accountStorages;
+    }
+
+    public String getSelectedAccount() {
+        return selectedAccount.get();
+    }
+
+    public void setSelectedAccount(String selectedAccount) {
+        this.selectedAccount.set(selectedAccount);
+    }
+
+    public StringProperty selectedAccountProperty() {
+        return selectedAccount;
+    }
+
+    public String getFontFamily() {
+        return fontFamily.get();
+    }
+
+    public void setFontFamily(String fontFamily) {
+        this.fontFamily.set(fontFamily);
+    }
+
+    public StringProperty fontFamilyProperty() {
+        return fontFamily;
+    }
+
+    public double getFontSize() {
+        return fontSize.get();
+    }
+
+    public void setFontSize(double fontSize) {
+        this.fontSize.set(fontSize);
+    }
+
+    public DoubleProperty fontSizeProperty() {
+        return fontSize;
+    }
+
+    public int getLogLines() {
+        return logLines.get();
+    }
+
+    public void setLogLines(int logLines) {
+        this.logLines.set(logLines);
+    }
+
+    public IntegerProperty logLinesProperty() {
+        return logLines;
+    }
+
+    public ObservableList<AuthlibInjectorServer> getAuthlibInjectorServers() {
+        return authlibInjectorServers;
+    }
+
+    public EnumUpdateChannel getUpdateChannel() {
+        return updateChannel.get();
+    }
+
+    public ObjectProperty<EnumUpdateChannel> updateChannelProperty() {
+        return updateChannel;
+    }
+
+    public void setUpdateChannel(EnumUpdateChannel updateChannel) {
+        this.updateChannel.set(updateChannel);
    }
 }
@@ -0,0 +1,144 @@
+/*
+ * 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 static java.nio.charset.StandardCharsets.UTF_8;
+import static org.jackhuang.hmcl.util.Logging.LOG;
+
+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 com.google.gson.Gson;
+import com.google.gson.JsonParseException;
+
+import org.jackhuang.hmcl.util.OperatingSystem;
+
+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
+        }
+    }
+}
@@ -0,0 +1,90 @@
+/*
+ * 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()));
+    }
+}
@@ -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
 }
@@ -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,19 @@
 * 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;

-/**
- * throws if wrong password or logging fails for too many times.
- * @author huangyuhui
- */
-public final class InvalidCredentialsException extends AuthenticationException {
+public enum EnumCommonDirectory {
+    /**
+     * same to game directory
+     */
+    DISABLED,
+    /**
+     * %appdata%/.minecraft or ~/.minecraft
+     */
+    DEFAULT,
+    /**
+     * user customized common directory.
+     */
+    CUSTOM
 }
@@ -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,9 @@
 * 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 EnumUpdateChannel {
+    STABLE,
+    DEVELOPMENT
 }
@@ -19,6 +19,9 @@ package org.jackhuang.hmcl.setting;

 import com.google.gson.*;
 import javafx.beans.InvalidationListener;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+
 import org.jackhuang.hmcl.game.HMCLDependencyManager;
 import org.jackhuang.hmcl.game.HMCLGameRepository;
 import org.jackhuang.hmcl.mod.ModManager;
@@ -63,7 +66,7 @@ public final class Profile {
        return globalProperty.get();
    }

-    public void setGlobal(VersionSetting global) {
+    private void setGlobal(VersionSetting global) {
        if (global == null)
            global = new VersionSetting();
        globalProperty.set(global);
@@ -83,8 +86,18 @@ public final class Profile {
        nameProperty.set(name);
    }

-    public Profile() {
-        this("Default");
+    private BooleanProperty useRelativePathProperty = new SimpleBooleanProperty(this, "useRelativePath", false);
+
+    public BooleanProperty useRelativePathProperty() {
+        return useRelativePathProperty();
+    }
+
+    public boolean isUseRelativePath() {
+        return useRelativePathProperty.get();
+    }
+
+    public void setUseRelativePath(boolean useRelativePath) {
+        useRelativePathProperty.set(useRelativePath);
    }

    public Profile(String name) {
@@ -109,13 +122,14 @@ public final class Profile {
    }

    public HMCLDependencyManager getDependency() {
-        return new HMCLDependencyManager(this, Settings.INSTANCE.getDownloadProvider(), Settings.INSTANCE.getProxy());
+        return new HMCLDependencyManager(this, Settings.instance().getDownloadProvider());
    }

    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;
@@ -152,6 +166,7 @@ public final class Profile {
        return new ToStringBuilder(this)
                .append("gameDir", getGameDir())
                .append("name", getName())
+                .append("useRelativePath", isUseRelativePath())
                .toString();
    }

@@ -159,6 +174,8 @@ public final class Profile {
        nameProperty.addListener(listener);
        globalProperty.addListener(listener);
        gameDirProperty.addListener(listener);
+        useRelativePathProperty.addListener(listener);
+        globalProperty.get().addPropertyChangedListener(listener);
    }

    public static final class Serializer implements JsonSerializer<Profile>, JsonDeserializer<Profile> {
@@ -175,6 +192,7 @@ 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());

            return jsonObject;
        }
@@ -187,6 +205,8 @@ public final class Profile {

            Profile profile = new Profile("Default", new File(gameDir));
            profile.setGlobal(context.deserialize(obj.get("global"), VersionSetting.class));
+
+            profile.setUseRelativePath(Optional.ofNullable(obj.get("useRelativePath")).map(JsonElement::getAsBoolean).orElse(false));
            return profile;
        }

@@ -17,7 +17,7 @@
 */
 package org.jackhuang.hmcl.setting;

-import org.jackhuang.hmcl.Launcher;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 public final class Profiles {

@@ -30,9 +30,9 @@ public final class Profiles {
    public static String getProfileDisplayName(Profile profile) {
        switch (profile.getName()) {
            case Profiles.DEFAULT_PROFILE:
-                return Launcher.i18n("profile.default");
+                return i18n("profile.default");
            case Profiles.HOME_PROFILE:
-                return Launcher.i18n("profile.home");
+                return i18n("profile.home");
            default:
                return profile.getName();
        }
@@ -0,0 +1,113 @@
+/*
+ * 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 static org.jackhuang.hmcl.setting.ConfigHolder.config;
+
+import java.net.Authenticator;
+import java.net.InetSocketAddress;
+import java.net.PasswordAuthentication;
+import java.net.Proxy;
+import java.net.Proxy.Type;
+
+import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.StringUtils;
+
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.ObjectBinding;
+import javafx.beans.value.ObservableObjectValue;
+
+public final class ProxyManager {
+    private ProxyManager() {
+    }
+
+    private static ObjectBinding<Proxy> proxyProperty = Bindings.createObjectBinding(
+            () -> {
+                String host = config().getProxyHost();
+                Integer port = Lang.toIntOrNull(config().getProxyPort());
+                if (!config().hasProxy() || StringUtils.isBlank(host) || port == null || config().getProxyType() == Proxy.Type.DIRECT) {
+                    return Proxy.NO_PROXY;
+                } else {
+                    return new Proxy(config().getProxyType(), new InetSocketAddress(host, port));
+                }
+            },
+            config().proxyTypeProperty(),
+            config().proxyHostProperty(),
+            config().proxyPortProperty(),
+            config().hasProxyProperty());
+
+    public static Proxy getProxy() {
+        return proxyProperty.get();
+    }
+
+    public static ObservableObjectValue<Proxy> proxyProperty() {
+        return proxyProperty;
+    }
+
+    static void init() {
+        proxyProperty.addListener(observable -> 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);
+            }
+        }
+    }
+}
@@ -17,308 +17,87 @@
 */
 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.collections.ObservableList;
-import javafx.collections.ObservableMap;
-import javafx.collections.ObservableSet;
 import javafx.scene.text.Font;

-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.Account;
-import org.jackhuang.hmcl.auth.AccountFactory;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.event.*;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.util.*;

-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.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
 import java.util.stream.Collectors;

-import static java.util.stream.Collectors.toList;
-import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
-import static org.jackhuang.hmcl.util.Lang.tryCast;
-import static org.jackhuang.hmcl.util.Logging.LOG;
+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)
-            .registerTypeAdapter(ObservableList.class, new ObservableListCreator())
-            .registerTypeAdapter(ObservableSet.class, new ObservableSetCreator())
-            .registerTypeAdapter(ObservableMap.class, new ObservableMapCreator())
-            .registerTypeAdapterFactory(new JavaFxPropertyTypeAdapterFactory(true, true))
-            .setPrettyPrinting()
-            .create();

-    public static final String SETTINGS_FILE_NAME = "hmcl.json";
-    public static final File SETTINGS_FILE = new File(SETTINGS_FILE_NAME).getAbsoluteFile();
+    private static Settings instance;

-    public static final Config SETTINGS = initSettings();
+    public static Settings instance() {
+        if (instance == null) {
+            throw new IllegalStateException("Settings hasn't been initialized");
+        }
+        return instance;
+    }

-    public static final Settings INSTANCE = new Settings();
-
-    private final Map<String, Account> accounts = new ConcurrentHashMap<>();
+    /**
+     * Should be called from {@link ConfigHolder#init()}.
+     */
+    static void init() {
+        instance = new Settings();
+    }

    private Settings() {
-        loadProxy();
-
-        for (Iterator<Map<Object, Object>> iterator = SETTINGS.accounts.iterator(); iterator.hasNext();) {
-            Map<Object, Object> settings = iterator.next();
-            AccountFactory<?> factory = Accounts.ACCOUNT_FACTORY.get(tryCast(settings.get("type"), String.class).orElse(""));
-            if (factory == null) {
-                LOG.warning("Unrecognized account type, removing: " + settings);
-                iterator.remove();
-                continue;
-            }
-
-            Account account;
-            try {
-                account = factory.fromStorage(settings, getProxy());
-            } catch (Exception e) {
-                LOG.log(Level.WARNING, "Malformed account storage, removing: " + settings, e);
-                iterator.remove();
-                continue;
-            }
-
-            accounts.put(Accounts.getAccountId(account), account);
-        }
-
-        SETTINGS.authlibInjectorServers.addListener(onInvalidating(this::removeDanglingAuthlibInjectorAccounts));
+        ProxyManager.init();
+        Accounts.init();

        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 static 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.accounts.clear();
-            for (Account account : accounts.values()) {
-                Map<Object, Object> storage = account.toStorage();
-                storage.put("type", Accounts.getAccountType(account));
-                SETTINGS.accounts.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.commonDirectory.get()) {
-        @Override
-        public void invalidated() {
-            super.invalidated();
-
-            SETTINGS.commonDirectory.set(get());
-            save();
-        }
-    };
-
-    public String getCommonPath() {
-        return commonPath.get();
-    }
-
-    public StringProperty commonPathProperty() {
-        return commonPath;
-    }
-
-    public void setCommonPath(String commonPath) {
-        this.commonPath.set(commonPath);
-    }
-
-    private Locales.SupportedLocale locale = Locales.getLocaleByName(SETTINGS.localization.get());
-
-    public Locales.SupportedLocale getLocale() {
-        return locale;
-    }
-
-    public void setLocale(Locales.SupportedLocale locale) {
-        this.locale = locale;
-        SETTINGS.localization.set(Locales.getNameByLocale(locale));
-        save();
-    }
-
-    private Proxy proxy = Proxy.NO_PROXY;
-
-    public Proxy getProxy() {
-        return proxy;
-    }
-
-    private Proxy.Type proxyType = Proxies.getProxyType(SETTINGS.proxyType.get());
-
-    public Proxy.Type getProxyType() {
-        return proxyType;
-    }
-
-    public void setProxyType(Proxy.Type proxyType) {
-        this.proxyType = proxyType;
-        SETTINGS.proxyType.set(Proxies.PROXIES.indexOf(proxyType));
-        save();
-        loadProxy();
-    }
-
-    public String getProxyHost() {
-        return SETTINGS.proxyHost.get();
-    }
-
-    public void setProxyHost(String proxyHost) {
-        SETTINGS.proxyHost.set(proxyHost);
-        save();
-    }
-
-    public String getProxyPort() {
-        return SETTINGS.proxyPort.get();
-    }
-
-    public void setProxyPort(String proxyPort) {
-        SETTINGS.proxyPort.set(proxyPort);
-        save();
-    }
-
-    public String getProxyUser() {
-        return SETTINGS.proxyUser.get();
-    }
-
-    public void setProxyUser(String proxyUser) {
-        SETTINGS.proxyUser.set(proxyUser);
-        save();
-    }
-
-    public String getProxyPass() {
-        return SETTINGS.proxyPass.get();
-    }
-
-    public void setProxyPass(String proxyPass) {
-        SETTINGS.proxyPass.set(proxyPass);
-        save();
-    }
-
-    public boolean hasProxy() {
-        return SETTINGS.hasProxy.get();
-    }
-
-    public void setHasProxy(boolean hasProxy) {
-        SETTINGS.hasProxy.set(hasProxy);
-        save();
-    }
-
-    public boolean hasProxyAuth() {
-        return SETTINGS.hasProxyAuth.get();
-    }
-
-    public void setHasProxyAuth(boolean hasProxyAuth) {
-        SETTINGS.hasProxyAuth.set(hasProxyAuth);
-        save();
-    }
-
-    private void loadProxy() {
-        String host = getProxyHost();
-        Integer port = Lang.toIntOrNull(getProxyPort());
-        if (!hasProxy() || StringUtils.isBlank(host) || port == null || getProxyType() == Proxy.Type.DIRECT)
-            proxy = Proxy.NO_PROXY;
-        else {
-            System.setProperty("http.proxyHost", getProxyHost());
-            System.setProperty("http.proxyPort", getProxyPort());
-            proxy = new Proxy(proxyType, new InetSocketAddress(host, port));
-
-            String user = getProxyUser();
-            String pass = getProxyPass();
-            if (hasProxyAuth() && StringUtils.isNotBlank(user) && StringUtils.isNotBlank(pass)) {
-                System.setProperty("http.proxyUser", user);
-                System.setProperty("http.proxyPassword", pass);
-
-                Authenticator.setDefault(new Authenticator() {
-                    @Override
-                    public PasswordAuthentication getPasswordAuthentication() {
-                        return new PasswordAuthentication(user, pass.toCharArray());
-                    }
-                });
-            }
+        for (Map.Entry<String, Profile> profileEntry : getProfileMap().entrySet()) {
+            profileEntry.getValue().setName(profileEntry.getKey());
+            profileEntry.getValue().nameProperty().setChangedListener(this::profileNameChanged);
+            profileEntry.getValue().addPropertyChangedListener(e -> ConfigHolder.markConfigDirty());
        }
    }

    public Font getFont() {
-        return Font.font(SETTINGS.fontFamily.get(), SETTINGS.fontSize.get());
+        return Font.font(config().getFontFamily(), config().getFontSize());
    }

    public void setFont(Font font) {
-        SETTINGS.fontFamily.set(font.getFamily());
-        SETTINGS.fontSize.set(font.getSize());
-        save();
+        config().setFontFamily(font.getFamily());
+        config().setFontSize(font.getSize());
    }

    public int getLogLines() {
-        return Math.max(SETTINGS.logLines.get(), 100);
+        return Math.max(config().getLogLines(), 100);
    }

    public void setLogLines(int logLines) {
-        SETTINGS.logLines.set(logLines);
-        save();
+        config().setLogLines(logLines);
    }

-    /****************************************
-     *           AUTHLIB INJECTORS          *
-     ****************************************/
+    public boolean isCommonDirectoryDisabled() {
+        return config().getCommonDirType() == EnumCommonDirectory.DISABLED;
+    }

-    /**
-     * After an {@link AuthlibInjectorServer} is removed, the associated accounts should also be removed.
-     * This method performs a check and removes the dangling accounts.
-     * Don't call this before {@link #migrateAuthlibInjectorServers()} is called, otherwise old data would be lost.
-     */
-    private void removeDanglingAuthlibInjectorAccounts() {
-        accounts.values().stream()
-                .filter(AuthlibInjectorAccount.class::isInstance)
-                .filter(it -> !SETTINGS.authlibInjectorServers.contains(((AuthlibInjectorAccount) it).getServer()))
-                .collect(toList())
-                .forEach(this::deleteAccount);
+    public static String getDefaultCommonDirectory() {
+        return Launcher.MINECRAFT_DIRECTORY.getAbsolutePath();
+    }
+
+    public String getCommonDirectory() {
+        switch (config().getCommonDirType()) {
+            case DISABLED:
+                return null;
+            case DEFAULT:
+                return getDefaultCommonDirectory();
+            case CUSTOM:
+                return config().getCommonDirectory();
+            default:
+                return null;
+        }
    }

    /****************************************
@@ -326,161 +105,14 @@ public class Settings {
     ****************************************/

    public DownloadProvider getDownloadProvider() {
-        return DownloadProviders.getDownloadProvider(SETTINGS.downloadType.get());
+        return DownloadProviders.getDownloadProvider(config().getDownloadType());
    }

    public void setDownloadProvider(DownloadProvider downloadProvider) {
        int index = DownloadProviders.DOWNLOAD_PROVIDERS.indexOf(downloadProvider);
        if (index == -1)
            throw new IllegalArgumentException("Unknown download provider: " + downloadProvider);
-        SETTINGS.downloadType.set(index);
-        save();
-    }
-
-    /****************************************
-     *               ACCOUNTS               *
-     ****************************************/
-
-    private final ImmediateObjectProperty<Account> selectedAccount = new ImmediateObjectProperty<Account>(this, "selectedAccount", accounts.get(SETTINGS.selectedAccount.get())) {
-        @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.selectedAccount.set(getValue() == null ? "" : Accounts.getAccountId(getValue()));
-            save();
-        }
-    };
-
-    public Account getSelectedAccount() {
-        return selectedAccount.get();
-    }
-
-    public ObjectProperty<Account> selectedAccountProperty() {
-        return selectedAccount;
-    }
-
-    public void setSelectedAccount(Account selectedAccount) {
-        this.selectedAccount.set(selectedAccount);
-    }
-
-    public void addAccount(Account account) {
-        accounts.put(Accounts.getAccountId(account), account);
-        onAccountLoading();
-
-        EventBus.EVENT_BUS.fireEvent(new AccountAddedEvent(this, 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));
-
-        onAccountLoading();
-        selectedAccount.get();
-    }
-
-    public void deleteAccount(Account account) {
-        accounts.remove(Accounts.getAccountId(account));
-
-        onAccountLoading();
-        selectedAccount.get();
-    }
-
-    /****************************************
-     *              BACKGROUND              *
-     ****************************************/
-
-    private final ImmediateStringProperty backgroundImage = new ImmediateStringProperty(this, "backgroundImage", SETTINGS.backgroundImage.get()) {
-        @Override
-        public void invalidated() {
-            super.invalidated();
-
-            SETTINGS.backgroundImage.set(get());
-            save();
-        }
-    };
-
-    public String getBackgroundImage() {
-        return backgroundImage.get();
-    }
-
-    public ImmediateStringProperty backgroundImageProperty() {
-        return backgroundImage;
-    }
-
-    public void setBackgroundImage(String backgroundImage) {
-        this.backgroundImage.set(backgroundImage);
-    }
-
-    private final ImmediateObjectProperty<EnumBackgroundImage> backgroundImageType = new ImmediateObjectProperty<EnumBackgroundImage>(this, "backgroundImageType", EnumBackgroundImage.indexOf(SETTINGS.backgroundImageType.get())) {
-        @Override
-        public void invalidated() {
-            super.invalidated();
-
-            SETTINGS.backgroundImageType.set(get().ordinal());
-            save();
-        }
-    };
-
-    public EnumBackgroundImage getBackgroundImageType() {
-        return backgroundImageType.get();
-    }
-
-    public ImmediateObjectProperty<EnumBackgroundImage> backgroundImageTypeProperty() {
-        return backgroundImageType;
-    }
-
-    public void setBackgroundImageType(EnumBackgroundImage backgroundImageType) {
-        this.backgroundImageType.set(backgroundImageType);
-    }
-
-    /****************************************
-     *                THEME                 *
-     ****************************************/
-
-    private final ImmediateObjectProperty<Theme> theme = new ImmediateObjectProperty<Theme>(this, "theme", Theme.getTheme(SETTINGS.theme.get()).orElse(Theme.BLUE)) {
-        @Override
-        public void invalidated() {
-            super.invalidated();
-
-            SETTINGS.theme.set(get().getName().toLowerCase());
-            save();
-        }
-    };
-
-    public Theme getTheme() {
-        return theme.get();
-    }
-
-    public void setTheme(Theme theme) {
-        this.theme.set(theme);
-    }
-
-    public ImmediateObjectProperty<Theme> themeProperty() {
-        return theme;
+        config().setDownloadType(index);
    }

    /****************************************
@@ -490,20 +122,18 @@ public class Settings {
    public Profile getSelectedProfile() {
        checkProfileMap();

-        if (!hasProfile(SETTINGS.selectedProfile.get())) {
+        if (!hasProfile(config().getSelectedProfile())) {
            getProfileMap().keySet().stream().findFirst().ifPresent(selectedProfile -> {
-                SETTINGS.selectedProfile.set(selectedProfile);
-                save();
+                config().setSelectedProfile(selectedProfile);
            });
            Schedulers.computation().schedule(this::onProfileChanged);
        }
-        return getProfile(SETTINGS.selectedProfile.get());
+        return getProfile(config().getSelectedProfile());
    }

    public void setSelectedProfile(Profile selectedProfile) {
-        if (hasProfile(selectedProfile.getName()) && !Objects.equals(selectedProfile.getName(), SETTINGS.selectedProfile.get())) {
-            SETTINGS.selectedProfile.set(selectedProfile.getName());
-            save();
+        if (hasProfile(selectedProfile.getName()) && !Objects.equals(selectedProfile.getName(), config().getSelectedProfile())) {
+            config().setSelectedProfile(selectedProfile.getName());
            Schedulers.computation().schedule(this::onProfileChanged);
        }
    }
@@ -520,7 +150,7 @@ public class Settings {
    }

    public Map<String, Profile> getProfileMap() {
-        return SETTINGS.configurations;
+        return config().getConfigurations();
    }

    public Collection<Profile> getProfiles() {
@@ -535,8 +165,6 @@ public class Settings {
        Schedulers.computation().schedule(this::onProfileLoading);

        ver.nameProperty().setChangedListener(this::profileNameChanged);
-
-        save();
    }

    public void deleteProfile(Profile profile) {
@@ -551,8 +179,12 @@ public class Settings {

    private void checkProfileMap() {
        if (getProfileMap().isEmpty()) {
-            getProfileMap().put(Profiles.DEFAULT_PROFILE, new Profile(Profiles.DEFAULT_PROFILE));
-            getProfileMap().put(Profiles.HOME_PROFILE, new Profile(Profiles.HOME_PROFILE, Launcher.MINECRAFT_DIRECTORY));
+            Profile current = new Profile(Profiles.DEFAULT_PROFILE);
+            current.setUseRelativePath(true);
+            getProfileMap().put(Profiles.DEFAULT_PROFILE, current);
+
+            Profile home = new Profile(Profiles.HOME_PROFILE, Launcher.MINECRAFT_DIRECTORY);
+            getProfileMap().put(Profiles.HOME_PROFILE, home);
        }
    }

@@ -573,12 +205,4 @@ public class Settings {
        EventBus.EVENT_BUS.fireEvent(new ProfileLoadingEvent(this, getProfiles()));
        onProfileChanged();
    }
-
-    public void onAccountLoading() {
-        EventBus.EVENT_BUS.fireEvent(new AccountLoadingEvent(this, getAccounts()));
-    }
-
-    public Config getRawConfig() {
-        return SETTINGS.clone();
-    }
 }
@@ -24,6 +24,11 @@ import org.jackhuang.hmcl.util.FileUtils;
 import org.jackhuang.hmcl.util.IOUtils;
 import org.jackhuang.hmcl.util.Logging;

+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.Optional;
@@ -31,13 +36,15 @@ import java.util.logging.Level;

 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 +75,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 +83,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 +102,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 +130,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 +140,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);
+        }
+    }
 }
@@ -19,7 +19,8 @@ package org.jackhuang.hmcl.setting;

 import com.google.gson.*;
 import javafx.beans.InvalidationListener;
-import org.jackhuang.hmcl.Launcher;
+
+import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.game.LaunchOptions;
 import org.jackhuang.hmcl.util.*;

@@ -30,6 +31,8 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;

+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+
 /**
 *
 * @author huangyuhui
@@ -79,7 +82,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();
@@ -89,6 +92,15 @@ 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", "");

    /**
@@ -276,23 +288,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() {
@@ -453,7 +448,7 @@ 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) {
@@ -475,6 +470,11 @@ public final class VersionSetting {
        } 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);
@@ -488,7 +488,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);
@@ -505,8 +504,8 @@ public final class VersionSetting {
        return new LaunchOptions.Builder()
                .setGameDir(gameDir)
                .setJava(javaVersion)
-                .setVersionName(Launcher.TITLE)
-                .setProfileName(Launcher.TITLE)
+                .setVersionName(Metadata.TITLE)
+                .setProfileName(Metadata.TITLE)
                .setMinecraftArgs(getMinecraftArgs())
                .setJavaArgs(getJavaArgs())
                .setMaxMemory(getMaxMemory())
@@ -517,10 +516,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();
@@ -553,7 +552,6 @@ 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());
@@ -591,7 +589,6 @@ 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)]);
@@ -605,7 +602,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);
@@ -21,13 +21,13 @@ import com.jfoenix.controls.JFXPasswordField;
 import com.jfoenix.controls.JFXProgressBar;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
-import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.AuthInfo;
 import org.jackhuang.hmcl.auth.NoSelectedCharacterException;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;

 import java.util.function.Consumer;

@@ -35,7 +35,6 @@ public class AccountLoginPane extends StackPane {
    private final Account oldAccount;
    private final Consumer<AuthInfo> success;
    private final Runnable failed;
-    private final Consumer<Region> closeConsumer;

    @FXML
    private Label lblUsername;
@@ -43,11 +42,10 @@ public class AccountLoginPane extends StackPane {
    @FXML private Label lblCreationWarning;
    @FXML private JFXProgressBar progressBar;

-    public AccountLoginPane(Account oldAccount, Consumer<Region> closeConsumer, Consumer<AuthInfo> success, Runnable failed) {
+    public AccountLoginPane(Account oldAccount, Consumer<AuthInfo> success, Runnable failed) {
        this.oldAccount = oldAccount;
        this.success = success;
        this.failed = failed;
-        this.closeConsumer = closeConsumer;

        FXUtils.loadFXML(this, "/assets/fxml/account-login.fxml");

@@ -70,9 +68,9 @@ public class AccountLoginPane extends StackPane {
            Object account = variable.get("login");
            if (account instanceof AuthInfo) {
                success.accept(((AuthInfo) account));
-                closeConsumer.accept(this);
+                fireEvent(new DialogCloseEvent());
            } else if (account instanceof NoSelectedCharacterException) {
-                closeConsumer.accept(this);
+                fireEvent(new DialogCloseEvent());
            } else if (account instanceof Exception) {
                lblCreationWarning.setText(AddAccountPane.accountException((Exception) account));
            }
@@ -84,6 +82,6 @@ public class AccountLoginPane extends StackPane {
    @FXML
    private void onCancel() {
        failed.run();
-        closeConsumer.accept(this);
+        fireEvent(new DialogCloseEvent());
    }
 }
@@ -28,24 +28,29 @@ import javafx.scene.control.Label;
 import javafx.scene.image.Image;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.StackPane;
-import org.jackhuang.hmcl.Launcher;
+
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
+import org.jackhuang.hmcl.auth.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.Settings;
+import org.jackhuang.hmcl.setting.Accounts;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.ui.construct.AdvancedListItem;
 import org.jackhuang.hmcl.ui.construct.ComponentList;
 import org.jackhuang.hmcl.ui.wizard.DecoratorPage;

+import static org.jackhuang.hmcl.ui.FXUtils.installTooltip;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
 import java.util.Optional;

 public class AccountPage extends StackPane implements DecoratorPage {
    private final StringProperty title;
    private final ObjectProperty<Runnable> onDelete = new SimpleObjectProperty<>(this, "onDelete");
-    private final VersionListItem item;
+    private final AdvancedListItem item;
    private final Account account;

    @FXML
@@ -69,33 +74,31 @@ public class AccountPage extends StackPane implements DecoratorPage {
    @FXML
    private JFXProgressBar progressBar;

-    public AccountPage(Account account, VersionListItem item) {
+    public AccountPage(Account account, AdvancedListItem item) {
        this.account = account;
        this.item = item;

-        title = new SimpleStringProperty(this, "title", Launcher.i18n("account") + " - " + account.getCharacter());
+        title = new SimpleStringProperty(this, "title", i18n("account") + " - " + account.getCharacter());

        FXUtils.loadFXML(this, "/assets/fxml/account.fxml");

-        FXUtils.setLimitWidth(this, 300);
        if (account instanceof AuthlibInjectorAccount) {
-            lblServer.setText(((AuthlibInjectorAccount) account).getServer().getName());
-            FXUtils.setLimitHeight(this, 182);
+            AuthlibInjectorServer server = ((AuthlibInjectorAccount) account).getServer();
+            lblServer.setText(server.getName());
+            installTooltip(lblServer, server.getUrl());
        } else {
            componentList.removeChildren(paneServer);

            if (account instanceof OfflineAccount) {
                componentList.removeChildren(paneEmail);
-                FXUtils.setLimitHeight(this, 110);
-            } else
-                FXUtils.setLimitHeight(this, 145);
+            }
        }

        btnDelete.setGraphic(SVG.delete(Theme.blackFillBinding(), 15, 15));
        btnRefresh.setGraphic(SVG.refresh(Theme.blackFillBinding(), 15, 15));

        lblCharacter.setText(account.getCharacter());
-        lblType.setText(AddAccountPane.accountType(account));
+        lblType.setText(Accounts.getAccountTypeName(account));
        lblEmail.setText(account.getUsername());

        btnRefresh.setVisible(account instanceof YggdrasilAccount);
@@ -103,7 +106,7 @@ public class AccountPage extends StackPane implements DecoratorPage {

    @FXML
    private void onDelete() {
-        Settings.INSTANCE.deleteAccount(account);
+        Accounts.getAccounts().remove(account);
        Optional.ofNullable(onDelete.get()).ifPresent(Runnable::run);
    }

@@ -19,166 +19,172 @@ package org.jackhuang.hmcl.ui;

 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.Node;
 import javafx.scene.control.Hyperlink;
 import javafx.scene.control.Label;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
-import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
-import org.jackhuang.hmcl.Launcher;
+
 import org.jackhuang.hmcl.auth.*;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
-import org.jackhuang.hmcl.auth.offline.OfflineAccount;
 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.setting.Settings;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
-import org.jackhuang.hmcl.ui.animation.TransitionHandler;
 import org.jackhuang.hmcl.ui.construct.AdvancedListBox;
+import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 import org.jackhuang.hmcl.ui.construct.IconedItem;
 import org.jackhuang.hmcl.ui.construct.SpinnerPane;
 import org.jackhuang.hmcl.ui.construct.Validator;
 import org.jackhuang.hmcl.util.Constants;
 import org.jackhuang.hmcl.util.Logging;

-import static org.jackhuang.hmcl.ui.FXUtils.jfxListCellFactory;
-import static org.jackhuang.hmcl.ui.FXUtils.stringConverter;
-
 import java.util.List;
-import java.util.Optional;
 import java.util.concurrent.CountDownLatch;
-import java.util.function.Consumer;
 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.jfxListCellFactory;
+import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
+import static org.jackhuang.hmcl.ui.FXUtils.stringConverter;
+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<String> cboType;
+    @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;
-    private final Consumer<Region> finalization;
-
-    public AddAccountPane(Consumer<Region> finalization) {
-        this.finalization = finalization;

+    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));
-        cboServers.setItems(Settings.SETTINGS.authlibInjectorServers);
+        Bindings.bindContent(cboServers.getItems(), config().getAuthlibInjectorServers());
+        cboServers.getItems().addListener(onInvalidating(this::selectDefaultServer));
+        selectDefaultServer();

-        // workaround: otherwise the combox will be black
-        if (!cboServers.getItems().isEmpty())
-            cboServers.getSelectionModel().select(0);
-
-        cboType.getItems().setAll(Launcher.i18n("account.methods.offline"), Launcher.i18n("account.methods.yggdrasil"), Launcher.i18n("account.methods.authlib_injector"));
-        cboType.getSelectionModel().selectedIndexProperty().addListener((a, b, newValue) -> {
-            txtPassword.setVisible(newValue.intValue() != 0);
-            lblPassword.setVisible(newValue.intValue() != 0);
-            cboServers.setVisible(newValue.intValue() == 2);
-            linkManageInjectorServers.setVisible(newValue.intValue() == 2);
-            lblInjectorServer.setVisible(newValue.intValue() == 2);
-            validateAcceptButton();
-        });
+        cboType.getItems().setAll(Accounts.FACTORY_OFFLINE, Accounts.FACTORY_YGGDRASIL, Accounts.FACTORY_AUTHLIB_INJECTOR);
+        cboType.setConverter(stringConverter(Accounts::getAccountTypeName));
        cboType.getSelectionModel().select(0);

-        txtPassword.setOnAction(e -> onCreationAccept());
-        txtUsername.setOnAction(e -> onCreationAccept());
-        txtUsername.getValidators().add(new Validator(Launcher.i18n("input.email"), str -> !txtPassword.isVisible() || str.contains("@")));
+        ReadOnlyObjectProperty<AccountFactory<?>> loginType = cboType.getSelectionModel().selectedItemProperty();

-        txtUsername.textProperty().addListener(it -> validateAcceptButton());
-        txtPassword.textProperty().addListener(it -> validateAcceptButton());
+        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()));
    }

-    private void validateAcceptButton() {
-        btnAccept.setDisable(!txtUsername.validate() || (cboType.getSelectionModel().getSelectedIndex() != 0 && !txtPassword.validate()));
+    /**
+     * Selects the first server if no server is selected.
+     */
+    private void selectDefaultServer() {
+        if (!cboServers.getItems().isEmpty() && cboServers.getSelectionModel().isEmpty()) {
+            cboServers.getSelectionModel().select(0);
+        }
+    }
+
+    /**
+     * 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() {
-        String username = txtUsername.getText();
-        String password = txtPassword.getText();
-        Object addtionalData;
-
-        int type = cboType.getSelectionModel().getSelectedIndex();
-        AccountFactory<?> factory;
-        switch (type) {
-            case 0:
-                factory = Accounts.ACCOUNT_FACTORY.get(Accounts.OFFLINE_ACCOUNT_KEY);
-                addtionalData = null;
-                break;
-            case 1:
-                factory = Accounts.ACCOUNT_FACTORY.get(Accounts.YGGDRASIL_ACCOUNT_KEY);
-                addtionalData = null;
-                break;
-            case 2:
-                factory = Accounts.ACCOUNT_FACTORY.get(Accounts.AUTHLIB_INJECTOR_ACCOUNT_KEY);
-                Optional<AuthlibInjectorServer> server = Optional.ofNullable(cboServers.getSelectionModel().getSelectedItem());
-                if (server.isPresent()) {
-                    addtionalData = server.get();
-                } else {
-                    lblCreationWarning.setText(Launcher.i18n("account.failed.no_selected_server"));
-                    return;
-                }
-                break;
-            default:
-                throw new Error();
-        }
+        if (btnAccept.isDisabled())
+            return;

        acceptPane.showSpinner();
        lblCreationWarning.setText("");
+        setDisable(true);

-        Task.ofResult("create_account", () -> factory.create(new Selector(), username, password, addtionalData, Settings.INSTANCE.getProxy()))
+        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 -> {
-                    Settings.INSTANCE.addAccount(variables.get("create_account"));
+
+                    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();
-                    finalization.accept(this);
+                    fireEvent(new DialogCloseEvent());
                }, exception -> {
                    if (exception instanceof NoSelectedCharacterException) {
-                        finalization.accept(this);
+                        fireEvent(new DialogCloseEvent());
                    } else {
                        lblCreationWarning.setText(accountException(exception));
                    }
+                    setDisable(false);
                    acceptPane.hideSpinner();
                }).start();
    }

    @FXML
    private void onCreationCancel() {
-        finalization.accept(this);
+        fireEvent(new DialogCloseEvent());
    }

    @FXML
    private void onManageInjecterServers() {
-        finalization.accept(this);
+        fireEvent(new DialogCloseEvent());
        Controllers.navigate(Controllers.getServersPage());
    }

-    private void showSelector(Node node) {
-        getChildren().setAll(node);
-    }
-
-    private void closeSelector() {
-        getChildren().setAll(layout);
-    }
-
    private class Selector extends BorderPane implements CharacterSelector {
        private final AdvancedListBox listBox = new AdvancedListBox();
        private final JFXButton cancel = new JFXButton();
@@ -189,11 +195,11 @@ public class AddAccountPane extends StackPane {
        {
            setStyle("-fx-padding: 8px;");

-            cancel.setText(Launcher.i18n("button.cancel"));
+            cancel.setText(i18n("button.cancel"));
            StackPane.setAlignment(cancel, Pos.BOTTOM_RIGHT);
            cancel.setOnMouseClicked(e -> latch.countDown());

-            listBox.startCategory(Launcher.i18n("account.choose"));
+            listBox.startCategory(i18n("account.choose"));

            setCenter(listBox);

@@ -212,7 +218,7 @@ public class AddAccountPane extends StackPane {
            for (GameProfile profile : names) {
                Image image;
                try {
-                    image = AccountHelper.getSkinImmediately(yggdrasilAccount, profile, 4, Settings.INSTANCE.getProxy());
+                    image = AccountHelper.getSkinImmediately(yggdrasilAccount, profile, 4);
                } catch (Exception e) {
                    Logging.LOG.log(Level.WARNING, "Failed to get skin for " + profile.getName(), e);
                    image = null;
@@ -235,7 +241,7 @@ public class AddAccountPane extends StackPane {
                listBox.add(accountItem);
            }

-            JFXUtilities.runInFX(() -> showSelector(this));
+            JFXUtilities.runInFX(() -> Controllers.dialog(this));

            try {
                latch.await();
@@ -243,35 +249,36 @@ public class AddAccountPane extends StackPane {
                if (selectedProfile == null)
                    throw new NoSelectedCharacterException(account);

-                JFXUtilities.runInFX(AddAccountPane.this::closeSelector);
-
                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 InvalidCredentialsException) {
-            return Launcher.i18n("account.failed.invalid_credentials");
-        } else if (exception instanceof NoCharacterException) {
-            return Launcher.i18n("account.failed.no_charactor");
+        if (exception instanceof NoCharacterException) {
+            return i18n("account.failed.no_character");
        } else if (exception instanceof ServerDisconnectException) {
-            return Launcher.i18n("account.failed.connect_authentication_server");
-        } else if (exception instanceof InvalidTokenException) {
-            return Launcher.i18n("account.failed.invalid_token");
-        } else if (exception instanceof InvalidPasswordException) {
-            return Launcher.i18n("account.failed.invalid_password");
+            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() + ": " + exception.getLocalizedMessage();
+            return exception.getClass().getName() + ": " + exception.getLocalizedMessage();
        }
    }
-
-    public static String accountType(Account account) {
-        if (account instanceof OfflineAccount) return Launcher.i18n("account.methods.offline");
-        else if (account instanceof AuthlibInjectorAccount) return Launcher.i18n("account.methods.authlib_injector");
-        else if (account instanceof YggdrasilAccount) return Launcher.i18n("account.methods.yggdrasil");
-        else throw new Error(Launcher.i18n("account.methods.no_method") + ": " + account);
-    }
 }
@@ -0,0 +1,142 @@
+/*
+ * 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 static org.jackhuang.hmcl.ui.FXUtils.loadFXML;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+import java.io.IOException;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
+import org.jackhuang.hmcl.ui.animation.TransitionHandler;
+import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
+import org.jackhuang.hmcl.ui.construct.SpinnerPane;
+import org.jackhuang.hmcl.util.NetworkUtils;
+
+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 static org.jackhuang.hmcl.setting.ConfigHolder.config;
+
+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());
+    }
+
+}
@@ -1,134 +1,66 @@
+/*
+ * 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.*;
+import static org.jackhuang.hmcl.ui.FXUtils.loadFXML;
+import static org.jackhuang.hmcl.ui.FXUtils.smoothScrolling;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
+import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
+import org.jackhuang.hmcl.util.MappedObservableList;
+
+import javafx.beans.binding.Bindings;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
+import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
-import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.Launcher;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
-import org.jackhuang.hmcl.setting.Settings;
-import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
-import org.jackhuang.hmcl.ui.animation.TransitionHandler;
-import org.jackhuang.hmcl.ui.construct.SpinnerPane;
-import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
-import org.jackhuang.hmcl.util.NetworkUtils;

-import static java.util.stream.Collectors.toList;
-
-import java.io.IOException;
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;

 public class AuthlibInjectorServersPage extends StackPane implements DecoratorPage {
-    private final StringProperty title = new SimpleStringProperty(this, "title", Launcher.i18n("account.injector.server"));
+    private final StringProperty title = new SimpleStringProperty(this, "title", i18n("account.injector.manage.title"));

    @FXML private ScrollPane scrollPane;
-    @FXML private StackPane addServerContainer;
-    @FXML private Label lblServerUrl;
-    @FXML private Label lblServerName;
-    @FXML private Label lblCreationWarning;
-    @FXML private Label lblServerWarning;
    @FXML private VBox listPane;
-    @FXML private JFXTextField txtServerUrl;
-    @FXML private JFXDialogLayout addServerPane;
-    @FXML private JFXDialogLayout confirmServerPane;
-    @FXML private JFXDialog dialog;
    @FXML private StackPane contentPane;
-    @FXML private SpinnerPane nextPane;
-    @FXML private JFXButton btnAddNext;

-    private final TransitionHandler transitionHandler;
+    private ObservableList<AuthlibInjectorServerItem> serverItems;

-    private AuthlibInjectorServer serverBeingAdded;
+    public AuthlibInjectorServersPage() {
+        loadFXML(this, "/assets/fxml/authlib-injector-servers.fxml");
+        smoothScrolling(scrollPane);

-    {
-        FXUtils.loadFXML(this, "/assets/fxml/authlib-injector-servers.fxml");
-        FXUtils.smoothScrolling(scrollPane);
-        transitionHandler = new TransitionHandler(addServerContainer);
-
-        getChildren().remove(dialog);
-        dialog.setDialogContainer(this);
-
-        txtServerUrl.textProperty().addListener((a, b, newValue) ->
-                btnAddNext.setDisable(!txtServerUrl.validate()));
-
-        reload();
+        serverItems = MappedObservableList.create(config().getAuthlibInjectorServers(), this::createServerItem);
+        Bindings.bindContent(listPane.getChildren(), serverItems);
    }

-    private void removeServer(AuthlibInjectorServerItem item) {
-        Settings.SETTINGS.authlibInjectorServers.remove(item.getServer());
-        reload();
-    }
-
-    private void reload() {
-        listPane.getChildren().setAll(
-                Settings.SETTINGS.authlibInjectorServers.stream()
-                        .map(server -> new AuthlibInjectorServerItem(server, this::removeServer))
-                        .collect(toList()));
-        if (Settings.SETTINGS.authlibInjectorServers.isEmpty()) {
-            onAdd();
-        }
+    private AuthlibInjectorServerItem createServerItem(AuthlibInjectorServer server) {
+        return new AuthlibInjectorServerItem(server,
+                item -> config().getAuthlibInjectorServers().remove(item.getServer()));
    }

    @FXML
    private void onAdd() {
-        transitionHandler.setContent(addServerPane, ContainerAnimations.NONE.getAnimationProducer());
-        txtServerUrl.setText("");
-        txtServerUrl.resetValidation();
-        lblCreationWarning.setText("");
-        addServerPane.setDisable(false);
-        nextPane.hideSpinner();
-        dialog.show();
-    }
-
-    @FXML
-    private void onAddCancel() {
-        dialog.close();
-    }
-
-    @FXML
-    private void onAddNext() {
-        String url = fixInputUrl(txtServerUrl.getText());
-
-        nextPane.showSpinner();
-        addServerPane.setDisable(true);
-
-        Task.of(() -> {
-            serverBeingAdded = AuthlibInjectorServer.fetchServerInfo(url);
-        }).finalized(Schedulers.javafx(), (variables, isDependentsSucceeded) -> {
-            nextPane.hideSpinner();
-            addServerPane.setDisable(false);
-
-            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 (!Settings.INSTANCE.SETTINGS.authlibInjectorServers.contains(serverBeingAdded)) {
-            Settings.INSTANCE.SETTINGS.authlibInjectorServers.add(serverBeingAdded);
-        }
-        reload();
-        dialog.close();
+        Controllers.dialog(new AddAuthlibInjectorServerPane());
    }

    public String getTitle() {
@@ -143,19 +75,4 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
    public void setTitle(String title) {
        this.title.set(title);
    }
-
-    private String fixInputUrl(String url) {
-        if (!url.endsWith("/")) {
-            url += "/";
-        }
-        return url;
-    }
-
-    private String resolveFetchExceptionMessage(Throwable exception) {
-        if (exception instanceof IOException) {
-            return Launcher.i18n("account.failed.connect_injector_server");
-        } else {
-            return exception.getClass() + ": " + exception.getLocalizedMessage();
-        }
-    }
 }
@@ -23,6 +23,7 @@ import javafx.scene.image.Image;
 import javafx.scene.layout.Region;
 import javafx.stage.Stage;
 import org.jackhuang.hmcl.Launcher;
+import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
@@ -30,8 +31,11 @@ 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.util.FutureCallback;
 import org.jackhuang.hmcl.util.JavaVersion;

+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+
 import java.util.function.Consumer;

 public final class Controllers {
@@ -94,24 +98,24 @@ public final class Controllers {

        stage.setOnCloseRequest(e -> Launcher.stopApplication());

-        decorator = new Decorator(stage, getMainPage(), Launcher.TITLE, false, true);
+        decorator = new Decorator(stage, getMainPage(), Metadata.TITLE, false, true);
        decorator.showPage(null);
        leftPaneController = new LeftPaneController(decorator.getLeftPane());

-        Settings.INSTANCE.onProfileLoading();
+        Settings.instance().onProfileLoading();
        Task.of(JavaVersion::initialize).start();

        decorator.setCustomMaximize(false);

        scene = new Scene(decorator, 804, 521);
-        scene.getStylesheets().setAll(Settings.INSTANCE.getTheme().getStylesheets());
+        scene.getStylesheets().setAll(config().getTheme().getStylesheets());
        stage.setMinWidth(804);
        stage.setMaxWidth(804);
        stage.setMinHeight(521);
        stage.setMaxHeight(521);

        stage.getIcons().add(new Image("/assets/img/icon.png"));
-        stage.setTitle(Launcher.TITLE);
+        stage.setTitle(Metadata.TITLE);
    }

    public static void dialog(Region content) {
@@ -132,15 +136,17 @@ public final class Controllers {
    }

    public static void dialog(String text, String title, int type, Runnable onAccept) {
-        dialog(new MessageDialogPane(text, title, Controllers::closeDialog, 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, Controllers::closeDialog, onAccept, onCancel));
+        dialog(new MessageDialogPane(text, title, onAccept, onCancel));
    }

-    public static void inputDialog(String text, Consumer<String> onResult) {
-        dialog(new InputDialogPane(text, Controllers::closeDialog, onResult));
+    public static InputDialogPane inputDialog(String text, FutureCallback<String> onResult) {
+        InputDialogPane pane = new InputDialogPane(text, onResult);
+        dialog(pane);
+        return pane;
    }

    public static Region taskDialog(TaskExecutor executor, String title, String subtitle) {
@@ -156,11 +162,6 @@ public final class Controllers {
        return pane;
    }

-    public static void closeDialog(Region content) {
-
-        decorator.closeDialog(content);
-    }
-
    public static void navigate(Node node) {
        if (decorator.getNowPage() == node)
            decorator.showPage(null);
@@ -168,10 +169,8 @@ public final class Controllers {
            decorator.showPage(node);
    }

-    public static void showUpdate() {
-        if (stage == null) // shut down
-            return;
-        getLeftPaneController().showUpdate();
+    public static boolean isStopped() {
+        return decorator == null;
    }

    public static void shutdown() {
@@ -27,7 +27,11 @@ import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
-import org.jackhuang.hmcl.Launcher;
+
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+import org.jackhuang.hmcl.Metadata;
+import org.jackhuang.hmcl.upgrade.UpdateChecker;

 /**
 * @author huangyuhui
@@ -36,10 +40,10 @@ public class CrashWindow extends Stage {

    public CrashWindow(String text) {
        Label lblCrash = new Label();
-        if (Launcher.UPDATE_CHECKER.isOutOfDate())
-            lblCrash.setText(Launcher.i18n("launcher.crash_out_dated"));
+        if (UpdateChecker.isOutdated())
+            lblCrash.setText(i18n("launcher.crash_out_dated"));
        else
-            lblCrash.setText(Launcher.i18n("launcher.crash"));
+            lblCrash.setText(i18n("launcher.crash"));
        lblCrash.setWrapText(true);

        TextArea textArea = new TextArea();
@@ -47,8 +51,8 @@ public class CrashWindow extends Stage {
        textArea.setEditable(false);

        Button btnContact = new Button();
-        btnContact.setText(Launcher.i18n("launcher.contact"));
-        btnContact.setOnMouseClicked(event -> FXUtils.openLink(Launcher.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 +69,7 @@ public class CrashWindow extends Stage {
        Scene scene = new Scene(pane, 800, 480);
        setScene(scene);
        getIcons().add(new Image("/assets/img/icon.png"));
-        setTitle(Launcher.i18n("message.error"));
+        setTitle(i18n("message.error"));

        setOnCloseRequest(e -> System.exit(1));
    }
@@ -22,12 +22,17 @@ import com.jfoenix.controls.JFXDialog;
 import com.jfoenix.controls.JFXDrawer;
 import com.jfoenix.controls.JFXHamburger;
 import com.jfoenix.svg.SVGGlyph;
+import javafx.animation.Interpolator;
+import javafx.animation.KeyFrame;
+import javafx.animation.KeyValue;
+import javafx.animation.Timeline;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
+import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.geometry.BoundingBox;
 import javafx.geometry.Bounds;
@@ -38,6 +43,8 @@ import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.control.Tooltip;
 import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.DragEvent;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.*;
 import javafx.scene.paint.Color;
@@ -45,25 +52,38 @@ import javafx.scene.shape.Rectangle;
 import javafx.stage.Screen;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
+import javafx.util.Duration;
 import org.jackhuang.hmcl.Launcher;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDnD;
+import org.jackhuang.hmcl.setting.ConfigHolder;
 import org.jackhuang.hmcl.setting.EnumBackgroundImage;
-import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.animation.AnimationProducer;
 import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
 import org.jackhuang.hmcl.ui.animation.TransitionHandler;
 import org.jackhuang.hmcl.ui.construct.AdvancedListBox;
+import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 import org.jackhuang.hmcl.ui.construct.StackContainerPane;
 import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogWizardDisplayer;
 import org.jackhuang.hmcl.ui.wizard.*;
-import org.jackhuang.hmcl.util.FileUtils;
 import org.jackhuang.hmcl.util.Lang;
-import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.OperatingSystem;

-import java.io.File;
+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.Queue;
 import java.util.Random;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.logging.Level;
+
+import static java.util.stream.Collectors.toList;
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.util.Logging.LOG;

 public final class Decorator extends StackPane implements TaskExecutorDialogWizardDisplayer {
    private static final SVGGlyph minus = Lang.apply(new SVGGlyph(0, "MINUS", "M804.571 420.571v109.714q0 22.857-16 38.857t-38.857 16h-694.857q-22.857 0-38.857-16t-16-38.857v-109.714q0-22.857 16-38.857t38.857-16h694.857q22.857 0 38.857 16t16 38.857z", Color.WHITE),
@@ -75,6 +95,8 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
    private static final SVGGlyph close = Lang.apply(new SVGGlyph(0, "CLOSE", "M810 274l-238 238 238 238-60 60-238-238-238 238-60-60 238-238-238-238 60-60 238 238 238-238z", Color.WHITE),
            glyph -> { glyph.setPrefSize(12, 12); glyph.setSize(12, 12); });

+    private static final String PROPERTY_DIALOG_CLOSE_HANDLER = Decorator.class.getName() + ".dialog.closeListener";
+
    private final ObjectProperty<Runnable> onCloseButtonAction;
    private final BooleanProperty customMaximize = new SimpleBooleanProperty(false);

@@ -83,13 +105,14 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
    private final boolean max, min;
    private final WizardController wizardController = new WizardController(this);
    private final Queue<Object> cancelQueue = new ConcurrentLinkedQueue<>();
-    private final JFXDialog dialog;

    private double xOffset, yOffset, newX, newY, initX, initY;
    private boolean allowMove, isDragging, maximized;
    private BoundingBox originalBox, maximizedBox;
    private final TransitionHandler animationHandler;
-    private final StackContainerPane dialogPane = new StackContainerPane();
+
+    private JFXDialog dialog;
+    private StackContainerPane dialogPane;

    @FXML
    private StackPane contentPlaceHolder;
@@ -129,6 +152,10 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
    private JFXButton btnClose;
    @FXML
    private HBox navLeft;
+    @FXML
+    private ImageView welcomeView;
+    @FXML
+    private Rectangle separator;

    public Decorator(Stage primaryStage, Node mainPage, String title) {
        this(primaryStage, mainPage, title, true, true);
@@ -158,6 +185,8 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
        closeNavButton.setGraphic(SVG.close(Theme.foregroundFillBinding(), 15, 15));
        backNavButton.setGraphic(SVG.back(Theme.foregroundFillBinding(), 15, 15));

+        separator.visibleProperty().bind(refreshNavButton.visibleProperty());
+
        lblTitle.setText(title);

        buttonsContainer.setBackground(new Background(new BackgroundFill(Color.BLACK, CornerRadii.EMPTY, Insets.EMPTY)));
@@ -166,11 +195,18 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
                btnMax.fire();
        });

-        dialog = new JFXDialog();
-        dialog.setOverlayClose(false);
-        drawerWrapper.getChildren().add(0, dialog);
-        dialog.setDialogContainer(drawerWrapper);
-        dialog.setContent(dialogPane);
+        welcomeView.setCursor(Cursor.HAND);
+        welcomeView.setOnMouseClicked(e -> {
+            Timeline nowAnimation = new Timeline();
+            nowAnimation.getKeyFrames().addAll(
+                    new KeyFrame(Duration.ZERO, new KeyValue(welcomeView.opacityProperty(), 1.0D, Interpolator.EASE_BOTH)),
+                    new KeyFrame(new Duration(300), new KeyValue(welcomeView.opacityProperty(), 0.0D, Interpolator.EASE_BOTH)),
+                    new KeyFrame(new Duration(300), e2 -> drawerWrapper.getChildren().remove(welcomeView))
+            );
+            nowAnimation.play();
+        });
+        if (!ConfigHolder.isNewlyCreated() || config().getLocalization().getLocale() != Locale.CHINA)
+            drawerWrapper.getChildren().remove(welcomeView);

        if (!min) buttonsContainer.getChildren().remove(btnMin);
        if (!max) buttonsContainer.getChildren().remove(btnMax);
@@ -187,83 +223,102 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza

        animationHandler = new TransitionHandler(contentPlaceHolder);

-        loadBackground();
+        setupBackground();
+        setupAuthlibInjectorDnD();
    }

-    private void loadBackground() {
+    // ==== Background ====
+    private void setupBackground() {
+        drawerWrapper.backgroundProperty().bind(
+                Bindings.createObjectBinding(
+                        () -> {
+                            Image image = null;
+                            if (config().getBackgroundImageType() == EnumBackgroundImage.CUSTOM && config().getBackgroundImage() != null) {
+                                image = tryLoadImage(Paths.get(config().getBackgroundImage()))
+                                        .orElse(null);
+                            }
+                            if (image == null) {
+                                image = loadDefaultBackgroundImage();
+                            }
+                            return new Background(new BackgroundImage(image, BackgroundRepeat.NO_REPEAT, BackgroundRepeat.NO_REPEAT, BackgroundPosition.DEFAULT, new BackgroundSize(800, 480, false, false, true, true)));
+                        },
+                        config().backgroundImageTypeProperty(),
+                        config().backgroundImageProperty()));
+    }
+
+    private Image defaultBackground = new Image("/assets/img/background.jpg");
+
+    /**
+     * Load background image from bg/, background.png, background.jpg
+     */
+    private Image loadDefaultBackgroundImage() {
+        Optional<Image> image = randomImageIn(Paths.get("bg"));
+        if (!image.isPresent()) {
+            image = tryLoadImage(Paths.get("background.png"));
+        }
+        if (!image.isPresent()) {
+            image = tryLoadImage(Paths.get("background.jpg"));
+        }
+        return image.orElse(defaultBackground);
+    }
+
+    private Optional<Image> randomImageIn(Path imageDir) {
+        if (!Files.isDirectory(imageDir)) {
+            return Optional.empty();
+        }
+
+        List<Path> candidates;
        try {
-            Image background;
-
-            if (Settings.INSTANCE.getBackgroundImageType() == EnumBackgroundImage.DEFAULT)
-                background = searchBackgroundImage(new Image("/assets/img/background.jpg"), "");
-            else
-                background = searchBackgroundImage(new Image("/assets/img/background.jpg"), Settings.INSTANCE.getBackgroundImage());
-
-            drawerWrapper.setBackground(new Background(new BackgroundImage(background, BackgroundRepeat.NO_REPEAT, BackgroundRepeat.NO_REPEAT, BackgroundPosition.DEFAULT, new BackgroundSize(800, 480, false, false, true, true))));
-        } catch (IllegalArgumentException ignore) {
+            candidates = Files.list(imageDir)
+                    .filter(Files::isRegularFile)
+                    .filter(it -> {
+                        String filename = it.getFileName().toString();
+                        return filename.endsWith(".png") || filename.endsWith(".jpg");
+                    })
+                    .collect(toList());
+        } catch (IOException e) {
+            LOG.log(Level.WARNING, "Failed to list files in ./bg", e);
+            return Optional.empty();
        }
+
+        Random rnd = new Random();
+        while (candidates.size() > 0) {
+            int selected = rnd.nextInt(candidates.size());
+            Optional<Image> loaded = tryLoadImage(candidates.get(selected));
+            if (loaded.isPresent()) {
+                return Optional.of(loaded.get());
+            } else {
+                candidates.remove(selected);
+            }
+        }
+        return Optional.empty();
    }

-    private static Image searchBackgroundImage(Image def, String customPath) {
-        Random random = new Random();
-        boolean loaded = false;
-        Image background = def;
-
-        // custom path
-        if (StringUtils.isNotBlank(customPath)) {
+    private Optional<Image> tryLoadImage(Path path) {
+        if (Files.isRegularFile(path)) {
            try {
-                background = new Image("file:" + customPath);
-                loaded = true;
-            } catch (IllegalArgumentException ignore) {
+                return Optional.of(new Image(path.toAbsolutePath().toUri().toString()));
+            } catch (IllegalArgumentException ignored) {
            }
        }
-
-        // 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;
+        return Optional.empty();
    }

+    private boolean isMaximized() {
+        switch (OperatingSystem.CURRENT_OS) {
+            case OSX:
+                Rectangle2D bounds = Screen.getPrimary().getVisualBounds();
+                return primaryStage.getWidth() >= bounds.getWidth() && primaryStage.getHeight() >= bounds.getHeight();
+            default:
+                return primaryStage.isMaximized();
+        }
+    }
+
+    // ====
+
    @FXML
    private void onMouseMoved(MouseEvent mouseEvent) {
-        if (!primaryStage.isMaximized() && !primaryStage.isFullScreen() && !maximized) {
+        if (!isMaximized() && !primaryStage.isFullScreen() && !maximized) {
            if (!primaryStage.isResizable())
                updateInitMouseValues(mouseEvent);
            else {
@@ -312,7 +367,7 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
    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) {
+            if (!this.primaryStage.isFullScreen() && !mouseEvent.isStillSincePress() && !isMaximized() && !this.maximized) {
                this.newX = mouseEvent.getScreenX();
                this.newY = mouseEvent.getScreenY();
                double deltaX = this.newX - this.initX;
@@ -542,20 +597,39 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
    public void showDialog(Node node) {
        FXUtils.checkFxUserThread();

-        if (dialogPane.isEmpty())
+        if (dialog == null) {
+            dialog = new JFXDialog();
+            dialogPane = new StackContainerPane();
+
+            dialog.setContent(dialogPane);
+            dialog.setDialogContainer(drawerWrapper);
+            dialog.setOverlayClose(false);
            dialog.show();
+        }
+
        dialogPane.push(node);
+
+        EventHandler<DialogCloseEvent> handler = event -> closeDialog(node);
+        node.getProperties().put(PROPERTY_DIALOG_CLOSE_HANDLER, handler);
+        node.addEventHandler(DialogCloseEvent.CLOSE, handler);
    }

-    public void closeDialog(Node node) {
+    @SuppressWarnings("unchecked")
+    private void closeDialog(Node node) {
        FXUtils.checkFxUserThread();

-        dialogPane.pop(node);
-        if (dialogPane.getChildren().isEmpty())
-            Platform.runLater(() -> {
-                if (dialogPane.getChildren().isEmpty())
-                    dialog.close();
-            });
+        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 startWizard(WizardProvider wizardProvider) {
@@ -649,4 +723,10 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
    public AdvancedListBox getLeftPane() {
        return leftPane;
    }
+
+    private void setupAuthlibInjectorDnD() {
+        addEventFilter(DragEvent.DRAG_OVER, AuthlibInjectorDnD.dragOverHandler());
+        addEventFilter(DragEvent.DRAG_DROPPED, AuthlibInjectorDnD.dragDroppedHandler(
+                url -> Controllers.dialog(new AddAuthlibInjectorServerPane(url))));
+    }
 }
@@ -34,7 +34,7 @@ public final class DialogController {
            CountDownLatch latch = new CountDownLatch(1);
            AtomicReference<AuthInfo> res = new AtomicReference<>(null);
            JFXUtilities.runInFX(() -> {
-                AccountLoginPane pane = new AccountLoginPane(account, Controllers::closeDialog, it -> {
+                AccountLoginPane pane = new AccountLoginPane(account, it -> {
                        res.set(it);
                        latch.countDown();
                }, latch::countDown);
@@ -45,9 +45,8 @@ import javafx.util.Callback;
 import javafx.util.Duration;
 import javafx.util.StringConverter;

-import org.jackhuang.hmcl.Launcher;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.util.*;
+import org.jackhuang.hmcl.util.i18n.I18n;

 import java.io.File;
 import java.io.IOException;
@@ -204,7 +203,7 @@ public final class FXUtils {
    }

    public static void loadFXML(Node node, String absolutePath) {
-        FXMLLoader loader = new FXMLLoader(node.getClass().getResource(absolutePath), Launcher.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);
@@ -20,7 +20,7 @@ package org.jackhuang.hmcl.ui;
 import javafx.fxml.FXML;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.Launcher;
+
 import org.jackhuang.hmcl.download.MaintainTask;
 import org.jackhuang.hmcl.download.game.VersionJsonSaveTask;
 import org.jackhuang.hmcl.game.GameVersion;
@@ -30,6 +30,7 @@ import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.download.InstallerWizardProvider;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 import java.util.LinkedList;
 import java.util.Optional;
@@ -90,7 +91,7 @@ public class InstallerController {
        Optional<String> gameVersion = GameVersion.minecraftVersion(profile.getRepository().getVersionJar(version));

        if (!gameVersion.isPresent())
-            Controllers.dialog(Launcher.i18n("version.cannot_read"));
+            Controllers.dialog(i18n("version.cannot_read"));
        else
            Controllers.getDecorator().startWizard(new InstallerWizardProvider(profile, gameVersion.get(), version, forge, liteLoader, optiFine));
    }
@@ -21,7 +21,8 @@ import com.jfoenix.effects.JFXDepthManager;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.layout.BorderPane;
-import org.jackhuang.hmcl.Launcher;
+
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 import java.util.function.Consumer;

@@ -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(Launcher.i18n("archive.version") + ": " + version);
+        lblInstallerVersion.setText(i18n("archive.version") + ": " + version);
    }

    @FXML
@@ -21,6 +21,12 @@ import com.jfoenix.concurrency.JFXUtilities;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXPopup;
 import javafx.application.Platform;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.When;
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.Node;
 import javafx.scene.control.Tooltip;
 import javafx.scene.image.Image;
@@ -28,12 +34,11 @@ import javafx.scene.input.MouseButton;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
-import org.jackhuang.hmcl.Launcher;
+
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
 import org.jackhuang.hmcl.auth.offline.OfflineAccount;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
-import org.jackhuang.hmcl.download.VersionList;
 import org.jackhuang.hmcl.event.*;
 import org.jackhuang.hmcl.game.AccountHelper;
 import org.jackhuang.hmcl.game.HMCLGameRepository;
@@ -44,44 +49,71 @@ import org.jackhuang.hmcl.setting.*;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
-import org.jackhuang.hmcl.ui.construct.AdvancedListBox;
-import org.jackhuang.hmcl.ui.construct.ClassTitle;
-import org.jackhuang.hmcl.ui.construct.IconedItem;
-import org.jackhuang.hmcl.ui.construct.RipplerContainer;
+import org.jackhuang.hmcl.ui.construct.*;
+import org.jackhuang.hmcl.upgrade.UpdateChecker;
 import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.MappedObservableList;

 import java.io.File;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;

+import static javafx.collections.FXCollections.singletonObservableList;
+import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
 public final class LeftPaneController {
    private final AdvancedListBox leftPane;
    private final VBox profilePane = new VBox();
    private final VBox accountPane = new VBox();
    private final IconedItem launcherSettingsItem;
-    private final VersionListItem missingAccountItem = new VersionListItem(Launcher.i18n("account.missing"), Launcher.i18n("message.unknown"));
-    private final HashMap<Account, VersionListItem> items = new HashMap<>();
+
+    private ListProperty<RipplerContainer> accountItems = new SimpleListProperty<>();
+    private ObjectProperty<Account> selectedAccount = new SimpleObjectProperty<Account>() {
+        {
+            accountItems.addListener(onInvalidating(this::invalidated));
+        }
+
+        @Override
+        protected void invalidated() {
+            Account selected = get();
+            accountItems.forEach(item -> item.setSelected(
+                    getAccountFromItem(item)
+                            .map(it -> it == selected)
+                            .orElse(false)));
+        }
+    };

    public LeftPaneController(AdvancedListBox leftPane) {
        this.leftPane = leftPane;

-        this.launcherSettingsItem = Lang.apply(new IconedItem(SVG.gear(Theme.blackFillBinding(), 20, 20), Launcher.i18n("settings.launcher")), iconedItem -> {
-            iconedItem.prefWidthProperty().bind(leftPane.widthProperty());
-            iconedItem.setOnMouseClicked(e -> Controllers.navigate(Controllers.getSettingsPage()));
-        });
+        launcherSettingsItem = new IconedItem(SVG.gear(Theme.blackFillBinding(), 20, 20));
+
+        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.prefWidthProperty().bind(leftPane.widthProperty());
+        launcherSettingsItem.setOnMouseClicked(e -> Controllers.navigate(Controllers.getSettingsPage()));

        leftPane
-                .add(new ClassTitle(Launcher.i18n("account").toUpperCase(), Lang.apply(new JFXButton(), button -> {
+                .add(new ClassTitle(i18n("account").toUpperCase(), Lang.apply(new JFXButton(), button -> {
                    button.setGraphic(SVG.plus(Theme.blackFillBinding(), 10, 10));
                    button.getStyleClass().add("toggle-icon-tiny");
                    button.setOnMouseClicked(e -> addNewAccount());
                })))
                .add(accountPane)
-                .startCategory(Launcher.i18n("launcher").toUpperCase())
+                .startCategory(i18n("launcher").toUpperCase())
                .add(launcherSettingsItem)
-                .add(new ClassTitle(Launcher.i18n("profile.title").toUpperCase(), Lang.apply(new JFXButton(), button -> {
+                .add(new ClassTitle(i18n("profile.title").toUpperCase(), Lang.apply(new JFXButton(), button -> {
                    button.setGraphic(SVG.plus(Theme.blackFillBinding(), 10, 10));
                    button.getStyleClass().add("toggle-icon-tiny");
                    button.setOnMouseClicked(e ->
@@ -89,30 +121,91 @@ public final class LeftPaneController {
                })))
                .add(profilePane);

-        EventBus.EVENT_BUS.channel(AccountAddedEvent.class).register(this::onAccountAdd);
-        EventBus.EVENT_BUS.channel(AccountLoadingEvent.class).register(this::onAccountsLoading);
+        // ==== Accounts ====
+        // Missing account item
+        AdvancedListItem missingAccountItem = new AdvancedListItem(i18n("account.missing"), i18n("message.unknown"));
+        RipplerContainer missingAccountRippler = new RipplerContainer(missingAccountItem);
+        missingAccountItem.setOnSettingsButtonClicked(e -> addNewAccount());
+        missingAccountRippler.setOnMouseClicked(e -> addNewAccount());
+
+        accountItems.bind(
+                new When(Accounts.accountsProperty().emptyProperty())
+                        .then(singletonObservableList(missingAccountRippler))
+                        .otherwise(MappedObservableList.create(Accounts.getAccounts(), this::createAccountItem)));
+        Bindings.bindContent(accountPane.getChildren(), accountItems);
+
+        selectedAccount.bindBidirectional(Accounts.selectedAccountProperty());
+        // ====
+
        EventBus.EVENT_BUS.channel(ProfileLoadingEvent.class).register(this::onProfilesLoading);
        EventBus.EVENT_BUS.channel(ProfileChangedEvent.class).register(this::onProfileChanged);
        EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).register(this::onRefreshedVersions);
+    }

-        FXUtils.onChangeAndOperate(Settings.INSTANCE.selectedAccountProperty(), this::onSelectedAccountChanged);
-        onAccountsLoading();
+    // ==== Accounts ====
+    private Optional<Account> getAccountFromItem(RipplerContainer accountItem) {
+        return Optional.ofNullable(accountItem.getProperties().get("account"))
+                .map(Account.class::cast);
+    }
+
+    private static String accountSubtitle(Account account) {
+        if (account instanceof OfflineAccount)
+            return i18n("account.methods.offline");
+        else if (account instanceof YggdrasilAccount)
+            return account.getUsername();
+        else
+            return "";
+    }
+
+    private RipplerContainer createAccountItem(Account account) {
+        AdvancedListItem item = new AdvancedListItem(account.getCharacter(), accountSubtitle(account));
+        RipplerContainer rippler = new RipplerContainer(item);
+        item.setOnSettingsButtonClicked(e -> {
+            AccountPage accountPage = new AccountPage(account, item);
+            JFXPopup popup = new JFXPopup(accountPage);
+            accountPage.setOnDelete(popup::hide);
+            popup.show((Node) e.getSource(), JFXPopup.PopupVPosition.TOP, JFXPopup.PopupHPosition.LEFT, e.getX(), e.getY());
+        });
+        rippler.setOnMouseClicked(e -> {
+            if (e.getButton() == MouseButton.PRIMARY) {
+                selectedAccount.set(account);
+            }
+        });
+        rippler.getProperties().put("account", account);
+        rippler.maxWidthProperty().bind(leftPane.widthProperty());
+
+        if (account instanceof YggdrasilAccount) {
+            Image image = AccountHelper.getSkin((YggdrasilAccount) account, 4);
+            item.setImage(image, AccountHelper.getViewport(4));
+        } else {
+            item.setImage(AccountHelper.getDefaultSkin(account.getUUID(), 4), AccountHelper.getViewport(4));
+        }
+
+        if (account instanceof AuthlibInjectorAccount) {
+            FXUtils.installTooltip(rippler, 500, 5000, 0, new Tooltip(((AuthlibInjectorAccount) account).getServer().getName()));
+        }
+
+        // update skin
+        if (account instanceof YggdrasilAccount) {
+            AccountHelper.refreshSkinAsync((YggdrasilAccount) account)
+                    .subscribe(Schedulers.javafx(), () -> {
+                        Image image = AccountHelper.getSkin((YggdrasilAccount) account, 4);
+                        item.setImage(image, AccountHelper.getViewport(4));
+                    });
+        }
+
+        return rippler;
+    }
+
+    public void checkAccount() {
+        if (Accounts.getAccounts().isEmpty())
+            addNewAccount();
    }

    private void addNewAccount() {
-        Controllers.dialog(new AddAccountPane(Controllers::closeDialog));
-    }
-
-    private void onSelectedAccountChanged(Account newAccount) {
-        Platform.runLater(() -> {
-            for (Node node : accountPane.getChildren()) {
-                if (node instanceof RipplerContainer && node.getProperties().get("account") instanceof Account) {
-                    boolean current = Objects.equals(node.getProperties().get("account"), newAccount);
-                    ((RipplerContainer) node).setSelected(current);
-                }
-            }
-        });
+        Controllers.dialog(new AddAccountPane());
    }
+    // ====

    private void onProfileChanged(ProfileChangedEvent event) {
        Profile profile = event.getProfile();
@@ -122,7 +215,7 @@ public final class LeftPaneController {
                if (node instanceof RipplerContainer && node.getProperties().get("profile") instanceof String) {
                    boolean current = Objects.equals(node.getProperties().get("profile"), profile.getName());
                    ((RipplerContainer) node).setSelected(current);
-                    ((VersionListItem) ((RipplerContainer) node).getContainer()).setGameVersion(current ? Launcher.i18n("profile.selected") : "");
+                    ((AdvancedListItem) ((RipplerContainer) node).getContainer()).setSubtitle(current ? i18n("profile.selected") : "");
                }
            }
        });
@@ -130,11 +223,11 @@ public final class LeftPaneController {

    private void onProfilesLoading() {
        LinkedList<RipplerContainer> list = new LinkedList<>();
-        for (Profile profile : Settings.INSTANCE.getProfiles()) {
-            VersionListItem item = new VersionListItem(Profiles.getProfileDisplayName(profile));
+        for (Profile profile : Settings.instance().getProfiles()) {
+            AdvancedListItem item = new AdvancedListItem(Profiles.getProfileDisplayName(profile));
            RipplerContainer ripplerContainer = new RipplerContainer(item);
            item.setOnSettingsButtonClicked(e -> Controllers.getDecorator().showPage(new ProfilePage(profile)));
-            ripplerContainer.setOnMouseClicked(e -> Settings.INSTANCE.setSelectedProfile(profile));
+            ripplerContainer.setOnMouseClicked(e -> Settings.instance().setSelectedProfile(profile));
            ripplerContainer.getProperties().put("profile", profile.getName());
            ripplerContainer.maxWidthProperty().bind(leftPane.widthProperty());
            list.add(ripplerContainer);
@@ -142,75 +235,6 @@ public final class LeftPaneController {
        Platform.runLater(() -> profilePane.getChildren().setAll(list));
    }

-    private static String accountType(Account account) {
-        if (account instanceof OfflineAccount) return Launcher.i18n("account.methods.offline");
-        else if (account instanceof YggdrasilAccount) return account.getUsername();
-        else throw new Error(Launcher.i18n("account.methods.no_method") + ": " + account);
-    }
-
-    private void onAccountAdd(AccountAddedEvent event) {
-        Account account = event.getAccount();
-        VersionListItem item = items.get(account);
-        if (account instanceof YggdrasilAccount)
-            AccountHelper.refreshSkinAsync((YggdrasilAccount) account)
-                    .subscribe(Schedulers.javafx(), () -> {
-                        Image image = AccountHelper.getSkin((YggdrasilAccount) account, 4);
-                        item.setImage(image, AccountHelper.getViewport(4));
-                    });
-    }
-
-    private void onAccountsLoading() {
-        LinkedList<RipplerContainer> list = new LinkedList<>();
-        items.clear();
-        Account selectedAccount = Settings.INSTANCE.getSelectedAccount();
-        for (Account account : Settings.INSTANCE.getAccounts()) {
-            VersionListItem item = new VersionListItem(account.getCharacter(), accountType(account));
-            items.put(account, item);
-            RipplerContainer ripplerContainer = new RipplerContainer(item);
-            item.setOnSettingsButtonClicked(e -> {
-                AccountPage accountPage = new AccountPage(account, item);
-                JFXPopup popup = new JFXPopup(accountPage);
-                accountPage.setOnDelete(popup::hide);
-                popup.show((Node) e.getSource(), JFXPopup.PopupVPosition.TOP, JFXPopup.PopupHPosition.LEFT, e.getX(), e.getY());
-            });
-            ripplerContainer.setOnMouseClicked(e -> {
-                if (e.getButton() == MouseButton.PRIMARY)
-                    Settings.INSTANCE.setSelectedAccount(account);
-            });
-            ripplerContainer.getProperties().put("account", account);
-            ripplerContainer.maxWidthProperty().bind(leftPane.widthProperty());
-
-            if (account instanceof YggdrasilAccount) {
-                Image image = AccountHelper.getSkin((YggdrasilAccount) account, 4);
-                item.setImage(image, AccountHelper.getViewport(4));
-            } else
-                item.setImage(AccountHelper.getDefaultSkin(account.getUUID(), 4), AccountHelper.getViewport(4));
-
-            if (account instanceof AuthlibInjectorAccount) {
-                FXUtils.installTooltip(ripplerContainer, 500, 5000, 0, new Tooltip(((AuthlibInjectorAccount) account).getServer().getName()));
-            }
-
-            if (selectedAccount == account)
-                ripplerContainer.setSelected(true);
-
-            list.add(ripplerContainer);
-        }
-
-        if (Settings.INSTANCE.getAccounts().isEmpty()) {
-            RipplerContainer container = new RipplerContainer(missingAccountItem);
-            missingAccountItem.setOnSettingsButtonClicked(e -> addNewAccount());
-            container.setOnMouseClicked(e -> addNewAccount());
-            list.add(container);
-        }
-
-        Platform.runLater(() -> accountPane.getChildren().setAll(list));
-    }
-
-    public void showUpdate() {
-        launcherSettingsItem.setText(Launcher.i18n("update.found"));
-        launcherSettingsItem.setTextFill(Color.RED);
-    }
-
    private boolean checkedModpack = false;
    private static boolean showNewAccount = true;

@@ -228,10 +252,10 @@ public final class LeftPaneController {
                            Modpack modpack = ModpackHelper.readModpackManifest(modpackFile);
                            TaskExecutor executor = ModpackHelper.getInstallTask(repository.getProfile(), modpackFile, modpack.getName(), modpack)
                                    .with(Task.of(Schedulers.javafx(), () -> {
-                                        Controllers.closeDialog(region.get());
+                                        region.get().fireEvent(new DialogCloseEvent());
                                        checkAccount();
                                    })).executor();
-                            region.set(Controllers.taskDialog(executor, Launcher.i18n("modpack.installing"), ""));
+                            region.set(Controllers.taskDialog(executor, i18n("modpack.installing"), ""));
                            executor.start();
                            showNewAccount = false;
                        } catch (UnsupportedModpackException ignore) {
@@ -246,9 +270,4 @@ public final class LeftPaneController {
            }
        });
    }
-
-    public void checkAccount() {
-        if (Settings.INSTANCE.getAccounts().isEmpty())
-            addNewAccount();
-    }
 }
@@ -30,7 +30,7 @@ import javafx.scene.layout.StackPane;
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebView;
 import javafx.stage.Stage;
-import org.jackhuang.hmcl.Launcher;
+
 import org.jackhuang.hmcl.event.Event;
 import org.jackhuang.hmcl.event.EventManager;
 import org.jackhuang.hmcl.game.LauncherHelper;
@@ -43,6 +43,9 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;

+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
 import java.util.concurrent.CountDownLatch;

 /**
@@ -62,8 +65,8 @@ public final class LogWindow extends Stage {

    public LogWindow() {
        setScene(new Scene(impl, 800, 480));
-        getScene().getStylesheets().addAll(Settings.INSTANCE.getTheme().getStylesheets());
-        setTitle(Launcher.i18n("logwindow.title"));
+        getScene().getStylesheets().addAll(config().getTheme().getStylesheets());
+        setTitle(i18n("logwindow.title"));
        getIcons().add(new Image("/assets/img/icon.png"));
    }

@@ -174,12 +177,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=" + Settings.instance().getLogLines());
                    latch.countDown();
                    onDone.fireEvent(new Event(LogWindow.this));
                }
@@ -187,14 +190,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(Settings.instance().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());
+                Settings.instance().setLogLines(newValue == null ? 100 : Integer.parseInt(newValue));
+                engine.executeScript("limitedLogs=" + Settings.instance().getLogLines());
            });

            if (!flag)
@@ -29,7 +29,7 @@ import javafx.scene.input.MouseButton;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import javafx.stage.FileChooser;
-import org.jackhuang.hmcl.Launcher;
+
 import org.jackhuang.hmcl.event.EventBus;
 import org.jackhuang.hmcl.event.ProfileChangedEvent;
 import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
@@ -37,16 +37,19 @@ import org.jackhuang.hmcl.event.RefreshingVersionsEvent;
 import org.jackhuang.hmcl.game.*;
 import org.jackhuang.hmcl.mod.MismatchedModpackTypeException;
 import org.jackhuang.hmcl.mod.UnsupportedModpackException;
+import org.jackhuang.hmcl.setting.Accounts;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
+import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 import org.jackhuang.hmcl.ui.construct.MessageBox;
 import org.jackhuang.hmcl.ui.download.DownloadWizardProvider;
 import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.OperatingSystem;
+import org.jackhuang.hmcl.util.VersionNumber;

 import java.io.File;
 import java.io.IOException;
@@ -57,10 +60,11 @@ 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 final class MainPage extends StackPane implements DecoratorPage {

-    private final StringProperty title = new SimpleStringProperty(this, "title", Launcher.i18n("main_page"));
+    private final StringProperty title = new SimpleStringProperty(this, "title", i18n("main_page"));

    private Profile profile;

@@ -95,10 +99,10 @@ public final class MainPage extends StackPane implements DecoratorPage {
            this.profile = event.getProfile();
        });

-        btnAdd.setOnMouseClicked(e -> Controllers.getDecorator().startWizard(new DownloadWizardProvider(), Launcher.i18n("install")));
-        FXUtils.installTooltip(btnAdd, Launcher.i18n("install"));
-        btnRefresh.setOnMouseClicked(e -> Settings.INSTANCE.getSelectedProfile().getRepository().refreshVersionsAsync().start());
-        FXUtils.installTooltip(btnRefresh, Launcher.i18n("button.refresh"));
+        btnAdd.setOnMouseClicked(e -> Controllers.getDecorator().startWizard(new DownloadWizardProvider(), i18n("install")));
+        FXUtils.installTooltip(btnAdd, i18n("install"));
+        btnRefresh.setOnMouseClicked(e -> Settings.instance().getSelectedProfile().getRepository().refreshVersionsAsync().start());
+        FXUtils.installTooltip(btnRefresh, i18n("button.refresh"));
    }

    private String modifyVersion(String gameVersion, String version) {
@@ -117,13 +121,13 @@ public final class MainPage extends StackPane implements DecoratorPage {
            StringBuilder libraries = new StringBuilder();
            for (Library library : version.getLibraries()) {
                if (library.getGroupId().equalsIgnoreCase("net.minecraftforge") && library.getArtifactId().equalsIgnoreCase("forge")) {
-                    libraries.append(Launcher.i18n("install.installer.forge")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)forge", ""))).append("\n");
+                    libraries.append(i18n("install.installer.forge")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)forge", ""))).append("\n");
                }
                if (library.getGroupId().equalsIgnoreCase("com.mumfrey") && library.getArtifactId().equalsIgnoreCase("liteloader")) {
-                    libraries.append(Launcher.i18n("install.installer.liteloader")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)liteloader", ""))).append("\n");
+                    libraries.append(i18n("install.installer.liteloader")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)liteloader", ""))).append("\n");
                }
                if (library.getGroupId().equalsIgnoreCase("net.optifine") && library.getArtifactId().equalsIgnoreCase("optifine")) {
-                    libraries.append(Launcher.i18n("install.installer.optifine")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)optifine", ""))).append("\n");
+                    libraries.append(i18n("install.installer.optifine")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)optifine", ""))).append("\n");
                }
            }

@@ -131,25 +135,25 @@ public final class MainPage extends StackPane implements DecoratorPage {
        });
        item.setVersionName(id);
        item.setOnLaunchButtonClicked(e -> {
-            if (Settings.INSTANCE.getSelectedAccount() == null)
+            if (Accounts.getSelectedAccount() == null)
                Controllers.getLeftPaneController().checkAccount();
            else
-                LauncherHelper.INSTANCE.launch(profile, Settings.INSTANCE.getSelectedAccount(), id, null);
+                LauncherHelper.INSTANCE.launch(profile, Accounts.getSelectedAccount(), id, null);
        });
        item.setOnScriptButtonClicked(e -> {
-            if (Settings.INSTANCE.getSelectedAccount() == null)
-                Controllers.dialog(Launcher.i18n("login.empty_username"));
+            if (Accounts.getSelectedAccount() == null)
+                Controllers.dialog(i18n("login.empty_username"));
            else {
                FileChooser chooser = new FileChooser();
                if (repository.getRunDirectory(id).isDirectory())
                    chooser.setInitialDirectory(repository.getRunDirectory(id));
-                chooser.setTitle(Launcher.i18n("version.launch_script.save"));
+                chooser.setTitle(i18n("version.launch_script.save"));
                chooser.getExtensionFilters().add(OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS
-                        ? new FileChooser.ExtensionFilter(Launcher.i18n("extension.bat"), "*.bat")
-                        : new FileChooser.ExtensionFilter(Launcher.i18n("extension.sh"), "*.sh"));
+                        ? new FileChooser.ExtensionFilter(i18n("extension.bat"), "*.bat")
+                        : new FileChooser.ExtensionFilter(i18n("extension.sh"), "*.sh"));
                File file = chooser.showSaveDialog(Controllers.getStage());
                if (file != null)
-                    LauncherHelper.INSTANCE.launch(profile, Settings.INSTANCE.getSelectedAccount(), id, file);
+                    LauncherHelper.INSTANCE.launch(profile, Accounts.getSelectedAccount(), id, file);
            }
        });
        item.setOnSettingsButtonClicked(e -> {
@@ -158,25 +162,25 @@ public final class MainPage extends StackPane implements DecoratorPage {
        });
        item.setOnUpdateButtonClicked(event -> {
            FileChooser chooser = new FileChooser();
-            chooser.setTitle(Launcher.i18n("modpack.choose"));
-            chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(Launcher.i18n("modpack"), "*.zip"));
+            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(), () -> Controllers.closeDialog(region.get()))).executor();
-                    region.set(Controllers.taskDialog(executor, Launcher.i18n("modpack.update"), ""));
+                            .then(Task.of(Schedulers.javafx(), () -> region.get().fireEvent(new DialogCloseEvent()))).executor();
+                    region.set(Controllers.taskDialog(executor, i18n("modpack.update"), ""));
                    executor.start();
                } catch (UnsupportedModpackException e) {
-                    Controllers.closeDialog(region.get());
-                    Controllers.dialog(Launcher.i18n("modpack.unsupported"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE);
+                    region.get().fireEvent(new DialogCloseEvent());
+                    Controllers.dialog(i18n("modpack.unsupported"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
                } catch (MismatchedModpackTypeException e) {
-                    Controllers.closeDialog(region.get());
-                    Controllers.dialog(Launcher.i18n("modpack.mismatched_type"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE);
+                    region.get().fireEvent(new DialogCloseEvent());
+                    Controllers.dialog(i18n("modpack.mismatched_type"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
                } catch (IOException e) {
-                    Controllers.closeDialog(region.get());
-                    Controllers.dialog(Launcher.i18n("modpack.invalid"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE);
+                    region.get().fireEvent(new DialogCloseEvent());
+                    Controllers.dialog(i18n("modpack.invalid"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
                }
            }
        });
@@ -187,10 +191,10 @@ public final class MainPage extends StackPane implements DecoratorPage {
                versionList.getStyleClass().add("option-list-view");
                FXUtils.setLimitWidth(versionList, 150);
                versionList.getItems().setAll(Lang.immutableListOf(
-                        Launcher.i18n("version.manage.rename"),
-                        Launcher.i18n("version.manage.remove"),
-                        Launcher.i18n("modpack.export"),
-                        Launcher.i18n("folder.game")
+                        i18n("version.manage.rename"),
+                        i18n("version.manage.remove"),
+                        i18n("modpack.export"),
+                        i18n("folder.game")
                ));
                versionList.setOnMouseClicked(e -> {
                    versionPopup.hide();
@@ -213,10 +217,10 @@ public final class MainPage extends StackPane implements DecoratorPage {
                });
                versionPopup.show(item, JFXPopup.PopupVPosition.TOP, JFXPopup.PopupHPosition.LEFT, event.getX(), event.getY());
            } else if (event.getButton() == MouseButton.PRIMARY && event.getClickCount() == 2) {
-                if (Settings.INSTANCE.getSelectedAccount() == null)
-                    Controllers.dialog(Launcher.i18n("login.empty_username"));
+                if (Accounts.getSelectedAccount() == null)
+                    Controllers.dialog(i18n("login.empty_username"));
                else
-                    LauncherHelper.INSTANCE.launch(profile, Settings.INSTANCE.getSelectedAccount(), id, null);
+                    LauncherHelper.INSTANCE.launch(profile, Accounts.getSelectedAccount(), id, null);
            }
        });
        File iconFile = repository.getVersionIcon(id);
@@ -232,6 +236,7 @@ public final class MainPage extends StackPane implements DecoratorPage {

    private void loadVersions(HMCLGameRepository repository) {
        List<Node> children = repository.getVersions().parallelStream()
+                .sorted((a, b) -> VersionNumber.COMPARATOR.compare(VersionNumber.asVersion(a.getId()), VersionNumber.asVersion(b.getId())))
                .map(version -> buildNode(repository, version, () -> GameVersion.minecraftVersion(repository.getVersionJar(version.getId())).orElse("Unknown")))
                .collect(Collectors.toList());
        JFXUtilities.runInFX(() -> {
@@ -26,13 +26,14 @@ import javafx.scene.input.TransferMode;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.stage.FileChooser;
-import org.jackhuang.hmcl.Launcher;
+
 import org.jackhuang.hmcl.mod.ModInfo;
 import org.jackhuang.hmcl.mod.ModManager;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.util.FileUtils;
 import org.jackhuang.hmcl.util.Logging;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 import java.io.File;
 import java.io.IOException;
@@ -42,7 +43,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;

 public final class ModController {
    @FXML
@@ -140,8 +140,8 @@ public final class ModController {
    @FXML
    private void onAdd() {
        FileChooser chooser = new FileChooser();
-        chooser.setTitle(Launcher.i18n("mods.choose_mod"));
-        chooser.getExtensionFilters().setAll(new FileChooser.ExtensionFilter(Launcher.i18n("extension.mod"), "*.jar", "*.zip", "*.litemod"));
+        chooser.setTitle(i18n("mods.choose_mod"));
+        chooser.getExtensionFilters().setAll(new FileChooser.ExtensionFilter(i18n("extension.mod"), "*.jar", "*.zip", "*.litemod"));
        List<File> res = chooser.showOpenMultipleDialog(Controllers.getStage());

        // It's guaranteed that succeeded and failed are thread safe here.
@@ -163,10 +163,10 @@ public final class ModController {
        }).with(Task.of(Schedulers.javafx(), variables -> {
            List<String> prompt = new LinkedList<>();
            if (!succeeded.isEmpty())
-                prompt.add(Launcher.i18n("mods.add.success", String.join(", ", succeeded)));
+                prompt.add(i18n("mods.add.success", String.join(", ", succeeded)));
            if (!failed.isEmpty())
-                prompt.add(Launcher.i18n("mods.add.failed", String.join(", ", failed)));
-            Controllers.dialog(String.join("\n", prompt), Launcher.i18n("mods.add"));
+                prompt.add(i18n("mods.add.failed", String.join(", ", failed)));
+            Controllers.dialog(String.join("\n", prompt), i18n("mods.add"));
            loadMods(modManager, versionId);
        })).start();
    }
@@ -17,14 +17,18 @@
 */
 package org.jackhuang.hmcl.ui;

+import com.jfoenix.concurrency.JFXUtilities;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXCheckBox;
 import com.jfoenix.effects.JFXDepthManager;
 import javafx.geometry.Pos;
 import javafx.scene.layout.BorderPane;
-import org.jackhuang.hmcl.Launcher;
+
 import org.jackhuang.hmcl.mod.ModInfo;
 import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.util.StringUtils;
+
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 import java.util.function.Consumer;

@@ -40,7 +44,9 @@ public final class ModItem extends BorderPane {
        setCenter(modItem);

        JFXButton btnRemove = new JFXButton();
-        FXUtils.installTooltip(btnRemove, Launcher.i18n("mods.remove"));
+        JFXUtilities.runInFX(() -> {
+            FXUtils.installTooltip(btnRemove, i18n("mods.remove"));
+        });
        btnRemove.setOnMouseClicked(e -> deleteCallback.accept(this));
        btnRemove.getStyleClass().add("toggle-icon4");
        BorderPane.setAlignment(btnRemove, Pos.CENTER);
@@ -50,7 +56,14 @@ public final class ModItem extends BorderPane {
        setStyle("-fx-background-radius: 2; -fx-background-color: white; -fx-padding: 8;");
        JFXDepthManager.setDepth(this, 1);
        modItem.setTitle(info.getFileName());
-        modItem.setSubtitle(info.getName() + ", " + Launcher.i18n("archive.version") + ": " + info.getVersion() + ", " + Launcher.i18n("archive.game_version") + ": " + info.getGameVersion() + ", " + Launcher.i18n("archive.author") + ": " + info.getAuthors());
+        StringBuilder message = new StringBuilder(info.getName());
+        if (StringUtils.isNotBlank(info.getVersion()))
+            message.append(", ").append(i18n("archive.version")).append(": ").append(info.getVersion());
+        if (StringUtils.isNotBlank(info.getGameVersion()))
+            message.append(", ").append(i18n("archive.game_version")).append(": ").append(info.getGameVersion());
+        if (StringUtils.isNotBlank(info.getAuthors()))
+            message.append(", ").append(i18n("archive.author")).append(": ").append(info.getAuthors());
+        modItem.setSubtitle(message.toString());
        chkEnabled.setSelected(info.isActive());
        chkEnabled.selectedProperty().addListener((a, b, newValue) ->
                info.activeProperty().set(newValue));
@@ -18,18 +18,20 @@
 package org.jackhuang.hmcl.ui;

 import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXCheckBox;
 import com.jfoenix.controls.JFXTextField;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.fxml.FXML;
 import javafx.scene.layout.StackPane;
-import org.jackhuang.hmcl.Launcher;
+
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
 import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.ui.construct.FileItem;
 import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
 import org.jackhuang.hmcl.util.StringUtils;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 import java.io.File;
 import java.util.Optional;
@@ -39,12 +41,11 @@ public final class ProfilePage extends StackPane implements DecoratorPage {
    private final StringProperty location;
    private final Profile profile;

-    @FXML
-    private JFXTextField txtProfileName;
-    @FXML
-    private FileItem gameDir;
+    @FXML private JFXTextField txtProfileName;
+    @FXML private FileItem gameDir;
    @FXML private JFXButton btnSave;
    @FXML private JFXButton btnDelete;
+    @FXML private JFXCheckBox toggleUseRelativePath;

    /**
     * @param profile null if creating a new profile.
@@ -54,7 +55,7 @@ public final class ProfilePage extends StackPane implements DecoratorPage {
        String profileDisplayName = Optional.ofNullable(profile).map(Profiles::getProfileDisplayName).orElse("");

        title = new SimpleStringProperty(this, "title",
-                profile == null ? Launcher.i18n("profile.new") : Launcher.i18n("profile") + " - " + profileDisplayName);
+                profile == null ? i18n("profile.new") : i18n("profile") + " - " + profileDisplayName);
        location = new SimpleStringProperty(this, "location",
                Optional.ofNullable(profile).map(Profile::getGameDir).map(File::getAbsolutePath).orElse(""));

@@ -64,19 +65,22 @@ public final class ProfilePage extends StackPane implements DecoratorPage {
        FXUtils.onChangeAndOperate(txtProfileName.textProperty(), it -> {
            btnSave.setDisable(!txtProfileName.validate() || StringUtils.isBlank(getLocation()));
        });
-        gameDir.setProperty(location);
+        gameDir.pathProperty().bindBidirectional(location);
        FXUtils.onChangeAndOperate(location, it -> {
            btnSave.setDisable(!txtProfileName.validate() || StringUtils.isBlank(getLocation()));
        });
-
-        if (profile == null)
+        gameDir.convertToRelativePathProperty().bind(toggleUseRelativePath.selectedProperty());
+        if (profile == null) {
            btnDelete.setVisible(false);
+        } else {
+            toggleUseRelativePath.setSelected(profile.isUseRelativePath());
+        }
    }

    @FXML
    private void onDelete() {
        if (profile != null) {
-            Settings.INSTANCE.deleteProfile(profile);
+            Settings.instance().deleteProfile(profile);
            Controllers.navigate(null);
        }
    }
@@ -85,16 +89,20 @@ public final class ProfilePage extends StackPane implements DecoratorPage {
    private void onSave() {
        if (profile != null) {
            profile.setName(txtProfileName.getText());
-            if (StringUtils.isNotBlank(getLocation()))
+            profile.setUseRelativePath(toggleUseRelativePath.isSelected());
+            if (StringUtils.isNotBlank(getLocation())) {
                profile.setGameDir(new File(getLocation()));
+            }
        } else {
            if (StringUtils.isBlank(getLocation())) {
                gameDir.onExplore();
            }
-            Settings.INSTANCE.putProfile(new Profile(txtProfileName.getText(), new File(getLocation())));
+            Profile newProfile = new Profile(txtProfileName.getText(), new File(getLocation()));
+            newProfile.setUseRelativePath(toggleUseRelativePath.isSelected());
+            Settings.instance().putProfile(newProfile);
        }

-        Settings.INSTANCE.onProfileLoading();
+        Settings.instance().onProfileLoading();
        Controllers.navigate(null);
    }

@@ -20,6 +20,12 @@ package org.jackhuang.hmcl.ui;
 import com.jfoenix.controls.*;
 import com.jfoenix.effects.JFXDepthManager;
 import javafx.application.Platform;
+import javafx.beans.InvalidationListener;
+import javafx.beans.WeakInvalidationListener;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.When;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
@@ -27,29 +33,36 @@ import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
-import javafx.scene.control.Toggle;
 import javafx.scene.control.ToggleGroup;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
-import org.jackhuang.hmcl.Launcher;
+import javafx.scene.text.Text;
 import org.jackhuang.hmcl.setting.*;
-import org.jackhuang.hmcl.ui.construct.FileItem;
+import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.construct.FontComboBox;
 import org.jackhuang.hmcl.ui.construct.MultiFileItem;
 import org.jackhuang.hmcl.ui.construct.Validator;
 import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
+import org.jackhuang.hmcl.upgrade.RemoteVersion;
+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 static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 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", Launcher.i18n("settings.launcher"));
+    private final StringProperty title = new SimpleStringProperty(this, "title", i18n("settings.launcher"));

    @FXML
    private JFXTextField txtProxyHost;
@@ -68,7 +81,7 @@ public final class SettingsPage extends StackPane implements DecoratorPage {
    @FXML
    private FontComboBox cboFont;
    @FXML
-    private FileItem fileCommonLocation;
+    private MultiFileItem<EnumCommonDirectory> fileCommonLocation;
    @FXML
    private Label lblDisplay;
    @FXML
@@ -76,17 +89,21 @@ public final class SettingsPage extends StackPane implements DecoratorPage {
    @FXML
    private Label lblUpdateSub;
    @FXML
+    private Text lblUpdateNote;
+    @FXML
+    private JFXRadioButton chkUpdateStable;
+    @FXML
+    private JFXRadioButton chkUpdateDev;
+    @FXML
    private JFXButton btnUpdate;
    @FXML
    private ScrollPane scroll;
    @FXML
-    private MultiFileItem backgroundItem;
+    private MultiFileItem<EnumBackgroundImage> backgroundItem;
    @FXML
    private StackPane themeColorPickerContainer;
    @FXML
-    private JFXRadioButton chkNoProxy;
-    @FXML
-    private JFXRadioButton chkManualProxy;
+    private JFXCheckBox chkDisableProxy;
    @FXML
    private JFXRadioButton chkProxyHttp;
    @FXML
@@ -98,128 +115,181 @@ public final class SettingsPage extends StackPane implements DecoratorPage {
    @FXML
    private Pane proxyPane;

-    {
+    private ObjectProperty<Proxy.Type> selectedProxyType;
+
+    private InvalidationListener updateListener;
+
+    public SettingsPage() {
        FXUtils.loadFXML(this, "/assets/fxml/setting.fxml");

        FXUtils.smoothScrolling(scroll);

-        txtProxyHost.setText(Settings.INSTANCE.getProxyHost());
-        txtProxyHost.textProperty().addListener((a, b, newValue) -> Settings.INSTANCE.setProxyHost(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())));

-        txtProxyPort.setText(Settings.INSTANCE.getProxyPort());
-        txtProxyPort.textProperty().addListener((a, b, newValue) -> Settings.INSTANCE.setProxyPort(newValue));
-
-        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.getSelectionModel().select(Settings.instance().getFont().getFamily());
        cboFont.valueProperty().addListener((a, b, newValue) -> {
-            Font font = Font.font(newValue, Settings.INSTANCE.getFont().getSize());
-            Settings.INSTANCE.setFont(font);
+            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())));
+            list.add(new Label(locale.getName(config().getLocalization().getResourceBundle())));

        cboLanguage.setItems(list);
-        cboLanguage.getSelectionModel().select(Locales.LOCALES.indexOf(Settings.INSTANCE.getLocale()));
-        cboLanguage.getSelectionModel().selectedIndexProperty().addListener((a, b, newValue) -> Settings.INSTANCE.setLocale(Locales.getLocale(newValue.intValue())));
+        cboLanguage.getSelectionModel().select(Locales.LOCALES.indexOf(config().getLocalization()));
+        cboLanguage.getSelectionModel().selectedIndexProperty().addListener((a, b, newValue) -> config().setLocalization(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.disabled"), EnumCommonDirectory.DISABLED),
+                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, Launcher.i18n("update.tooltip"));
-        checkUpdate();
+        lblUpdateNote.setWrappingWidth(470);

-        // background
+        ObjectProperty<EnumUpdateChannel> updateChannel = new SimpleObjectProperty<EnumUpdateChannel>() {
+            @Override
+            protected void invalidated() {
+                EnumUpdateChannel updateChannel = Objects.requireNonNull(get());
+                chkUpdateDev.setSelected(updateChannel == EnumUpdateChannel.DEVELOPMENT);
+                chkUpdateStable.setSelected(updateChannel == EnumUpdateChannel.STABLE);
+            }
+        };
+
+        ToggleGroup updateChannelGroup = new ToggleGroup();
+        chkUpdateDev.setToggleGroup(updateChannelGroup);
+        chkUpdateDev.setUserData(EnumUpdateChannel.DEVELOPMENT);
+        chkUpdateStable.setToggleGroup(updateChannelGroup);
+        chkUpdateStable.setUserData(EnumUpdateChannel.STABLE);
+        updateChannelGroup.getToggles().forEach(
+                toggle -> toggle.selectedProperty().addListener((observable, oldValue, newValue) -> {
+                    if (newValue) {
+                        updateChannel.set((EnumUpdateChannel) toggle.getUserData());
+                    }
+                }));
+        updateChannel.bindBidirectional(ConfigHolder.config().updateChannelProperty());
+        // ====
+
+        // ==== Background ====
        backgroundItem.loadChildren(Collections.singletonList(
-                backgroundItem.createChildren(Launcher.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(Launcher.i18n("color.custom"));
-        picker.setRecentColorsText(Launcher.i18n("color.recent"));
-        picker.getCustomColors().setAll(Arrays.stream(Theme.VALUES).map(Theme::getColor).map(Color::web).collect(Collectors.toList()));
+        // ==== 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(Launcher.i18n("launcher.background.default"));
-                break;
-            case CUSTOM:
-                backgroundItem.setSubtitle(Settings.INSTANCE.getBackgroundImage());
-                break;
-        }
+        // ====
    }

    public String getTitle() {
@@ -235,26 +305,12 @@ public final class SettingsPage extends StackPane implements DecoratorPage {
        this.title.set(title);
    }

-    public void checkUpdate() {
-        btnUpdate.setVisible(Launcher.UPDATE_CHECKER.isOutOfDate());
-
-        if (Launcher.UPDATE_CHECKER.isOutOfDate()) {
-            lblUpdateSub.setText(Launcher.i18n("update.newest_version", Launcher.UPDATE_CHECKER.getNewVersion().toString()));
-            lblUpdateSub.getStyleClass().setAll("update-label");
-
-            lblUpdate.setText(Launcher.i18n("update.found"));
-            lblUpdate.getStyleClass().setAll("update-label");
-        } else {
-            lblUpdateSub.setText(Launcher.i18n("update.latest"));
-            lblUpdateSub.getStyleClass().setAll("subtitle-label");
-
-            lblUpdate.setText(Launcher.i18n("update"));
-            lblUpdate.getStyleClass().setAll();
-        }
-    }
-
    @FXML
    private void onUpdate() {
-        Launcher.UPDATE_CHECKER.checkOutdate();
+        RemoteVersion target = UpdateChecker.getLatestVersion();
+        if (target == null) {
+            return;
+        }
+        UpdateHandler.updateFrom(target);
    }
 }
@@ -1,3 +1,20 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
 package org.jackhuang.hmcl.ui;

 import javafx.beans.property.SimpleStringProperty;
@@ -17,6 +17,7 @@
 */
 package org.jackhuang.hmcl.ui;

+import com.jfoenix.concurrency.JFXUtilities;
 import com.jfoenix.controls.JFXButton;
 import javafx.beans.binding.Bindings;
 import javafx.event.EventHandler;
@@ -33,8 +34,9 @@ import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.*;
 import javafx.scene.paint.Color;
 import javafx.scene.text.TextAlignment;
-import org.jackhuang.hmcl.Launcher;
+
 import org.jackhuang.hmcl.setting.Theme;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 import java.util.Optional;

@@ -69,7 +71,7 @@ public final class VersionItem extends StackPane {
    private void initializeComponents() {
        setPickOnBounds(false);
        FXUtils.setLimitWidth(this, 160);
-        FXUtils.setLimitHeight(this, 156);
+        FXUtils.setLimitHeight(this, 149);

        content = new VBox();
        {
@@ -173,10 +175,12 @@ public final class VersionItem extends StackPane {
        btnLaunch.setGraphic(SVG.launch(Theme.blackFillBinding(), 15, 15));
        btnScript.setGraphic(SVG.script(Theme.blackFillBinding(), 15, 15));

-        FXUtils.installTooltip(btnSettings, Launcher.i18n("version.settings"));
-        FXUtils.installTooltip(btnUpdate, Launcher.i18n("version.update"));
-        FXUtils.installTooltip(btnLaunch, Launcher.i18n("version.launch"));
-        FXUtils.installTooltip(btnScript, Launcher.i18n("version.launch_script"));
+        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);
@@ -26,12 +26,13 @@ import javafx.beans.property.StringProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.Tab;
 import javafx.scene.layout.StackPane;
-import org.jackhuang.hmcl.Launcher;
+
 import org.jackhuang.hmcl.download.game.GameAssetIndexDownloadTask;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.ui.export.ExportWizardProvider;
 import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
 import org.jackhuang.hmcl.util.FileUtils;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 import java.io.File;

@@ -79,17 +80,17 @@ public final class VersionPage extends StackPane implements DecoratorPage {
        browsePopup = new JFXPopup(browseList);
        managementPopup = new JFXPopup(managementList);

-        FXUtils.installTooltip(btnDelete, Launcher.i18n("version.manage.remove"));
-        FXUtils.installTooltip(btnBrowseMenu, Launcher.i18n("settings.game.exploration"));
-        FXUtils.installTooltip(btnManagementMenu, Launcher.i18n("settings.game.management"));
-        FXUtils.installTooltip(btnExport, Launcher.i18n("modpack.export"));
+        FXUtils.installTooltip(btnDelete, i18n("version.manage.remove"));
+        FXUtils.installTooltip(btnBrowseMenu, i18n("settings.game.exploration"));
+        FXUtils.installTooltip(btnManagementMenu, i18n("settings.game.management"));
+        FXUtils.installTooltip(btnExport, i18n("modpack.export"));
    }

    public void load(String id, Profile profile) {
        this.version = id;
        this.profile = profile;

-        title.set(Launcher.i18n("settings.game") + " - " + id);
+        title.set(i18n("settings.game") + " - " + id);

        versionSettingsController.loadVersionSetting(profile, id);
        modController.setParentTab(tabPane);
@@ -146,7 +147,7 @@ public final class VersionPage extends StackPane implements DecoratorPage {
                sub = "saves";
                break;
            default:
-                throw new RuntimeException();
+                return;
        }
        FXUtils.openFolder(new File(profile.getRepository().getRunDirectory(version), sub));
    }
@@ -185,7 +186,7 @@ public final class VersionPage extends StackPane implements DecoratorPage {
    }

    public static void deleteVersion(Profile profile, String version) {
-        Controllers.confirmDialog(Launcher.i18n("version.manage.remove.confirm", version), Launcher.i18n("message.confirm"), () -> {
+        Controllers.confirmDialog(i18n("version.manage.remove.confirm", version), i18n("message.confirm"), () -> {
            if (profile.getRepository().removeVersionFromDisk(version)) {
                profile.getRepository().refreshVersionsAsync().start();
                Controllers.navigate(null);
@@ -194,15 +195,18 @@ public final class VersionPage extends StackPane implements DecoratorPage {
    }

    public static void renameVersion(Profile profile, String version) {
-        Controllers.inputDialog(Launcher.i18n("version.manage.rename.message"), res -> {
+        Controllers.inputDialog(i18n("version.manage.rename.message"), (res, resolve, reject) -> {
            if (profile.getRepository().renameVersion(version, res)) {
                profile.getRepository().refreshVersionsAsync().start();
                Controllers.navigate(null);
+                resolve.run();
+            } else {
+                reject.accept(i18n("version.manage.rename.fail"));
            }
-        });
+        }).setInitialText(version);
    }

    public static void exportVersion(Profile profile, String version) {
-        Controllers.getDecorator().startWizard(new ExportWizardProvider(profile, version), Launcher.i18n("modpack.wizard"));
+        Controllers.getDecorator().startWizard(new ExportWizardProvider(profile, version), i18n("modpack.wizard"));
    }
 }
@@ -22,6 +22,7 @@ import com.jfoenix.controls.JFXComboBox;
 import com.jfoenix.controls.JFXTextField;
 import com.jfoenix.controls.JFXToggleButton;
 import javafx.application.Platform;
+import javafx.beans.binding.Bindings;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
@@ -29,7 +30,7 @@ import javafx.scene.control.Toggle;
 import javafx.scene.image.Image;
 import javafx.scene.layout.VBox;
 import javafx.stage.FileChooser;
-import org.jackhuang.hmcl.Launcher;
+
 import org.jackhuang.hmcl.setting.EnumGameDirectory;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.VersionSetting;
@@ -39,12 +40,13 @@ import org.jackhuang.hmcl.ui.construct.ComponentList;
 import org.jackhuang.hmcl.ui.construct.ImagePickerItem;
 import org.jackhuang.hmcl.ui.construct.MultiFileItem;
 import org.jackhuang.hmcl.util.*;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Optional;
 import java.util.logging.Level;
 import java.util.stream.Collectors;

@@ -52,6 +54,7 @@ public final class VersionSettingsController {
    private VersionSetting lastVersionSetting = null;
    private Profile profile;
    private String versionId;
+    private boolean javaItemsLoaded;

    @FXML private VBox rootPane;
    @FXML private ScrollPane scroll;
@@ -69,17 +72,16 @@ public final class VersionSettingsController {
    @FXML private JFXCheckBox chkFullscreen;
    @FXML private Label lblPhysicalMemory;
    @FXML private JFXToggleButton chkNoJVMArgs;
-    @FXML private JFXToggleButton chkNoCommon;
    @FXML private JFXToggleButton chkNoGameCheck;
-    @FXML private MultiFileItem globalItem;
-    @FXML private MultiFileItem javaItem;
-    @FXML private MultiFileItem gameDirItem;
+    @FXML private MultiFileItem<Boolean> globalItem;
+    @FXML private MultiFileItem<JavaVersion> javaItem;
+    @FXML private MultiFileItem<EnumGameDirectory> gameDirItem;
    @FXML private JFXToggleButton chkShowLogs;
    @FXML private ImagePickerItem iconPickerItem;

    @FXML
    private void initialize() {
-        lblPhysicalMemory.setText(Launcher.i18n("settings.physical_memory") + ": " + OperatingSystem.TOTAL_MEMORY + "MB");
+        lblPhysicalMemory.setText(i18n("settings.physical_memory") + ": " + OperatingSystem.TOTAL_MEMORY + "MB");

        FXUtils.smoothScrolling(scroll);

@@ -89,26 +91,28 @@ public final class VersionSettingsController {
                            (variables.<List<JavaVersion>>get("list")).stream()
                                    .map(javaVersion -> javaItem.createChildren(javaVersion.getVersion(), javaVersion.getBinary().getAbsolutePath(), javaVersion))
                                    .collect(Collectors.toList()));
+                    javaItemsLoaded = true;
                    initializeSelectedJava();
                });

+        javaItem.setSelectedData(null);
+        javaItem.setFallbackData(JavaVersion.fromCurrentEnvironment());
        if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS)
            javaItem.getExtensionFilters().add(new FileChooser.ExtensionFilter("Java", "java.exe", "javaw.exe"));

+        gameDirItem.setCustomUserData(EnumGameDirectory.CUSTOM);
        gameDirItem.loadChildren(Arrays.asList(
-                gameDirItem.createChildren(Launcher.i18n("settings.advanced.game_dir.default"), EnumGameDirectory.ROOT_FOLDER),
-                gameDirItem.createChildren(Launcher.i18n("settings.advanced.game_dir.independent"), EnumGameDirectory.VERSION_FOLDER)
+                gameDirItem.createChildren(i18n("settings.advanced.game_dir.default"), EnumGameDirectory.ROOT_FOLDER),
+                gameDirItem.createChildren(i18n("settings.advanced.game_dir.independent"), EnumGameDirectory.VERSION_FOLDER)
        ));

        globalItem.loadChildren(Arrays.asList(
-                globalItem.createChildren(Launcher.i18n("settings.type.global"), true),
-                globalItem.createChildren(Launcher.i18n("settings.type.special"), false)
+                globalItem.createChildren(i18n("settings.type.global"), true),
+                globalItem.createChildren(i18n("settings.type.special"), false)
        ));
    }

    public void loadVersionSetting(Profile profile, String versionId) {
-        rootPane.getChildren().remove(advancedSettingsPane);
-
        this.profile = profile;
        this.versionId = versionId;

@@ -117,6 +121,7 @@ public final class VersionSettingsController {
        gameDirItem.setDisable(profile.getRepository().isModpack(versionId));
        globalItem.setDisable(profile.getRepository().isModpack(versionId));

+        // unbind data fields
        if (lastVersionSetting != null) {
            FXUtils.unbindInt(txtWidth, lastVersionSetting.widthProperty());
            FXUtils.unbindInt(txtHeight, lastVersionSetting.heightProperty());
@@ -131,11 +136,21 @@ public final class VersionSettingsController {
            FXUtils.unbindString(txtServerIP, lastVersionSetting.serverIpProperty());
            FXUtils.unbindBoolean(chkFullscreen, lastVersionSetting.fullscreenProperty());
            FXUtils.unbindBoolean(chkNoGameCheck, lastVersionSetting.notCheckGameProperty());
-            FXUtils.unbindBoolean(chkNoCommon, lastVersionSetting.noCommonProperty());
+            FXUtils.unbindBoolean(chkNoJVMArgs, lastVersionSetting.noJVMArgsProperty());
            FXUtils.unbindBoolean(chkShowLogs, lastVersionSetting.showLogsProperty());
            FXUtils.unbindEnum(cboLauncherVisibility);
+
+            globalItem.selectedDataProperty().unbindBidirectional(lastVersionSetting.usesGlobalProperty());
+
+            gameDirItem.selectedDataProperty().unbindBidirectional(lastVersionSetting.gameDirTypeProperty());
+            gameDirItem.subtitleProperty().unbind();
        }

+        // unbind data fields
+        globalItem.setToggleSelectedListener(null);
+        javaItem.setToggleSelectedListener(null);
+
+        // bind new data fields
        FXUtils.bindInt(txtWidth, versionSetting.widthProperty());
        FXUtils.bindInt(txtHeight, versionSetting.heightProperty());
        FXUtils.bindInt(txtMaxMemory, versionSetting.maxMemoryProperty());
@@ -149,18 +164,15 @@ public final class VersionSettingsController {
        FXUtils.bindString(txtServerIP, versionSetting.serverIpProperty());
        FXUtils.bindBoolean(chkFullscreen, versionSetting.fullscreenProperty());
        FXUtils.bindBoolean(chkNoGameCheck, versionSetting.notCheckGameProperty());
-        FXUtils.bindBoolean(chkNoCommon, versionSetting.noCommonProperty());
+        FXUtils.bindBoolean(chkNoJVMArgs, versionSetting.noJVMArgsProperty());
        FXUtils.bindBoolean(chkShowLogs, versionSetting.showLogsProperty());
        FXUtils.bindEnum(cboLauncherVisibility, versionSetting.launcherVisibilityProperty());

        javaItem.setToggleSelectedListener(newValue -> {
            if (javaItem.isCustomToggle(newValue)) {
-                versionSetting.setJava("Custom");
-                versionSetting.setDefaultJavaPath(null);
+                versionSetting.setUsesCustomJavaDir();
            } else {
-                JavaVersion java = (JavaVersion) newValue.getUserData();
-                versionSetting.setJava(java.getVersion());
-                versionSetting.setDefaultJavaPath(java.getBinary().toString());
+                versionSetting.setJavaVersion((JavaVersion) newValue.getUserData());
            }
        });

@@ -168,11 +180,13 @@ public final class VersionSettingsController {
        versionSetting.javaProperty().setChangedListener(it -> initJavaSubtitle(versionSetting));
        initJavaSubtitle(versionSetting);

-        if (versionSetting.isUsesGlobal())
-            globalItem.getGroup().getToggles().stream().filter(it -> it.getUserData() == Boolean.TRUE).findFirst().ifPresent(it -> it.setSelected(true));
-        else
-            globalItem.getGroup().getToggles().stream().filter(it -> it.getUserData() == Boolean.FALSE).findFirst().ifPresent(it -> it.setSelected(true));
+        globalItem.selectedDataProperty().bindBidirectional(versionSetting.usesGlobalProperty());
+        globalItem.subtitleProperty().bind(Bindings.createStringBinding(() -> i18n(versionSetting.isUsesGlobal() ? "settings.type.global" : "settings.type.special"),
+                versionSetting.usesGlobalProperty()));
        globalItem.setToggleSelectedListener(newValue -> {
+            // do not call versionSettings.setUsesGlobal(true/false)
+            // because versionSettings can be the global one.
+            // global versionSettings.usesGlobal is always true.
            if ((Boolean) newValue.getUserData())
                profile.globalizeVersionSetting(versionId);
            else
@@ -181,19 +195,9 @@ public final class VersionSettingsController {
            Platform.runLater(() -> loadVersionSetting(profile, versionId));
        });

-        versionSetting.usesGlobalProperty().setChangedListenerAndOperate(it ->
-                globalItem.setSubtitle(Launcher.i18n(versionSetting.isUsesGlobal() ? "settings.type.global" : "settings.type.special")));
-
-        gameDirItem.getGroup().getToggles().stream()
-                .filter(it -> it.getUserData() == versionSetting.getGameDirType())
-                .findFirst().ifPresent(toggle -> toggle.setSelected(true));
-
-        gameDirItem.setCustomUserData(EnumGameDirectory.CUSTOM);
-        gameDirItem.setToggleSelectedListener(newValue -> versionSetting.setGameDirType((EnumGameDirectory) newValue.getUserData()));
-
-        versionSetting.gameDirProperty().setChangedListener(it -> initGameDirSubtitle(versionSetting));
-        versionSetting.gameDirTypeProperty().setChangedListener(it -> initGameDirSubtitle(versionSetting));
-        initGameDirSubtitle(versionSetting);
+        gameDirItem.selectedDataProperty().bindBidirectional(versionSetting.gameDirTypeProperty());
+        gameDirItem.subtitleProperty().bind(Bindings.createStringBinding(() -> Paths.get(profile.getRepository().getRunDirectory(versionId).getAbsolutePath()).normalize().toString(),
+                versionSetting.gameDirProperty(), versionSetting.gameDirTypeProperty()));

        lastVersionSetting = versionSetting;

@@ -204,24 +208,19 @@ public final class VersionSettingsController {

    private void initializeSelectedJava() {
        if (lastVersionSetting == null
-                || !JavaVersion.getJREsImmediately().isPresent() /* JREs are still being loaded */) {
+                || !javaItemsLoaded /* JREs are still being loaded */) {
            return;
        }

-        boolean flag = false;
-        Toggle defaultToggle = null;
-        for (Toggle toggle : javaItem.getGroup().getToggles()) {
-            if (toggle.getUserData() == Lang.invoke(lastVersionSetting::getJavaVersion)) {
-                toggle.setSelected(true);
-                flag = true;
-            } else if (toggle.getUserData() == JavaVersion.fromCurrentEnvironment()) {
-                defaultToggle = toggle;
+        if (lastVersionSetting.isUsesCustomJavaDir()) {
+            javaItem.setSelectedData(null);
+        } else {
+            try {
+                javaItem.setSelectedData(lastVersionSetting.getJavaVersion());
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
            }
        }
-
-        if (!flag) {
-            Optional.ofNullable(defaultToggle).ifPresent(t -> t.setSelected(true));
-        }
    }

    private void initJavaSubtitle(VersionSetting versionSetting) {
@@ -231,22 +230,10 @@ public final class VersionSettingsController {
                                .map(JavaVersion::getBinary).map(File::getAbsolutePath).orElse("Invalid Java Directory"))));
    }

-    private void initGameDirSubtitle(VersionSetting versionSetting) {
-        gameDirItem.setSubtitle(profile.getRepository().getRunDirectory(versionId).getAbsolutePath());
-    }
-
-    @FXML
-    private void onShowAdvanced() {
-        if (!rootPane.getChildren().contains(advancedSettingsPane))
-            rootPane.getChildren().add(advancedSettingsPane);
-        else
-            rootPane.getChildren().remove(advancedSettingsPane);
-    }
-
    @FXML
    private void onExploreIcon() {
        FileChooser chooser = new FileChooser();
-        chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(Launcher.i18n("extension.png"), "*.png"));
+        chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("extension.png"), "*.png"));
        File selectedFile = chooser.showOpenDialog(Controllers.getStage());
        if (selectedFile != null) {
            File iconFile = profile.getRepository().getVersionIcon(versionId);
@@ -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"));
    }

@@ -18,11 +18,12 @@
 package org.jackhuang.hmcl.ui.animation;

 import javafx.animation.KeyFrame;
+import javafx.util.Duration;

 import java.util.List;

-@FunctionalInterface
 public interface AnimationProducer {
+    void init(AnimationHandler handler);

    List<KeyFrame> animate(AnimationHandler handler);
 }
@@ -20,17 +20,43 @@ package org.jackhuang.hmcl.ui.animation;
 import javafx.animation.Interpolator;
 import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
+import javafx.scene.Node;
 import javafx.util.Duration;
+import org.jackhuang.hmcl.util.Lang;

 import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
+import java.util.function.BiFunction;
+import java.util.function.Consumer;
+import java.util.function.Function;

 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.getCurrentNode().setTranslateX(0);
+        c.getCurrentNode().setTranslateY(0);
+        c.getCurrentNode().setScaleX(1);
+        c.getCurrentNode().setScaleY(1);
+    }, 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)),
@@ -40,7 +66,12 @@ public enum ContainerAnimations {
    /**
     * A zoom effect
     */
-    ZOOM_IN(c ->
+    ZOOM_IN(c -> {
+        c.getPreviousNode().setTranslateX(0);
+        c.getPreviousNode().setTranslateY(0);
+        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),
@@ -52,7 +83,12 @@ public enum ContainerAnimations {
    /**
     * A zoom effect
     */
-    ZOOM_OUT(c ->
+    ZOOM_OUT(c -> {
+        c.getPreviousNode().setTranslateX(0);
+        c.getPreviousNode().setTranslateY(0);
+        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),
@@ -64,7 +100,14 @@ 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.getCurrentNode().setScaleX(1);
+        c.getCurrentNode().setScaleY(1);
+        c.getCurrentNode().setOpacity(1);
+    }, 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 +118,14 @@ 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.getCurrentNode().setScaleX(1);
+        c.getCurrentNode().setScaleY(1);
+        c.getCurrentNode().setOpacity(1);
+    }, 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 +135,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() {
@@ -19,6 +19,7 @@ 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;
@@ -78,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 == newView)
-            previousNode = NULL;
+            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();
 }
@@ -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.construct;

 import com.jfoenix.controls.JFXButton;
 import javafx.event.EventHandler;
@@ -26,27 +26,28 @@ import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.StackPane;
+import org.jackhuang.hmcl.ui.FXUtils;

-public final class VersionListItem extends StackPane {
+public final class AdvancedListItem extends StackPane {
    @FXML
    private StackPane imageViewContainer;
    @FXML
-    private Label lblVersionName;
+    private Label lblTitle;
    @FXML
-    private Label lblGameVersion;
+    private Label lblSubtitle;
    @FXML
    private ImageView imageView;
    @FXML private JFXButton btnSettings;

-    public VersionListItem(String versionName) {
-        this(versionName, "");
+    public AdvancedListItem(String title) {
+        this(title, "");
    }

-    public VersionListItem(String versionName, String gameVersion) {
-        FXUtils.loadFXML(this, "/assets/fxml/version-list-item.fxml");
+    public AdvancedListItem(String title, String subtitle) {
+        FXUtils.loadFXML(this, "/assets/fxml/advanced-list-item.fxml");

-        lblVersionName.setText(versionName);
-        lblGameVersion.setText(gameVersion);
+        lblTitle.setText(title);
+        lblSubtitle.setText(subtitle);

        FXUtils.limitSize(imageView, 32, 32);
    }
@@ -55,12 +56,12 @@ public final class VersionListItem extends StackPane {
        btnSettings.setOnMouseClicked(handler);
    }

-    public void setVersionName(String versionName) {
-        lblVersionName.setText(versionName);
+    public void setTitle(String title) {
+        lblTitle.setText(title);
    }

-    public void setGameVersion(String gameVersion) {
-        lblGameVersion.setText(gameVersion);
+    public void setSubtitle(String subtitle) {
+        lblSubtitle.setText(subtitle);
    }

    public void setImage(Image image, Rectangle2D viewport) {
@@ -50,10 +50,6 @@ public class ComponentList extends StackPane {
    }

    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())
@@ -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;
@@ -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;");
@@ -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);
+    }
+}
@@ -0,0 +1,45 @@
+/*
+ * 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 org.jackhuang.hmcl.ui.Controllers;
+
+import javafx.event.Event;
+import javafx.event.EventTarget;
+import javafx.event.EventType;
+import javafx.scene.layout.Region;
+
+/**
+ * Indicates a close operation on the dialog.
+ *
+ * @author yushijinhun
+ * @see Controllers#dialog(Region)
+ */
+public class DialogCloseEvent extends Event {
+
+    public static final EventType<DialogCloseEvent> CLOSE = new EventType<>("CLOSE");
+
+    public DialogCloseEvent() {
+        super(CLOSE);
+    }
+
+    public DialogCloseEvent(Object source, EventTarget target) {
+        super(source, target, CLOSE);
+    }
+
+}
@@ -18,7 +18,9 @@
 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 +28,70 @@ import javafx.scene.control.Tooltip;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.VBox;
 import javafx.stage.DirectoryChooser;
-import org.jackhuang.hmcl.Launcher;
+
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;

+import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
 import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;

 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, Launcher.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 +102,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 +143,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);
+    }
 }
@@ -21,18 +21,25 @@ import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
-import javafx.scene.paint.Paint;

 public class IconedItem extends RipplerContainer {

+    private Label label;
+
    public IconedItem(Node icon, String text) {
-        super(createHBox(icon, text));
+        this(icon);
+        label.setText(text);
    }

-    private static HBox createHBox(Node icon, String text) {
+    public IconedItem(Node icon) {
+        super(createHBox(icon));
+        label = ((Label) lookup("#label"));
+    }
+
+    private static HBox createHBox(Node icon) {
        HBox hBox = new HBox();
        icon.setMouseTransparent(true);
-        Label textLabel = new Label(text);
+        Label textLabel = new Label();
        textLabel.setId("label");
        textLabel.setAlignment(Pos.CENTER);
        textLabel.setMouseTransparent(true);
@@ -42,11 +49,7 @@ public class IconedItem extends RipplerContainer {
        return hBox;
    }

-    public void setText(String text) {
-        ((Label) lookup("#label")).setText(text);
-    }
-
-    public void setTextFill(Paint paint) {
-        ((Label) lookup("#label")).setTextFill(paint);
+    public Label getLabel() {
+        return label;
    }
 }
@@ -15,7 +15,9 @@ import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.Launcher;
+
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
@@ -41,7 +43,7 @@ public final class ImagePickerItem extends BorderPane {
        selectButton.onMouseClickedProperty().bind(onSelectButtonClicked);
        selectButton.getStyleClass().add("toggle-icon4");

-        FXUtils.installTooltip(selectButton, Launcher.i18n("button.edit"));
+        FXUtils.installTooltip(selectButton, i18n("button.edit"));

        HBox hBox = new HBox();
        hBox.getChildren().setAll(imageView, selectButton);
@@ -19,13 +19,12 @@ package org.jackhuang.hmcl.ui.construct;

 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXTextField;
+import javafx.beans.binding.Bindings;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
-import javafx.scene.layout.Region;
 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 {

@@ -37,14 +36,28 @@ public class InputDialogPane extends StackPane {
    private JFXTextField textField;
    @FXML
    private Label content;
+    @FXML
+    private Label lblCreationWarning;

-    public InputDialogPane(String text, Consumer<Region> closeConsumer, Consumer<String> onResult) {
+    public InputDialogPane(String text, FutureCallback<String> onResult) {
        FXUtils.loadFXML(this, "/assets/fxml/input-dialog.fxml");
        content.setText(text);
-        cancelButton.setOnMouseClicked(e -> closeConsumer.accept(this));
+        cancelButton.setOnMouseClicked(e -> fireEvent(new DialogCloseEvent()));
        acceptButton.setOnMouseClicked(e -> {
-            onResult.accept(textField.getText());
-            closeConsumer.accept(this);
+            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);
    }
 }
@@ -20,17 +20,19 @@ 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.Launcher;
-import org.jackhuang.hmcl.ui.FXUtils;

+import org.jackhuang.hmcl.ui.FXUtils;
 import javax.swing.*;
+
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
 import java.util.Optional;

 public final class MessageBox {
    private MessageBox() {
    }

-    private static final String TITLE = Launcher.i18n("message.info");
+    private static final String TITLE = i18n("message.info");

    /**
     * User Operation: Yes
@@ -21,18 +21,16 @@ import com.jfoenix.controls.JFXButton;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
-import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
-import org.jackhuang.hmcl.Launcher;
+
 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;

 import java.util.Optional;
-import java.util.function.Consumer;

 public final class MessageDialogPane extends StackPane {
-    private boolean closingDialog = true;

    @FXML
    private JFXButton acceptButton;
@@ -47,7 +45,7 @@ public final class MessageDialogPane extends StackPane {
    @FXML
    private HBox actions;

-    public MessageDialogPane(String text, String title, Consumer<Region> closeConsumer, 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)
@@ -55,7 +53,7 @@ public final class MessageDialogPane extends StackPane {

        content.setText(text);
        acceptButton.setOnMouseClicked(e -> {
-            closeConsumer.accept(MessageDialogPane.this);
+            fireEvent(new DialogCloseEvent());
            Optional.ofNullable(onAccept).ifPresent(Runnable::run);
        });

@@ -82,22 +80,18 @@ public final class MessageDialogPane extends StackPane {
        }
    }

-    public MessageDialogPane(String text, String title, Consumer<Region> closeConsumer, Runnable onAccept, Runnable onCancel) {
-        this(text, title, closeConsumer, 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 -> {
-            closeConsumer.accept(MessageDialogPane.this);
+            fireEvent(new DialogCloseEvent());
            Optional.ofNullable(onCancel).ifPresent(Runnable::run);
        });

-        acceptButton.setText(Launcher.i18n("button.yes"));
-        cancelButton.setText(Launcher.i18n("button.no"));
+        acceptButton.setText(i18n("button.yes"));
+        cancelButton.setText(i18n("button.no"));

        actions.getChildren().add(cancelButton);
    }
-
-    public void disableClosingDialog() {
-        closingDialog = false;
-    }
 }
@@ -13,16 +13,17 @@ import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
-import org.jackhuang.hmcl.Launcher;
+
 import org.jackhuang.hmcl.ui.FXUtils;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 import java.util.Collection;
 import java.util.Optional;
 import java.util.function.Consumer;

 public class MultiColorItem extends ComponentList {
-    private final StringProperty customTitle = new SimpleStringProperty(this, "customTitle", Launcher.i18n("selector.custom"));
-    private final StringProperty chooserTitle = new SimpleStringProperty(this, "chooserTitle", Launcher.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();
@@ -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;
@@ -37,20 +34,24 @@ import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.stage.DirectoryChooser;
 import javafx.stage.FileChooser;
-import org.jackhuang.hmcl.Launcher;
+
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 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", Launcher.i18n("selector.custom"));
-    private final StringProperty chooserTitle = new SimpleStringProperty(this, "chooserTitle", Launcher.i18n("selector.choose_file"));
+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 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();
@@ -63,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;

@@ -109,6 +111,20 @@ public class MultiFileItem extends ComponentList {
        group.selectedToggleProperty().addListener((a, b, newValue) -> {
            if (toggleSelectedListener != null)
                toggleSelectedListener.accept(newValue);
+
+            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));
        });
    }

@@ -116,11 +132,11 @@ public class MultiFileItem extends ComponentList {
        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);
@@ -145,12 +161,9 @@ public class MultiFileItem extends ComponentList {
            pane.getChildren().add(custom);
    }

-    public void onExploreJavaDir() {
-        DirectoryChooser chooser = new DirectoryChooser();
-        chooser.setTitle(Launcher.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() {
@@ -181,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);
    }

@@ -224,4 +237,28 @@ public class MultiFileItem extends ComponentList {
    public ObservableList<FileChooser.ExtensionFilter> getExtensionFilters() {
        return extensionFilters;
    }
+
+    public T getSelectedData() {
+        return selectedData.get();
+    }
+
+    public ObjectProperty<T> selectedDataProperty() {
+        return selectedData;
+    }
+
+    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);
+    }
 }
@@ -19,13 +19,14 @@ package org.jackhuang.hmcl.ui.construct;

 import com.jfoenix.concurrency.JFXUtilities;
 import javafx.beans.property.StringProperty;
-import org.jackhuang.hmcl.Launcher;
+
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.task.TaskListener;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.wizard.AbstractWizardDisplayer;
 import org.jackhuang.hmcl.util.StringUtils;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 import java.util.Map;

@@ -34,11 +35,11 @@ public interface TaskExecutorDialogWizardDisplayer extends AbstractWizardDisplay
    @Override
    default void handleTask(Map<String, Object> settings, Task task) {
        TaskExecutorDialogPane pane = new TaskExecutorDialogPane(it -> {
-            Controllers.closeDialog(it);
+            it.fireEvent(new DialogCloseEvent());
            Controllers.navigate(null);
        });

-        pane.setTitle(Launcher.i18n("message.doing"));
+        pane.setTitle(i18n("message.doing"));
        pane.setProgress(Double.MAX_VALUE);
        if (settings.containsKey("title")) {
            Object title = settings.get("title");
@@ -61,12 +62,12 @@ public interface TaskExecutorDialogWizardDisplayer extends AbstractWizardDisplay
                @Override
                public void onStop(boolean success, TaskExecutor executor) {
                    JFXUtilities.runInFX(() -> {
-                        Controllers.closeDialog(pane);
+                        pane.fireEvent(new DialogCloseEvent());
                        if (success) {
                            if (settings.containsKey("success_message") && settings.get("success_message") instanceof String)
                                Controllers.dialog((String) settings.get("success_message"), null, MessageBox.FINE_MESSAGE, () -> Controllers.navigate(null));
                            else if (!settings.containsKey("forbid_success_message"))
-                                Controllers.dialog(Launcher.i18n("message.success"), null, MessageBox.FINE_MESSAGE, () -> Controllers.navigate(null));
+                                Controllers.dialog(i18n("message.success"), null, MessageBox.FINE_MESSAGE, () -> Controllers.navigate(null));
                        } else {
                            if (executor.getLastException() == null)
                                return;
@@ -74,7 +75,7 @@ public interface TaskExecutorDialogWizardDisplayer extends AbstractWizardDisplay
                            if (settings.containsKey("failure_message") && settings.get("failure_message") instanceof String)
                                Controllers.dialog(appendix, (String) settings.get("failure_message"), MessageBox.ERROR_MESSAGE, () -> Controllers.navigate(null));
                            else if (!settings.containsKey("forbid_failure_message"))
-                                Controllers.dialog(appendix, Launcher.i18n("wizard.failed"), MessageBox.ERROR_MESSAGE, () -> Controllers.navigate(null));
+                                Controllers.dialog(appendix, i18n("wizard.failed"), MessageBox.ERROR_MESSAGE, () -> Controllers.navigate(null));
                        }

                    });
@@ -23,7 +23,7 @@ import javafx.scene.control.Label;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.Launcher;
+
 import org.jackhuang.hmcl.download.forge.ForgeInstallTask;
 import org.jackhuang.hmcl.download.game.GameAssetDownloadTask;
 import org.jackhuang.hmcl.download.game.GameAssetRefreshTask;
@@ -35,6 +35,7 @@ import org.jackhuang.hmcl.mod.*;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.task.TaskListener;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 import java.util.HashMap;
 import java.util.Map;
@@ -62,29 +63,29 @@ public final class TaskListPane extends StackPane {
                    return;

                if (task instanceof GameAssetRefreshTask) {
-                    task.setName(Launcher.i18n("assets.download"));
+                    task.setName(i18n("assets.download"));
                } else if (task instanceof GameAssetDownloadTask) {
-                    task.setName(Launcher.i18n("assets.download_all"));
+                    task.setName(i18n("assets.download_all"));
                } else if (task instanceof ForgeInstallTask) {
-                    task.setName(Launcher.i18n("install.installer.install", Launcher.i18n("install.installer.forge")));
+                    task.setName(i18n("install.installer.install", i18n("install.installer.forge")));
                } else if (task instanceof LiteLoaderInstallTask) {
-                    task.setName(Launcher.i18n("install.installer.install", Launcher.i18n("install.installer.liteloader")));
+                    task.setName(i18n("install.installer.install", i18n("install.installer.liteloader")));
                } else if (task instanceof OptiFineInstallTask) {
-                    task.setName(Launcher.i18n("install.installer.install", Launcher.i18n("install.installer.optifine")));
+                    task.setName(i18n("install.installer.install", i18n("install.installer.optifine")));
                } else if (task instanceof CurseCompletionTask) {
-                    task.setName(Launcher.i18n("modpack.type.curse.completion"));
+                    task.setName(i18n("modpack.type.curse.completion"));
                } else if (task instanceof ModpackInstallTask) {
-                    task.setName(Launcher.i18n("modpack.installing"));
+                    task.setName(i18n("modpack.installing"));
                } else if (task instanceof CurseInstallTask) {
-                    task.setName(Launcher.i18n("modpack.install", Launcher.i18n("modpack.type.curse")));
+                    task.setName(i18n("modpack.install", i18n("modpack.type.curse")));
                } else if (task instanceof MultiMCModpackInstallTask) {
-                    task.setName(Launcher.i18n("modpack.install", Launcher.i18n("modpack.type.multimc")));
+                    task.setName(i18n("modpack.install", i18n("modpack.type.multimc")));
                } else if (task instanceof HMCLModpackInstallTask) {
-                    task.setName(Launcher.i18n("modpack.install", Launcher.i18n("modpack.type.hmcl")));
+                    task.setName(i18n("modpack.install", i18n("modpack.type.hmcl")));
                } else if (task instanceof HMCLModpackExportTask) {
-                    task.setName(Launcher.i18n("modpack.export"));
+                    task.setName(i18n("modpack.export"));
                } else if (task instanceof MinecraftInstanceTask) {
-                    task.setName(Launcher.i18n("modpack.scan"));
+                    task.setName(i18n("modpack.scan"));
                }

                ProgressListNode node = new ProgressListNode(task);
@@ -22,7 +22,7 @@ import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.Launcher;
+
 import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.download.RemoteVersion;
 import org.jackhuang.hmcl.game.GameRepository;
@@ -30,12 +30,11 @@ import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardPage;
 import org.jackhuang.hmcl.util.Lang;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 import java.util.Map;
 import java.util.Optional;

-import static org.jackhuang.hmcl.Launcher.i18n;
-
 class AdditionalInstallersPage extends StackPane implements WizardPage {
    private final InstallerWizardProvider provider;
    private final WizardController controller;
@@ -100,7 +99,7 @@ class AdditionalInstallersPage extends StackPane implements WizardPage {

    @Override
    public String getTitle() {
-        return Launcher.i18n("settings.tabs.installers");
+        return i18n("settings.tabs.installers");
    }

    private String getVersion(String id) {
@@ -109,24 +108,24 @@ class AdditionalInstallersPage extends StackPane implements WizardPage {

    @Override
    public void onNavigate(Map<String, Object> settings) {
-        lblGameVersion.setText(Launcher.i18n("install.new_game.current_game_version") + ": " + provider.getGameVersion());
+        lblGameVersion.setText(i18n("install.new_game.current_game_version") + ": " + provider.getGameVersion());
        btnForge.setDisable(provider.getForge() != null);
        if (provider.getForge() != null || controller.getSettings().containsKey("forge"))
-            lblForge.setText(Launcher.i18n("install.installer.version", Launcher.i18n("install.installer.forge")) + ": " + Lang.nonNull(provider.getForge(), getVersion("forge")));
+            lblForge.setText(i18n("install.installer.version", i18n("install.installer.forge")) + ": " + Lang.nonNull(provider.getForge(), getVersion("forge")));
        else
-            lblForge.setText(Launcher.i18n("install.installer.not_installed", Launcher.i18n("install.installer.forge")));
+            lblForge.setText(i18n("install.installer.not_installed", i18n("install.installer.forge")));

        btnLiteLoader.setDisable(provider.getLiteLoader() != null);
        if (provider.getLiteLoader() != null || controller.getSettings().containsKey("liteloader"))
-            lblLiteLoader.setText(Launcher.i18n("install.installer.version", Launcher.i18n("install.installer.liteloader")) + ": " + Lang.nonNull(provider.getLiteLoader(), getVersion("liteloader")));
+            lblLiteLoader.setText(i18n("install.installer.version", i18n("install.installer.liteloader")) + ": " + Lang.nonNull(provider.getLiteLoader(), getVersion("liteloader")));
        else
-            lblLiteLoader.setText(Launcher.i18n("install.installer.not_installed", Launcher.i18n("install.installer.liteloader")));
+            lblLiteLoader.setText(i18n("install.installer.not_installed", i18n("install.installer.liteloader")));

        btnOptiFine.setDisable(provider.getOptiFine() != null);
        if (provider.getOptiFine() != null || controller.getSettings().containsKey("optifine"))
-            lblOptiFine.setText(Launcher.i18n("install.installer.version", Launcher.i18n("install.installer.optifine")) + ": " + Lang.nonNull(provider.getOptiFine(), getVersion("optifine")));
+            lblOptiFine.setText(i18n("install.installer.version", i18n("install.installer.optifine")) + ": " + Lang.nonNull(provider.getOptiFine(), getVersion("optifine")));
        else
-            lblOptiFine.setText(Launcher.i18n("install.installer.not_installed", Launcher.i18n("install.installer.optifine")));
+            lblOptiFine.setText(i18n("install.installer.not_installed", i18n("install.installer.optifine")));

    }

@@ -18,7 +18,7 @@
 package org.jackhuang.hmcl.ui.download;

 import javafx.scene.Node;
-import org.jackhuang.hmcl.Launcher;
+
 import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.download.GameBuilder;
 import org.jackhuang.hmcl.download.RemoteVersion;
@@ -30,19 +30,18 @@ import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardProvider;
 import org.jackhuang.hmcl.util.Lang;
-
 import java.io.File;
 import java.util.Map;

-import static org.jackhuang.hmcl.Launcher.i18n;
 import static org.jackhuang.hmcl.util.Lang.tryCast;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 public final class DownloadWizardProvider implements WizardProvider {
    private Profile profile;

    @Override
    public void start(Map<String, Object> settings) {
-        profile = Settings.INSTANCE.getSelectedProfile();
+        profile = Settings.instance().getSelectedProfile();
        settings.put(PROFILE, profile);
    }

@@ -78,8 +77,8 @@ public final class DownloadWizardProvider implements WizardProvider {

    @Override
    public Object finish(Map<String, Object> settings) {
-        settings.put("success_message", Launcher.i18n("install.success"));
-        settings.put("failure_message", Launcher.i18n("install.failed"));
+        settings.put("success_message", i18n("install.success"));
+        settings.put("failure_message", i18n("install.failed"));

        switch (Lang.parseInt(settings.get(InstallTypePage.INSTALL_TYPE), -1)) {
            case 0: return finishVersionDownloadingAsync(settings);
@@ -102,10 +101,10 @@ public final class DownloadWizardProvider implements WizardProvider {
                    case 1:
                        return new ModpackPage(controller);
                    default:
-                        throw new IllegalStateException("Error step " + step + ", subStep " + subStep + ", settings: " + settings);
+                        throw new IllegalStateException("Error step " + step + ", subStep " + subStep + ", settings: " + settings + ", pages: " + controller.getPages());
                }
            default:
-                throw new IllegalStateException("error step " + step + ", settings: " + settings);
+                throw new IllegalStateException("error step " + step + ", settings: " + settings + ", pages: " + controller.getPages());
        }
    }

@@ -20,10 +20,11 @@ package org.jackhuang.hmcl.ui.download;
 import com.jfoenix.controls.JFXListView;
 import javafx.fxml.FXML;
 import javafx.scene.layout.StackPane;
-import org.jackhuang.hmcl.Launcher;
+
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardPage;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 import java.util.Map;

@@ -49,7 +50,7 @@ public final class InstallTypePage extends StackPane implements WizardPage {

    @Override
    public String getTitle() {
-        return Launcher.i18n("install.select");
+        return i18n("install.select");
    }

    public static final String INSTALL_TYPE = "INSTALL_TYPE";
@@ -18,14 +18,16 @@
 package org.jackhuang.hmcl.ui.download;

 import javafx.scene.Node;
-import org.jackhuang.hmcl.Launcher;
+
 import org.jackhuang.hmcl.download.BMCLAPIDownloadProvider;
+import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.download.RemoteVersion;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardProvider;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 import java.util.Map;

@@ -80,8 +82,8 @@ public final class InstallerWizardProvider implements WizardProvider {

    @Override
    public Object finish(Map<String, Object> settings) {
-        settings.put("success_message", Launcher.i18n("install.success"));
-        settings.put("failure_message", Launcher.i18n("install.failed"));
+        settings.put("success_message", i18n("install.success"));
+        settings.put("failure_message", i18n("install.failed"));

        Task ret = Task.empty();

@@ -99,9 +101,10 @@ public final class InstallerWizardProvider implements WizardProvider {

    @Override
    public Node createPage(WizardController controller, int step, Map<String, Object> settings) {
+        DownloadProvider provider = profile.getDependency().getDownloadProvider();
        switch (step) {
            case 0:
-                return new AdditionalInstallersPage(this, controller, profile.getRepository(), BMCLAPIDownloadProvider.INSTANCE);
+                return new AdditionalInstallersPage(this, controller, profile.getRepository(), provider);
            default:
                throw new IllegalStateException();
        }
@@ -23,7 +23,7 @@ import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.Launcher;
+
 import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.download.RemoteVersion;
 import org.jackhuang.hmcl.game.GameRepository;
@@ -32,6 +32,7 @@ import org.jackhuang.hmcl.ui.construct.Validator;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardPage;
 import org.jackhuang.hmcl.util.StringUtils;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 import java.util.Map;

@@ -75,30 +76,30 @@ public class InstallersPage extends StackPane implements WizardPage {

        String gameVersion = ((RemoteVersion<?>) controller.getSettings().get("game")).getGameVersion();
        Validator hasVersion = new Validator(s -> !repository.hasVersion(s) && StringUtils.isNotBlank(s));
-        hasVersion.setMessage(Launcher.i18n("install.new_game.already_exists"));
+        hasVersion.setMessage(i18n("install.new_game.already_exists"));
        txtName.getValidators().add(hasVersion);
        txtName.textProperty().addListener(e -> btnInstall.setDisable(!txtName.validate()));
        txtName.setText(gameVersion);

        btnForge.setOnMouseClicked(e -> {
            controller.getSettings().put(INSTALLER_TYPE, 0);
-            controller.onNext(new VersionsPage(controller, Launcher.i18n("install.installer.choose", Launcher.i18n("install.installer.forge")), gameVersion, downloadProvider, "forge", () -> controller.onPrev(false)));
+            controller.onNext(new VersionsPage(controller, i18n("install.installer.choose", i18n("install.installer.forge")), gameVersion, downloadProvider, "forge", () -> controller.onPrev(false)));
        });

        btnLiteLoader.setOnMouseClicked(e -> {
            controller.getSettings().put(INSTALLER_TYPE, 1);
-            controller.onNext(new VersionsPage(controller, Launcher.i18n("install.installer.choose", Launcher.i18n("install.installer.liteloader")), gameVersion, downloadProvider, "liteloader", () -> controller.onPrev(false)));
+            controller.onNext(new VersionsPage(controller, i18n("install.installer.choose", i18n("install.installer.liteloader")), gameVersion, downloadProvider, "liteloader", () -> controller.onPrev(false)));
        });

        btnOptiFine.setOnMouseClicked(e -> {
            controller.getSettings().put(INSTALLER_TYPE, 2);
-            controller.onNext(new VersionsPage(controller, Launcher.i18n("install.installer.choose", Launcher.i18n("install.installer.optifine")), gameVersion, downloadProvider, "optifine", () -> controller.onPrev(false)));
+            controller.onNext(new VersionsPage(controller, i18n("install.installer.choose", i18n("install.installer.optifine")), gameVersion, downloadProvider, "optifine", () -> controller.onPrev(false)));
        });
    }

    @Override
    public String getTitle() {
-        return Launcher.i18n("install.new_game");
+        return i18n("install.new_game");
    }

    private String getVersion(String id) {
@@ -107,21 +108,21 @@ public class InstallersPage extends StackPane implements WizardPage {

    @Override
    public void onNavigate(Map<String, Object> settings) {
-        lblGameVersion.setText(Launcher.i18n("install.new_game.current_game_version") + ": " + getVersion("game"));
+        lblGameVersion.setText(i18n("install.new_game.current_game_version") + ": " + getVersion("game"));
        if (controller.getSettings().containsKey("forge"))
-            lblForge.setText(Launcher.i18n("install.installer.version", Launcher.i18n("install.installer.forge")) + ": " + getVersion("forge"));
+            lblForge.setText(i18n("install.installer.version", i18n("install.installer.forge")) + ": " + getVersion("forge"));
        else
-            lblForge.setText(Launcher.i18n("install.installer.not_installed", Launcher.i18n("install.installer.forge")));
+            lblForge.setText(i18n("install.installer.not_installed", i18n("install.installer.forge")));

        if (controller.getSettings().containsKey("liteloader"))
-            lblLiteLoader.setText(Launcher.i18n("install.installer.version", Launcher.i18n("install.installer.liteloader")) + ": " + getVersion("liteloader"));
+            lblLiteLoader.setText(i18n("install.installer.version", i18n("install.installer.liteloader")) + ": " + getVersion("liteloader"));
        else
-            lblLiteLoader.setText(Launcher.i18n("install.installer.not_installed", Launcher.i18n("install.installer.liteloader")));
+            lblLiteLoader.setText(i18n("install.installer.not_installed", i18n("install.installer.liteloader")));

        if (controller.getSettings().containsKey("optifine"))
-            lblOptiFine.setText(Launcher.i18n("install.installer.version", Launcher.i18n("install.installer.optifine")) + ": " + getVersion("optifine"));
+            lblOptiFine.setText(i18n("install.installer.version", i18n("install.installer.optifine")) + ": " + getVersion("optifine"));
        else
-            lblOptiFine.setText(Launcher.i18n("install.installer.not_installed", Launcher.i18n("install.installer.optifine")));
+            lblOptiFine.setText(i18n("install.installer.not_installed", i18n("install.installer.optifine")));
    }

    @Override
@@ -25,7 +25,7 @@ import javafx.scene.control.Label;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import javafx.stage.FileChooser;
-import org.jackhuang.hmcl.Launcher;
+
 import org.jackhuang.hmcl.game.ModpackHelper;
 import org.jackhuang.hmcl.mod.Modpack;
 import org.jackhuang.hmcl.mod.UnsupportedModpackException;
@@ -37,6 +37,7 @@ import org.jackhuang.hmcl.ui.construct.Validator;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardPage;
 import org.jackhuang.hmcl.util.StringUtils;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 import java.io.File;
 import java.util.Map;
@@ -75,16 +76,16 @@ public final class ModpackPage extends StackPane implements WizardPage {
        Profile profile = (Profile) controller.getSettings().get("PROFILE");

        FileChooser chooser = new FileChooser();
-        chooser.setTitle(Launcher.i18n("modpack.choose"));
-        chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(Launcher.i18n("modpack"), "*.zip"));
+        chooser.setTitle(i18n("modpack.choose"));
+        chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("modpack"), "*.zip"));
        File selectedFile = chooser.showOpenDialog(Controllers.getStage());
        if (selectedFile == null) Platform.runLater(() -> Controllers.navigate(null));
        else {
            controller.getSettings().put(MODPACK_FILE, selectedFile);
            lblModpackLocation.setText(selectedFile.getAbsolutePath());
            txtModpackName.getValidators().addAll(
-                    new Validator(Launcher.i18n("install.new_game.already_exists"), str -> !profile.getRepository().hasVersion(str) && StringUtils.isNotBlank(str)),
-                    new Validator(Launcher.i18n("version.forbidden_name"), str -> !profile.getRepository().forbidsVersion(str))
+                    new Validator(i18n("install.new_game.already_exists"), str -> !profile.getRepository().hasVersion(str) && StringUtils.isNotBlank(str)),
+                    new Validator(i18n("version.forbidden_name"), str -> !profile.getRepository().forbidsVersion(str))
            );
            txtModpackName.textProperty().addListener(e -> btnInstall.setDisable(!txtModpackName.validate()));

@@ -96,7 +97,8 @@ public final class ModpackPage extends StackPane implements WizardPage {
                lblAuthor.setText(manifest.getAuthor());
                txtModpackName.setText(manifest.getName() + (StringUtils.isBlank(manifest.getVersion()) ? "" : "-" + manifest.getVersion()));
            } catch (UnsupportedModpackException e) {
-                txtModpackName.setText(Launcher.i18n("modpack.task.install.error"));
+                txtModpackName.setText(i18n("modpack.task.install.error"));
+                btnInstall.setDisable(true);
            }
        }
    }
@@ -118,14 +120,14 @@ public final class ModpackPage extends StackPane implements WizardPage {
        if (manifest != null) {
            WebStage stage = new WebStage();
            stage.getWebView().getEngine().loadContent(manifest.getDescription());
-            stage.setTitle(Launcher.i18n("modpack.wizard.step.3"));
+            stage.setTitle(i18n("modpack.wizard.step.3"));
            stage.showAndWait();
        }
    }

    @Override
    public String getTitle() {
-        return Launcher.i18n("modpack.task.install");
+        return i18n("modpack.task.install");
    }

    public static final String MODPACK_FILE = "MODPACK_FILE";
@@ -23,12 +23,13 @@ import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
-import org.jackhuang.hmcl.Launcher;
+
 import org.jackhuang.hmcl.download.RemoteVersion;
 import org.jackhuang.hmcl.download.game.GameRemoteVersionTag;
 import org.jackhuang.hmcl.download.liteloader.LiteLoaderRemoteVersionTag;
 import org.jackhuang.hmcl.download.optifine.OptiFineRemoteVersion;
 import org.jackhuang.hmcl.ui.FXUtils;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 import java.util.Objects;

@@ -57,15 +58,15 @@ public final class VersionsPageItem extends StackPane {
        if (remoteVersion.getTag() instanceof GameRemoteVersionTag) {
            switch (((GameRemoteVersionTag) remoteVersion.getTag()).getType()) {
                case RELEASE:
-                    lblGameVersion.setText(Launcher.i18n("version.game.release"));
+                    lblGameVersion.setText(i18n("version.game.release"));
                    imageView.setImage(new Image("/assets/img/icon.png", 32, 32, false, true));
                    break;
                case SNAPSHOT:
-                    lblGameVersion.setText(Launcher.i18n("version.game.snapshot"));
+                    lblGameVersion.setText(i18n("version.game.snapshot"));
                    imageView.setImage(new Image("/assets/img/command.png", 32, 32, false, true));
                    break;
                default:
-                    lblGameVersion.setText(Launcher.i18n("version.game.old"));
+                    lblGameVersion.setText(i18n("version.game.old"));
                    imageView.setImage(new Image("/assets/img/grass.png", 32, 32, false, true));
                    break;
            }
@@ -23,12 +23,12 @@ import org.jackhuang.hmcl.game.HMCLModpackExportTask;
 import org.jackhuang.hmcl.game.HMCLModpackManager;
 import org.jackhuang.hmcl.mod.Modpack;
 import org.jackhuang.hmcl.setting.Config;
+import org.jackhuang.hmcl.setting.ConfigHolder;
 import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardProvider;
-import org.jackhuang.hmcl.util.ZipEngine;
+import org.jackhuang.hmcl.util.Zipper;

 import java.io.File;
 import java.nio.file.Files;
@@ -37,6 +37,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;

+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+
 public final class ExportWizardProvider implements WizardProvider {
    private final Profile profile;
    private final String version;
@@ -79,26 +81,19 @@ public final class ExportWizardProvider implements WizardProvider {
                    dependency = dependency.then(Task.of(() -> {
                        boolean flag = true;

-                        try (ZipEngine zip = new ZipEngine(modpackFile)) {
-                            Config config = Settings.INSTANCE.getRawConfig();
-
-                            config.hasProxy.set(false);
-                            config.selectedProfile.set("");
-                            config.commonDirectory.set(null);
-                            config.fontFamily.set("Consolas");
-                            config.fontSize.set(12);
-                            config.localization.set(null);
-                            config.accounts.clear();
-                            config.selectedAccount.set("");
-                            config.logLines.set(100);
-                            config.configurations.clear();
-
-                            zip.putTextFile(Settings.GSON.toJson(config), Settings.SETTINGS_FILE_NAME);
+                        try (Zipper zip = new Zipper(modpackFile.toPath())) {
+                            Config exported = new Config();
+                            exported.setBackgroundImageType(config().getBackgroundImageType());
+                            exported.setBackgroundImage(config().getBackgroundImage());
+                            exported.setTheme(config().getTheme());
+                            exported.setDownloadType(config().getDownloadType());
+                            exported.getAuthlibInjectorServers().setAll(config().getAuthlibInjectorServers());
+                            zip.putTextFile(exported.toJson(), ConfigHolder.CONFIG_FILENAME);
                            zip.putFile(tempModpack, "modpack.zip");

                            File bg = new File("bg").getAbsoluteFile();
                            if (bg.isDirectory())
-                                zip.putDirectory(bg);
+                                zip.putDirectory(bg.toPath(), "bg");

                            File background_png = new File("background.png").getAbsoluteFile();
                            if (background_png.isFile())
@@ -25,7 +25,7 @@ import javafx.scene.control.Label;
 import javafx.scene.control.TreeItem;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
-import org.jackhuang.hmcl.Launcher;
+
 import org.jackhuang.hmcl.game.ModAdviser;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.ui.FXUtils;
@@ -34,7 +34,6 @@ import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardPage;
 import org.jackhuang.hmcl.util.FileUtils;
 import org.jackhuang.hmcl.util.StringUtils;
-
 import java.io.File;
 import java.util.LinkedList;
 import java.util.List;
@@ -43,6 +42,7 @@ import java.util.Objects;

 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;

 /**
 * @author huangyuhui
@@ -151,23 +151,23 @@ public final class ModpackFileSelectionPage extends StackPane implements WizardP

    @Override
    public String getTitle() {
-        return Launcher.i18n("modpack.wizard.step.2.title");
+        return i18n("modpack.wizard.step.2.title");
    }

    public static final String MODPACK_FILE_SELECTION = "modpack.accepted";
    private static final Map<String, String> TRANSLATION = mapOf(
-            pair("minecraft/servers.dat", Launcher.i18n("modpack.files.servers_dat")),
-            pair("minecraft/saves", Launcher.i18n("modpack.files.saves")),
-            pair("minecraft/mods", Launcher.i18n("modpack.files.mods")),
-            pair("minecraft/config", Launcher.i18n("modpack.files.config")),
-            pair("minecraft/liteconfig", Launcher.i18n("modpack.files.liteconfig")),
-            pair("minecraft/resourcepacks", Launcher.i18n("modpack.files.resourcepacks")),
-            pair("minecraft/resources", Launcher.i18n("modpack.files.resourcepacks")),
-            pair("minecraft/options.txt", Launcher.i18n("modpack.files.options_txt")),
-            pair("minecraft/optionsshaders.txt", Launcher.i18n("modpack.files.optionsshaders_txt")),
-            pair("minecraft/mods/VoxelMods", Launcher.i18n("modpack.files.mods.voxelmods")),
-            pair("minecraft/dumps", Launcher.i18n("modpack.files.dumps")),
-            pair("minecraft/blueprints", Launcher.i18n("modpack.files.blueprints")),
-            pair("minecraft/scripts", Launcher.i18n("modpack.files.scripts"))
+            pair("minecraft/servers.dat", i18n("modpack.files.servers_dat")),
+            pair("minecraft/saves", i18n("modpack.files.saves")),
+            pair("minecraft/mods", i18n("modpack.files.mods")),
+            pair("minecraft/config", i18n("modpack.files.config")),
+            pair("minecraft/liteconfig", i18n("modpack.files.liteconfig")),
+            pair("minecraft/resourcepacks", i18n("modpack.files.resourcepacks")),
+            pair("minecraft/resources", i18n("modpack.files.resourcepacks")),
+            pair("minecraft/options.txt", i18n("modpack.files.options_txt")),
+            pair("minecraft/optionsshaders.txt", i18n("modpack.files.optionsshaders_txt")),
+            pair("minecraft/mods/VoxelMods", i18n("modpack.files.mods.voxelmods")),
+            pair("minecraft/dumps", i18n("modpack.files.dumps")),
+            pair("minecraft/blueprints", i18n("modpack.files.blueprints")),
+            pair("minecraft/scripts", i18n("modpack.files.scripts"))
    );
 }
@@ -28,11 +28,12 @@ import javafx.scene.layout.StackPane;
 import javafx.stage.FileChooser;
 import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.auth.Account;
-import org.jackhuang.hmcl.setting.Settings;
+import org.jackhuang.hmcl.setting.Accounts;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardPage;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 import java.io.File;
 import java.util.List;
@@ -66,7 +67,7 @@ public final class ModpackInfoPage extends StackPane implements WizardPage {
        txtModpackName.textProperty().addListener(e -> checkValidation());
        txtModpackAuthor.textProperty().addListener(e -> checkValidation());
        txtModpackVersion.textProperty().addListener(e -> checkValidation());
-        txtModpackAuthor.setText(Optional.ofNullable(Settings.INSTANCE.getSelectedAccount()).map(Account::getUsername).orElse(""));
+        txtModpackAuthor.setText(Optional.ofNullable(Accounts.getSelectedAccount()).map(Account::getUsername).orElse(""));
        lblVersionName.setText(version);

        List<File> launcherJar = Launcher.getCurrentJarFiles();
@@ -81,8 +82,8 @@ public final class ModpackInfoPage extends StackPane implements WizardPage {
    @FXML
    private void onNext() {
        FileChooser fileChooser = new FileChooser();
-        fileChooser.setTitle(Launcher.i18n("modpack.wizard.step.initialization.save"));
-        fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(Launcher.i18n("modpack"), "*.zip"));
+        fileChooser.setTitle(i18n("modpack.wizard.step.initialization.save"));
+        fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("modpack"), "*.zip"));
        File file = fileChooser.showSaveDialog(Controllers.getStage());
        if (file == null) {
            Controllers.navigate(null);
@@ -109,7 +110,7 @@ public final class ModpackInfoPage extends StackPane implements WizardPage {

    @Override
    public String getTitle() {
-        return Launcher.i18n("modpack.wizard.step.1.title");
+        return i18n("modpack.wizard.step.1.title");
    }

    public static final String MODPACK_NAME = "modpack.name";
@@ -20,10 +20,7 @@ package org.jackhuang.hmcl.ui.wizard;
 import javafx.scene.Node;
 import org.jackhuang.hmcl.task.Task;

-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Stack;
+import java.util.*;

 public class WizardController implements Navigation {
    private final WizardDisplayer displayer;
@@ -47,6 +44,10 @@ public class WizardController implements Navigation {
        this.provider = provider;
    }

+    public List<Node> getPages() {
+        return Collections.unmodifiableList(pages);
+    }
+
    @Override
    public void onStart() {
        Objects.requireNonNull(provider);
@@ -81,6 +82,10 @@ public class WizardController implements Navigation {

    @Override
    public void onPrev(boolean cleanUp) {
+        if (!canPrev()) {
+            throw new IllegalStateException("Cannot go backward since this is the back page. Pages: " + pages);
+        }
+
        Node page = pages.pop();
        if (cleanUp && page instanceof WizardPage)
            ((WizardPage) page).cleanup(settings);
@@ -1,250 +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.upgrade;
-
-import com.google.gson.JsonParseException;
-import com.google.gson.reflect.TypeToken;
-import com.jfoenix.concurrency.JFXUtilities;
-import javafx.scene.layout.Region;
-import org.jackhuang.hmcl.Launcher;
-import org.jackhuang.hmcl.task.FileDownloadTask;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.task.TaskExecutor;
-import org.jackhuang.hmcl.ui.Controllers;
-import org.jackhuang.hmcl.ui.construct.MessageBox;
-import org.jackhuang.hmcl.util.*;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.*;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.jar.JarFile;
-import java.util.jar.JarOutputStream;
-import java.util.jar.Pack200;
-import java.util.logging.Level;
-import java.util.zip.GZIPInputStream;
-
-/**
- *
- * @author huangyuhui
- */
-public class AppDataUpgrader extends IUpgrader {
-
-    private void launchNewerVersion(List<String> args, File jar) throws IOException, ReflectiveOperationException {
-        try (JarFile jarFile = new JarFile(jar)) {
-            String mainClass = jarFile.getManifest().getMainAttributes().getValue("Main-Class");
-            if (mainClass == null)
-                throw new ClassNotFoundException("Main-Class not found in manifest");
-            ArrayList<String> al = new ArrayList<>(args);
-            al.add("--noupdate");
-            ClassLoader pre = Thread.currentThread().getContextClassLoader();
-            try {
-                Logging.stop();
-                ClassLoader now = new URLClassLoader(new URL[]{jar.toURI().toURL()}, ClassLoader.getSystemClassLoader().getParent());
-                Thread.currentThread().setContextClassLoader(now);
-                now.loadClass(mainClass).getMethod("main", String[].class).invoke(null, new Object[]{al.toArray(new String[0])});
-            } finally {
-                Logging.start(Launcher.LOG_DIRECTORY);
-                Thread.currentThread().setContextClassLoader(pre);
-            }
-        }
-    }
-
-    @Override
-    public void parseArguments(VersionNumber nowVersion, List<String> args) {
-        File f = AppDataUpgraderPackGzTask.HMCL_VER_FILE;
-        if (!args.contains("--noupdate"))
-            try {
-                if (f.exists()) {
-                    Map<String, String> m = Constants.GSON.fromJson(FileUtils.readText(f), new TypeToken<Map<String, String>>() {
-                    }.getType());
-                    String s = m.get("ver");
-                    if (s != null && VersionNumber.asVersion(s).compareTo(nowVersion) > 0) {
-                        String j = m.get("loc");
-                        if (j != null) {
-                            File jar = new File(j);
-                            if (jar.exists()) {
-                                launchNewerVersion(args, jar);
-                                System.exit(0);
-                            }
-                        }
-                    }
-                }
-            } catch (JsonParseException ex) {
-                f.delete();
-            } catch (IOException | ReflectiveOperationException t) {
-                Logging.LOG.log(Level.SEVERE, "Unable to execute newer version application", t);
-                AppDataUpgraderPackGzTask.HMCL_VER_FILE.delete(); // delete version json, let HMCL re-download the newer version.
-            }
-    }
-
-    @Override
-    public void download(UpdateChecker checker, VersionNumber ver) {
-        if (!(ver instanceof IntVersionNumber))
-            return;
-        IntVersionNumber version = (IntVersionNumber) ver;
-        checker.requestDownloadLink().then(Task.of(variables -> {
-            Map<String, String> map = variables.get(UpdateChecker.REQUEST_DOWNLOAD_LINK_ID);
-
-            if (map != null && map.containsKey("jar") && !StringUtils.isBlank(map.get("jar")))
-                try {
-                    String hash = null;
-                    if (map.containsKey("jarsha1"))
-                        hash = map.get("jarsha1");
-                    Task task = new AppDataUpgraderJarTask(NetworkUtils.toURL(map.get("jar")), version.toString(), hash);
-                    TaskExecutor executor = task.executor();
-                    AtomicReference<Region> region = new AtomicReference<>();
-                    JFXUtilities.runInFX(() -> region.set(Controllers.taskDialog(executor, Launcher.i18n("message.downloading"), "", null)));
-                    if (executor.test()) {
-                        new ProcessBuilder(JavaVersion.fromCurrentEnvironment().getBinary().getAbsolutePath(), "-jar", AppDataUpgraderJarTask.getSelf(version.toString()).getAbsolutePath())
-                                .directory(new File("").getAbsoluteFile()).start();
-                        System.exit(0);
-                    }
-                    JFXUtilities.runInFX(() -> Controllers.closeDialog(region.get()));
-                } catch (IOException ex) {
-                    Logging.LOG.log(Level.SEVERE, "Failed to create upgrader", ex);
-                }
-            else if (map != null && map.containsKey("pack") && !StringUtils.isBlank(map.get("pack")))
-                try {
-                    String hash = null;
-                    if (map.containsKey("packsha1"))
-                        hash = map.get("packsha1");
-                    Task task = new AppDataUpgraderPackGzTask(NetworkUtils.toURL(map.get("pack")), version.toString(), hash);
-                    TaskExecutor executor = task.executor();
-                    AtomicReference<Region> region = new AtomicReference<>();
-                    JFXUtilities.runInFX(() -> region.set(Controllers.taskDialog(executor, Launcher.i18n("message.downloading"), "", null)));
-                    if (executor.test()) {
-                        new ProcessBuilder(JavaVersion.fromCurrentEnvironment().getBinary().getAbsolutePath(), "-jar", AppDataUpgraderPackGzTask.getSelf(version.toString()).getAbsolutePath())
-                                .directory(new File("").getAbsoluteFile()).start();
-                        System.exit(0);
-                    }
-                    JFXUtilities.runInFX(() -> Controllers.closeDialog(region.get()));
-                } catch (IOException ex) {
-                    Logging.LOG.log(Level.SEVERE, "Failed to create upgrader", ex);
-                }
-            else {
-                String url = Launcher.PUBLISH;
-                if (map != null)
-                    if (map.containsKey(OperatingSystem.CURRENT_OS.getCheckedName()))
-                        url = map.get(OperatingSystem.CURRENT_OS.getCheckedName());
-                    else if (map.containsKey(OperatingSystem.UNKNOWN.getCheckedName()))
-                        url = map.get(OperatingSystem.UNKNOWN.getCheckedName());
-                try {
-                    java.awt.Desktop.getDesktop().browse(new URI(url));
-                } catch (URISyntaxException | IOException e) {
-                    Logging.LOG.log(Level.SEVERE, "Failed to browse uri: " + url, e);
-                    OperatingSystem.setClipboard(url);
-                    MessageBox.show(Launcher.i18n("update.no_browser"));
-                }
-            }
-        })).start();
-    }
-
-    public static class AppDataUpgraderPackGzTask extends Task {
-
-        public static final File BASE_FOLDER = Launcher.HMCL_DIRECTORY;
-        public static final File HMCL_VER_FILE = new File(BASE_FOLDER, "hmclver.json");
-
-        public static File getSelf(String ver) {
-            return new File(BASE_FOLDER, "HMCL-" + ver + ".jar");
-        }
-
-        private final URL downloadLink;
-        private final String newestVersion, hash;
-        File tempFile;
-
-        public AppDataUpgraderPackGzTask(URL downloadLink, String newestVersion, String hash) throws IOException {
-            this.downloadLink = downloadLink;
-            this.newestVersion = newestVersion;
-            this.hash = hash;
-            tempFile = File.createTempFile("hmcl", ".pack.gz");
-
-            setName("Upgrade");
-        }
-
-        @Override
-        public Collection<Task> getDependents() {
-            return Collections.singleton(new FileDownloadTask(downloadLink, tempFile, Proxy.NO_PROXY, hash));
-        }
-
-        @Override
-        public void execute() throws Exception {
-            HashMap<String, String> json = new HashMap<>();
-            File f = getSelf(newestVersion);
-            if (!FileUtils.makeDirectory(f.getParentFile()))
-                throw new IOException("Failed to make directories: " + f.getParent());
-
-            for (int i = 0; f.exists() && !f.delete(); i++)
-                f = new File(BASE_FOLDER, "HMCL-" + newestVersion + (i > 0 ? "-" + i : "") + ".jar");
-            if (!f.createNewFile())
-                throw new IOException("Failed to create new file: " + f);
-
-            try (JarOutputStream jos = new JarOutputStream(new FileOutputStream(f))) {
-                Pack200.newUnpacker().unpack(new GZIPInputStream(new FileInputStream(tempFile)), jos);
-            }
-            json.put("ver", newestVersion);
-            json.put("loc", f.getAbsolutePath());
-            String result = Constants.GSON.toJson(json);
-            FileUtils.writeText(HMCL_VER_FILE, result);
-        }
-
-    }
-
-    public static class AppDataUpgraderJarTask extends Task {
-
-        public static final File BASE_FOLDER = OperatingSystem.getWorkingDirectory("hmcl");
-        public static final File HMCL_VER_FILE = new File(BASE_FOLDER, "hmclver.json");
-
-        public static File getSelf(String ver) {
-            return new File(BASE_FOLDER, "HMCL-" + ver + ".jar");
-        }
-
-        private final URL downloadLink;
-        private final String newestVersion, hash;
-        File tempFile;
-
-        public AppDataUpgraderJarTask(URL downloadLink, String newestVersion, String hash) throws IOException {
-            this.downloadLink = downloadLink;
-            this.newestVersion = newestVersion;
-            this.hash = hash;
-            tempFile = File.createTempFile("hmcl", ".jar");
-
-            setName("Upgrade");
-        }
-
-        @Override
-        public Collection<Task> getDependents() {
-            return Collections.singleton(new FileDownloadTask(downloadLink, tempFile, Proxy.NO_PROXY, hash));
-        }
-
-        @Override
-        public void execute() throws Exception {
-            HashMap<String, String> json = new HashMap<>();
-            File f = getSelf(newestVersion);
-            FileUtils.copyFile(tempFile, f);
-            json.put("ver", newestVersion);
-            json.put("loc", f.getAbsolutePath());
-            String result = Constants.GSON.toJson(json);
-            FileUtils.writeText(HMCL_VER_FILE, result);
-        }
-
-    }
-}
@@ -0,0 +1,124 @@
+/*
+ * 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.upgrade;
+
+import static java.nio.file.StandardOpenOption.CREATE;
+import static java.nio.file.StandardOpenOption.READ;
+import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING;
+import static java.nio.file.StandardOpenOption.WRITE;
+import static org.jackhuang.hmcl.util.Lang.mapOf;
+import static org.jackhuang.hmcl.util.Pair.pair;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
+import java.nio.file.Path;
+import java.util.Map;
+import java.util.Optional;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import org.jackhuang.hmcl.util.IOUtils;
+
+/**
+ * Helper class for adding/removing executable header from HMCL file.
+ *
+ * @author yushijinhun
+ */
+final class ExecutableHeaderHelper {
+    private ExecutableHeaderHelper() {}
+
+    private static Map<String, String> suffix2header = mapOf(
+            pair("exe", "assets/HMCLauncher.exe"));
+
+    private static Optional<String> getSuffix(Path file) {
+        String filename = file.getFileName().toString();
+        int idxDot = filename.lastIndexOf('.');
+        if (idxDot < 0) {
+            return Optional.empty();
+        } else {
+            return Optional.of(filename.substring(idxDot + 1));
+        }
+    }
+
+    private static Optional<byte[]> readHeader(ZipFile zip, String suffix) throws IOException {
+        String location = suffix2header.get(suffix);
+        if (location != null) {
+            ZipEntry entry = zip.getEntry(location);
+            if (entry != null && !entry.isDirectory()) {
+                try (InputStream in = zip.getInputStream(entry)) {
+                    return Optional.of(IOUtils.readFullyAsByteArray(in));
+                }
+            }
+        }
+        return Optional.empty();
+    }
+
+    private static int detectHeaderLength(ZipFile zip, FileChannel channel) throws IOException {
+        ByteBuffer buf = channel.map(MapMode.READ_ONLY, 0, channel.size());
+        suffixLoop: for (String suffix : suffix2header.keySet()) {
+            Optional<byte[]> header = readHeader(zip, suffix);
+            if (header.isPresent()) {
+                buf.rewind();
+                for (byte b : header.get()) {
+                    if (!buf.hasRemaining() || b != buf.get()) {
+                        continue suffixLoop;
+                    }
+                }
+                return header.get().length;
+            }
+        }
+        return 0;
+    }
+
+    /**
+     * Copies the executable and removes its header.
+     */
+    public static void copyWithoutHeader(Path from, Path to) throws IOException {
+        try (
+                FileChannel in = FileChannel.open(from, READ);
+                FileChannel out = FileChannel.open(to, CREATE, WRITE, TRUNCATE_EXISTING);
+                ZipFile zip = new ZipFile(from.toFile())
+        ) {
+            in.transferTo(detectHeaderLength(zip, in), Long.MAX_VALUE, out);
+        }
+    }
+
+    /**
+     * Copies the executable and appends the header according to the suffix.
+     */
+    public static void copyWithHeader(Path from, Path to) throws IOException {
+        try (
+                FileChannel in = FileChannel.open(from, READ);
+                FileChannel out = FileChannel.open(to, CREATE, WRITE, TRUNCATE_EXISTING);
+                ZipFile zip = new ZipFile(from.toFile())
+        ) {
+            Optional<String> suffix = getSuffix(to);
+            if (suffix.isPresent()) {
+                Optional<byte[]> header = readHeader(zip, suffix.get());
+                if (header.isPresent()) {
+                    out.write(ByteBuffer.wrap(header.get()));
+                }
+            }
+
+            in.transferTo(detectHeaderLength(zip, in), Long.MAX_VALUE, out);
+        }
+    }
+}
@@ -1,45 +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.upgrade;
-
-import org.jackhuang.hmcl.util.VersionNumber;
-
-import java.util.List;
-
-/**
- *
- * @author huangyuhui
- */
-public abstract class IUpgrader {
-
-    /**
-     * Paring arguments to decide on whether the upgrade is needed.
-     *
-     * @param nowVersion now launcher version
-     * @param args       Application CommandLine Arguments
-     */
-    public abstract void parseArguments(VersionNumber nowVersion, List<String> args);
-
-    /**
-     * Just download the new app.
-     *
-     * @param checker Should be VersionChecker
-     * @param version the newest version
-     */
-    public abstract void download(UpdateChecker checker, VersionNumber version);
-}
@@ -0,0 +1,130 @@
+/*
+ * 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.upgrade;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.jackhuang.hmcl.util.Logging.LOG;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Path;
+import java.security.GeneralSecurityException;
+import java.security.KeyFactory;
+import java.security.PublicKey;
+import java.security.Signature;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.logging.Level;
+import java.util.TreeMap;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import org.jackhuang.hmcl.util.DigestUtils;
+import org.jackhuang.hmcl.util.IOUtils;
+
+/**
+ * A class that checks the integrity of HMCL.
+ *
+ * @author yushijinhun
+ */
+public final class IntegrityChecker {
+    private IntegrityChecker() {}
+
+    private static final String SIGNATURE_FILE = "META-INF/hmcl_signature";
+    private static final String PUBLIC_KEY_FILE = "assets/hmcl_signature_publickey.der";
+
+    private static PublicKey getPublicKey() throws IOException {
+        try (InputStream in = IntegrityChecker.class.getResourceAsStream("/" + PUBLIC_KEY_FILE)) {
+            if (in == null) {
+                throw new IOException("Public key not found");
+            }
+            return KeyFactory.getInstance("RSA").generatePublic(new X509EncodedKeySpec(IOUtils.readFullyAsByteArray(in)));
+        } catch (GeneralSecurityException e) {
+            throw new IOException("Failed to load public key", e);
+        }
+    }
+
+    private static boolean verifyJar(Path jarPath) throws IOException {
+        PublicKey publickey = getPublicKey();
+
+        byte[] signature = null;
+        Map<String, byte[]> fileFingerprints = new TreeMap<>();
+        try (ZipFile zip = new ZipFile(jarPath.toFile())) {
+            for (ZipEntry entry : zip.stream().toArray(ZipEntry[]::new)) {
+                String filename = entry.getName();
+                try (InputStream in = zip.getInputStream(entry)) {
+                    if (SIGNATURE_FILE.equals(filename)) {
+                        signature = IOUtils.readFullyAsByteArray(in);
+                    } else {
+                        fileFingerprints.put(filename, DigestUtils.digest("SHA-512", in));
+                    }
+                }
+            }
+        }
+
+        if (signature == null) {
+            throw new IOException("Signature is missing");
+        }
+
+        try {
+            Signature verifier = Signature.getInstance("SHA512withRSA");
+            verifier.initVerify(publickey);
+            for (Entry<String, byte[]> entry : fileFingerprints.entrySet()) {
+                verifier.update(DigestUtils.digest("SHA-512", entry.getKey().getBytes(UTF_8)));
+                verifier.update(entry.getValue());
+            }
+            return verifier.verify(signature);
+        } catch (GeneralSecurityException e) {
+            throw new IOException("Failed to verify signature", e);
+        }
+    }
+
+    static void requireVerifiedJar(Path jar) throws IOException {
+        if (!verifyJar(jar)) {
+            throw new IOException("Invalid signature: " + jar);
+        }
+    }
+
+    private static Boolean selfVerified = null;
+
+    /**
+     * Checks whether the current application is verified.
+     * This method is blocking.
+     */
+    public static synchronized boolean isSelfVerified() {
+        if (selfVerified != null) {
+            return selfVerified;
+        }
+        try {
+            verifySelf();
+            LOG.info("Successfully verified current JAR");
+            selfVerified = true;
+        } catch (IOException e) {
+            LOG.log(Level.WARNING, "Failed to verify myself, is the JAR corrupt?", e);
+            selfVerified = false;
+        }
+        return selfVerified;
+    }
+
+    private static void verifySelf() throws IOException {
+        Path self = LocalVersion.current().orElseThrow(() -> new IOException("Failed to find myself"))
+                .getLocation();
+        requireVerifiedJar(self);
+    }
+}
@@ -0,0 +1,162 @@
+/*
+ * 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.upgrade;
+
+import org.jackhuang.hmcl.Launcher;
+import org.jackhuang.hmcl.task.FileDownloadTask;
+import org.jackhuang.hmcl.util.Constants;
+import org.jackhuang.hmcl.util.FileUtils;
+import org.jackhuang.hmcl.util.JarUtils;
+import org.tukaani.xz.XZInputStream;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Pack200;
+import java.util.logging.Level;
+
+import static org.jackhuang.hmcl.util.Logging.LOG;
+
+/**
+ * A class used to manage the local HMCL repository.
+ *
+ * @author yushijinhun
+ */
+final class LocalRepository {
+    private LocalRepository() {}
+
+    private static Path localStorage = Launcher.HMCL_DIRECTORY.toPath().resolve("hmcl.jar");
+    private static Path hmclVersionJson = Launcher.HMCL_DIRECTORY.toPath().resolve("hmclver.json");
+
+    /**
+     * Gets the current stored executable in local repository.
+     */
+    public static Optional<LocalVersion> getStored() {
+        if (!Files.isRegularFile(localStorage)) {
+            return Optional.empty();
+        }
+        return Optional.of(localStorage)
+                .flatMap(JarUtils::getImplementationVersion)
+                .map(version -> new LocalVersion(version, localStorage));
+    }
+
+    private static void writeToStorage(Path source, boolean checkHeaders) throws IOException {
+        IntegrityChecker.requireVerifiedJar(source);
+        Files.createDirectories(localStorage.getParent());
+        if (checkHeaders) {
+            ExecutableHeaderHelper.copyWithoutHeader(source, localStorage);
+        } else {
+            Files.copy(source, localStorage, StandardCopyOption.REPLACE_EXISTING);
+        }
+
+        Optional<LocalVersion> stored = getStored();
+        if (stored.isPresent()) {
+            Map<String, String> json = new HashMap<>();
+            json.put("ver", stored.get().getVersion());
+            json.put("loc", stored.get().getLocation().toString());
+            FileUtils.writeText(hmclVersionJson.toFile(), Constants.GSON.toJson(json));
+        }
+    }
+
+    /**
+     * Creates a task that downloads the given version to local repository.
+     */
+    public static FileDownloadTask downloadFromRemote(RemoteVersion version) throws IOException {
+        Path downloaded = Files.createTempFile("hmcl-update-", null);
+        return new FileDownloadTask(new URL(version.getUrl()), downloaded.toFile(), version.getIntegrityCheck()) {
+            @Override
+            public void execute() throws Exception {
+                super.execute();
+
+                try {
+                    switch (version.getType()) {
+                        case JAR:
+                            writeToStorage(downloaded, false);
+                            break;
+
+                        case PACK_XZ:
+                            Path unpacked = Files.createTempFile("hmcl-update-unpack-", null);
+                            try {
+                                try (InputStream in = new XZInputStream(Files.newInputStream(downloaded));
+                                        JarOutputStream out = new JarOutputStream(Files.newOutputStream(unpacked))) {
+                                    Pack200.newUnpacker().unpack(in, out);
+                                }
+                                writeToStorage(unpacked, false);
+                            } finally {
+                                Files.deleteIfExists(unpacked);
+                            }
+                            break;
+
+                        default:
+                            throw new IllegalArgumentException("Unknown type: " + version.getType());
+                    }
+                } finally {
+                    Files.deleteIfExists(downloaded);
+                }
+            }
+        };
+    }
+
+    /**
+     * Copies the current HMCL executable to local repository.
+     */
+    public static void downloadFromCurrent() {
+        Optional<LocalVersion> current = LocalVersion.current();
+        if (current.isPresent()) {
+            Path currentPath = current.get().getLocation();
+            if (!Files.isRegularFile(currentPath)) {
+                LOG.warning("Failed to download " + current.get() + ", it isn't a file");
+                return;
+            }
+            if (isSameAsLocalStorage(currentPath)) {
+                LOG.warning("Trying to download from self, ignored");
+                return;
+            }
+            LOG.info("Downloading " + current.get());
+            try {
+                writeToStorage(current.get().getLocation(), true);
+            } catch (IOException e) {
+                LOG.log(Level.WARNING, "Failed to download " + current.get(), e);
+            }
+        }
+    }
+
+    /**
+     * Writes the executable stored in local repository to the given location.
+     */
+    public static void applyTo(Path target) throws IOException {
+        if (isSameAsLocalStorage(target)) {
+            throw new IOException("Cannot apply update to self");
+        }
+
+        LOG.info("Applying update to " + target);
+        IntegrityChecker.requireVerifiedJar(localStorage);
+        ExecutableHeaderHelper.copyWithHeader(localStorage, target);
+    }
+
+    private static boolean isSameAsLocalStorage(Path path) {
+        return path.toAbsolutePath().equals(localStorage.toAbsolutePath());
+    }
+}
@@ -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
@@ -15,39 +15,38 @@
 * 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.upgrade;

-import org.jackhuang.hmcl.util.ToStringBuilder;
-import org.jackhuang.hmcl.util.VersionNumber;
+import org.jackhuang.hmcl.Metadata;
+import org.jackhuang.hmcl.util.JarUtils;

-/**
- *
- * Result: Deny if do not upgrade HMCL.
- *
- * @author huangyuhui
- */
-public final class OutOfDateEvent extends Event {
-    private final VersionNumber version;
+import java.nio.file.Path;
+import java.util.Optional;

-    public OutOfDateEvent(Object source, VersionNumber version) {
-        super(source);
-        this.version = version;
+class LocalVersion {
+
+    public static Optional<LocalVersion> current() {
+        return JarUtils.thisJar().map(path -> new LocalVersion(Metadata.VERSION, path));
    }

-    public VersionNumber getVersion() {
+    private String version;
+    private Path location;
+
+    public LocalVersion(String version, Path location) {
+        this.version = version;
+        this.location = location;
+    }
+
+    public String getVersion() {
        return version;
    }

-    @Override
-    public boolean hasResult() {
-        return true;
+    public Path getLocation() {
+        return location;
    }

    @Override
    public String toString() {
-        return new ToStringBuilder(this)
-                .append("source", getSource())
-                .append("version", getVersion())
-                .toString();
+        return "[" + version + " at " + location + "]";
    }
 }
@@ -1,95 +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.upgrade;
-
-import com.jfoenix.concurrency.JFXUtilities;
-import javafx.scene.layout.Region;
-import org.jackhuang.hmcl.Launcher;
-import org.jackhuang.hmcl.task.FileDownloadTask;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.task.TaskExecutor;
-import org.jackhuang.hmcl.ui.Controllers;
-import org.jackhuang.hmcl.util.Logging;
-import org.jackhuang.hmcl.util.VersionNumber;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.logging.Level;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-/**
- *
- * @author huangyuhui
- */
-public class NewFileUpgrader extends IUpgrader {
-
-    @Override
-    public void parseArguments(VersionNumber nowVersion, List<String> args) {
-        int i = args.indexOf("--removeOldLauncher");
-        if (i != -1 && i < args.size() - 1) {
-            File f = new File(args.get(i + 1));
-            if (f.exists())
-                f.deleteOnExit();
-        }
-    }
-
-    @Override
-    public void download(UpdateChecker checker, VersionNumber version) {
-        URL url = requestDownloadLink();
-        if (url == null) return;
-        File newf = new File(url.getFile());
-        Controllers.dialog(Launcher.i18n("message.downloading"));
-        Task task = new FileDownloadTask(url, newf);
-        TaskExecutor executor = task.executor();
-        AtomicReference<Region> region = new AtomicReference<>();
-        JFXUtilities.runInFX(() -> region.set(Controllers.taskDialog(executor, Launcher.i18n("message.downloading"), "", null)));
-        if (executor.test()) {
-            try {
-                new ProcessBuilder(newf.getCanonicalPath(), "--removeOldLauncher", getRealPath())
-                        .directory(new File("").getAbsoluteFile())
-                        .start();
-            } catch (IOException ex) {
-                Logging.LOG.log(Level.SEVERE, "Failed to start new app", ex);
-            }
-            System.exit(0);
-        }
-        JFXUtilities.runInFX(() -> Controllers.closeDialog(region.get()));
-    }
-
-    private static String getRealPath() {
-        String realPath = NewFileUpgrader.class.getClassLoader().getResource("").getFile();
-        File file = new File(realPath);
-        realPath = file.getAbsolutePath();
-        try {
-            realPath = java.net.URLDecoder.decode(realPath, UTF_8.name());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return realPath;
-    }
-
-    private URL requestDownloadLink() {
-        return null;
-    }
-
-}
-
@@ -0,0 +1,90 @@
+/*
+ * 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.upgrade;
+
+import java.io.IOException;
+import java.util.Optional;
+
+import org.jackhuang.hmcl.task.FileDownloadTask.IntegrityCheck;
+import org.jackhuang.hmcl.util.JsonUtils;
+import org.jackhuang.hmcl.util.NetworkUtils;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+
+public class RemoteVersion {
+
+    public static RemoteVersion fetch(String url) throws IOException {
+        try {
+            JsonObject response = JsonUtils.fromNonNullJson(NetworkUtils.doGet(NetworkUtils.toURL(url)), JsonObject.class);
+            String version = Optional.ofNullable(response.get("version")).map(JsonElement::getAsString).orElseThrow(() -> new IOException("version is missing"));
+            String jarUrl = Optional.ofNullable(response.get("jar")).map(JsonElement::getAsString).orElse(null);
+            String jarHash = Optional.ofNullable(response.get("jarsha1")).map(JsonElement::getAsString).orElse(null);
+            String packXZUrl = Optional.ofNullable(response.get("packxz")).map(JsonElement::getAsString).orElse(null);
+            String packXZHash = Optional.ofNullable(response.get("packxzsha1")).map(JsonElement::getAsString).orElse(null);
+            if (packXZUrl != null && packXZHash != null) {
+                return new RemoteVersion(version, packXZUrl, Type.PACK_XZ, new IntegrityCheck("SHA-1", packXZHash));
+            } else if (jarUrl != null && jarHash != null) {
+                return new RemoteVersion(version, jarUrl, Type.JAR, new IntegrityCheck("SHA-1", jarHash));
+            } else {
+                throw new IOException("No download url is available");
+            }
+        } catch (JsonParseException e) {
+            throw new IOException("Malformed response", e);
+        }
+    }
+
+    private String version;
+    private String url;
+    private Type type;
+    private IntegrityCheck integrityCheck;
+
+    public RemoteVersion(String version, String url, Type type, IntegrityCheck integrityCheck) {
+        this.version = version;
+        this.url = url;
+        this.type = type;
+        this.integrityCheck = integrityCheck;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public Type getType() {
+        return type;
+    }
+
+    public IntegrityCheck getIntegrityCheck() {
+        return integrityCheck;
+    }
+
+    @Override
+    public String toString() {
+        return "[" + version + " from " + url + "]";
+    }
+
+    public enum Type {
+        PACK_XZ,
+        JAR
+    }
+}
@@ -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,144 +17,109 @@
 */
 package org.jackhuang.hmcl.upgrade;

-import com.google.gson.JsonSyntaxException;
-import org.jackhuang.hmcl.Launcher;
-import org.jackhuang.hmcl.event.Event;
-import org.jackhuang.hmcl.event.EventBus;
-import org.jackhuang.hmcl.event.OutOfDateEvent;
-import org.jackhuang.hmcl.task.GetTask;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.task.TaskResult;
-import org.jackhuang.hmcl.ui.construct.MessageBox;
-import org.jackhuang.hmcl.util.Constants;
-import org.jackhuang.hmcl.util.NetworkUtils;
-import org.jackhuang.hmcl.util.VersionNumber;
-
-import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.Lang.mapOf;
+import static org.jackhuang.hmcl.util.Pair.pair;
+import static org.jackhuang.hmcl.util.VersionNumber.asVersion;

 import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-import java.util.logging.Level;

-/**
- *
- * @author huangyuhui
- */
+import com.jfoenix.concurrency.JFXUtilities;
+import javafx.beans.property.*;
+import org.jackhuang.hmcl.Metadata;
+import org.jackhuang.hmcl.util.ImmediateStringProperty;
+import org.jackhuang.hmcl.util.NetworkUtils;
+
+import javafx.application.Platform;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.value.ObservableBooleanValue;
+
 public final class UpdateChecker {
+    private UpdateChecker() {}

-    private volatile boolean outOfDate = false;
-    private final VersionNumber base;
-    private String versionString;
-    private Map<String, String> download_link = null;
+    public static final String CHANNEL_STABLE = "stable";
+    public static final String CHANNEL_DEV = "dev";

-    public UpdateChecker(VersionNumber base) {
-        this.base = base;
-    }
+    private static StringProperty updateChannel = new ImmediateStringProperty(null, "updateChannel", CHANNEL_STABLE);

-    private VersionNumber value;
-
-    public boolean isOutOfDate() {
-        return outOfDate;
-    }
-
-    /**
-     * Download the version number synchronously. When you execute this method
-     * first, should leave "showMessage" false.
-     *
-     * @param showMessage If it is requested to warn the user that there is a
-     *                    new version.
-     *
-     * @return the process observable.
-     */
-    public TaskResult<VersionNumber> process(final boolean showMessage) {
-        return new TaskResult<VersionNumber>() {
-            GetTask http = new GetTask(NetworkUtils.toURL(Launcher.UPDATE_SERVER + "/hmcl/update.php?version=" + Launcher.VERSION));
-
-            @Override
-            public Collection<? extends Task> getDependents() {
-                return value == null ? Collections.singleton(http) : Collections.emptyList();
-            }
-
-            @Override
-            public void execute() throws Exception {
-                if (isDevelopmentVersion(Launcher.VERSION)) {
-                    LOG.info("Current version is a development version, skip updating");
-                    return;
+    private static ObjectProperty<RemoteVersion> latestVersion = new SimpleObjectProperty<>();
+    private static BooleanBinding outdated = Bindings.createBooleanBinding(
+            () -> {
+                RemoteVersion latest = latestVersion.get();
+                if (latest == null || isDevelopmentVersion(Metadata.VERSION)) {
+                    return false;
+                } else {
+                    return asVersion(latest.getVersion()).compareTo(asVersion(Metadata.VERSION)) > 0;
                }
+            },
+            latestVersion);
+    private static ReadOnlyBooleanWrapper checkingUpdate = new ReadOnlyBooleanWrapper(false);

-                if (value == null) {
-                    versionString = http.getResult();
-                    value = VersionNumber.asVersion(versionString);
-                }
-
-                if (value == null) {
-                    LOG.warning("Unable to check update...");
-                    if (showMessage)
-                        MessageBox.show(Launcher.i18n("update.failed"));
-                } else if (base.compareTo(value) < 0)
-                    outOfDate = true;
-                if (outOfDate)
-                    setResult(value);
-            }
-
-            @Override
-            public String getId() {
-                return "update_checker.process";
-            }
-        };
+    public static String getUpdateChannel() {
+        return updateChannel.get();
    }

-    private boolean isDevelopmentVersion(String version) {
-        return version.contains("@") || // eg. @HELLO_MINECRAFT_LAUNCHER_VERSION_FOR_GRADLE_REPLACING@
+    public static void setUpdateChannel(String updateChannel) {
+        UpdateChecker.updateChannel.set(updateChannel);
+    }
+
+    public static StringProperty updateChannelProperty() {
+        return updateChannel;
+    }
+
+    public static RemoteVersion getLatestVersion() {
+        return latestVersion.get();
+    }
+
+    public static ReadOnlyObjectProperty<RemoteVersion> latestVersionProperty() {
+        return latestVersion;
+    }
+
+    public static boolean isOutdated() {
+        return outdated.get();
+    }
+
+    public static ObservableBooleanValue outdatedProperty() {
+        return outdated;
+    }
+
+    public static boolean isCheckingUpdate() {
+        return checkingUpdate.get();
+    }
+
+    public static ReadOnlyBooleanProperty checkingUpdateProperty() {
+        return checkingUpdate.getReadOnlyProperty();
+    }
+
+    public static void checkUpdate() throws IOException {
+        if (!IntegrityChecker.isSelfVerified()) {
+            return;
+        }
+
+        JFXUtilities.runInFXAndWait(() -> {
+            checkingUpdate.set(true);
+        });
+
+        try {
+
+            String channel = getUpdateChannel();
+            String url = NetworkUtils.withQuery(Metadata.UPDATE_URL, mapOf(
+                    pair("version", Metadata.VERSION),
+                    pair("channel", channel)));
+
+            RemoteVersion fetched = RemoteVersion.fetch(url);
+            Platform.runLater(() -> {
+                if (channel.equals(getUpdateChannel())) {
+                    latestVersion.set(fetched);
+                }
+            });
+        } finally {
+            Platform.runLater(() -> checkingUpdate.set(false));
+        }
+    }
+
+    private static boolean isDevelopmentVersion(String version) {
+        return version.contains("@") || // eg. @develop@
                version.contains("SNAPSHOT"); // eg. 3.1.SNAPSHOT
    }
-
-    /**
-     * Get the <b>cached</b> newest version number, use "process" method to
-     * download!
-     *
-     * @return the newest version number
-     *
-     * @see #process(boolean)
-     */
-    public VersionNumber getNewVersion() {
-        return value;
-    }
-
-    /**
-     * Get the download links.
-     *
-     * @return a JSON, which contains the server response.
-     */
-    public synchronized TaskResult<Map<String, String>> requestDownloadLink() {
-        return new TaskResult<Map<String, String>>() {
-            @Override
-            public void execute() {
-                if (download_link == null) {
-                    try {
-                        download_link = Constants.GSON.<Map<String, String>>fromJson(NetworkUtils.doGet(NetworkUtils.toURL(Launcher.UPDATE_SERVER + "/hmcl/update_link.php")), Map.class);
-                    } catch (JsonSyntaxException | IOException e) {
-                        LOG.log(Level.SEVERE, "Failed to get update link.", e);
-                    }
-                }
-                setResult(download_link);
-            }
-
-            @Override
-            public String getId() {
-                return "update_checker.request_download_link";
-            }
-        };
-    }
-
-    public static final String REQUEST_DOWNLOAD_LINK_ID = "update_checker.request_download_link";
-
-    public void checkOutdate() {
-        if (outOfDate)
-            if (EventBus.EVENT_BUS.fireEvent(new OutOfDateEvent(this, getNewVersion())) != Event.Result.DENY) {
-                Launcher.UPGRADER.download(this, getNewVersion());
-            }
-    }
 }
@@ -0,0 +1,278 @@
+/*
+ * 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.upgrade;
+
+import static org.jackhuang.hmcl.ui.FXUtils.checkFxUserThread;
+import static org.jackhuang.hmcl.util.IntVersionNumber.isIntVersionNumber;
+import static org.jackhuang.hmcl.util.Lang.thread;
+import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.VersionNumber.asVersion;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.logging.Level;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.swing.JOptionPane;
+
+import org.jackhuang.hmcl.Launcher;
+import org.jackhuang.hmcl.Main;
+import org.jackhuang.hmcl.Metadata;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.task.TaskExecutor;
+import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
+import org.jackhuang.hmcl.ui.construct.MessageBox;
+import org.jackhuang.hmcl.util.JavaVersion;
+import org.jackhuang.hmcl.util.StringUtils;
+
+import javafx.application.Platform;
+import javafx.scene.layout.Region;
+
+public final class UpdateHandler {
+    private UpdateHandler() {}
+
+    /**
+     * @return whether to exit
+     */
+    public static boolean processArguments(String[] args) {
+        if (!isIntVersionNumber(Metadata.VERSION)) {
+            return false;
+        }
+
+        if (isNestedApplication()) {
+            // updated from old versions
+            try {
+                performMigration();
+            } catch (IOException e) {
+                LOG.log(Level.WARNING, "Failed to perform migration", e);
+                JOptionPane.showMessageDialog(null, i18n("fatal.apply_update_failure", Metadata.PUBLISH_URL) + "\n" + StringUtils.getStackTrace(e), "Error", JOptionPane.ERROR_MESSAGE);
+            }
+            return true;
+        }
+
+        if (args.length == 2 && args[0].equals("--apply-to")) {
+            try {
+                applyUpdate(Paths.get(args[1]));
+            } catch (IOException e) {
+                LOG.log(Level.WARNING, "Failed to apply update", e);
+                JOptionPane.showMessageDialog(null, i18n("fatal.apply_update_failure", Metadata.PUBLISH_URL) + "\n" + StringUtils.getStackTrace(e), "Error", JOptionPane.ERROR_MESSAGE);
+            }
+            return true;
+        }
+
+        if (isFirstLaunchAfterUpgrade()) {
+            JOptionPane.showMessageDialog(null, i18n("fatal.migration_requires_manual_reboot"), "Info", JOptionPane.INFORMATION_MESSAGE);
+            return true;
+        }
+
+        Optional<LocalVersion> local = LocalRepository.getStored();
+        if (local.isPresent()) {
+            int difference = asVersion(local.get().getVersion()).compareTo(asVersion(Metadata.VERSION));
+
+            if (difference < 0) {
+                LocalRepository.downloadFromCurrent();
+
+            } else if (difference > 0) {
+                Optional<LocalVersion> current = LocalVersion.current();
+                if (current.isPresent() && IntegrityChecker.isSelfVerified()) {
+                    try {
+                        requestUpdate(local.get().getLocation(), current.get().getLocation());
+                    } catch (IOException e) {
+                        LOG.log(Level.WARNING, "Failed to update from local repository", e);
+                        return false;
+                    }
+                    return true;
+                } else {
+                    return false;
+                }
+            }
+
+        } else {
+            LocalRepository.downloadFromCurrent();
+        }
+
+        return false;
+    }
+
+    private static void requestUpdate(Path updateTo, Path self) throws IOException {
+        IntegrityChecker.requireVerifiedJar(updateTo);
+        startJava(updateTo, "--apply-to", self.toString());
+    }
+
+    private static void applyUpdate(Path target) throws IOException {
+        LocalRepository.applyTo(target);
+
+        Optional<String> newVersion = LocalRepository.getStored().map(LocalVersion::getVersion);
+        if (newVersion.isPresent()) {
+            Optional<Path> newFilename = tryRename(target, newVersion.get());
+            if (newFilename.isPresent()) {
+                LOG.info("Move " + target + " to " + newFilename.get());
+                try {
+                    Files.move(target, newFilename.get());
+                    target = newFilename.get();
+                } catch (IOException e) {
+                    LOG.log(Level.WARNING, "Failed to move target", e);
+                }
+            }
+        } else {
+            LOG.warning("Failed to find local repository");
+        }
+
+        startJava(target);
+    }
+
+    private static void startJava(Path jar, String... appArgs) throws IOException {
+        List<String> commandline = new ArrayList<>();
+        commandline.add(JavaVersion.fromCurrentEnvironment().getBinary().getAbsolutePath());
+        commandline.add("-jar");
+        commandline.add(jar.toAbsolutePath().toString());
+        for (String arg : appArgs) {
+            commandline.add(arg);
+        }
+        LOG.info("Starting process: " + commandline);
+        new ProcessBuilder(commandline)
+                .directory(Paths.get("").toAbsolutePath().toFile())
+                .inheritIO()
+                .start();
+    }
+
+    public static void updateFrom(RemoteVersion version) {
+        checkFxUserThread();
+
+        Task task;
+        try {
+            task = LocalRepository.downloadFromRemote(version);
+        } catch (IOException e) {
+            LOG.log(Level.WARNING, "Failed to create upgrade download task", e);
+            return;
+        }
+        TaskExecutor executor = task.executor();
+        Region dialog = Controllers.taskDialog(executor, i18n("message.downloading"), "", null);
+        thread(() -> {
+            boolean success = executor.test();
+            Platform.runLater(() -> dialog.fireEvent(new DialogCloseEvent()));
+            if (success) {
+                try {
+                    Optional<LocalVersion> current = LocalVersion.current();
+                    Optional<LocalVersion> stored = LocalRepository.getStored();
+                    if (!current.isPresent()) {
+                        throw new IOException("Failed to find current HMCL location");
+                    }
+                    if (!stored.isPresent()) {
+                        throw new IOException("Failed to find local repository, this shouldn't happen");
+                    }
+                    if (!IntegrityChecker.isSelfVerified()) {
+                        throw new IOException("Current JAR is not verified");
+                    }
+                    requestUpdate(stored.get().getLocation(), current.get().getLocation());
+                    System.exit(0);
+                } catch (IOException e) {
+                    LOG.log(Level.WARNING, "Failed to update to " + version, e);
+                    Platform.runLater(() -> Controllers.dialog(StringUtils.getStackTrace(e), i18n("update.failed"), MessageBox.ERROR_MESSAGE));
+                    return;
+                }
+            } else {
+                Throwable e = task.getLastException();
+                LOG.log(Level.WARNING, "Failed to update to " + version, e);
+                Platform.runLater(() -> Controllers.dialog(e.toString(), i18n("update.failed"), MessageBox.ERROR_MESSAGE));
+            }
+        });
+    }
+
+    private static Optional<Path> tryRename(Path path, String newVersion) {
+        String filename = path.getFileName().toString();
+        Matcher matcher = Pattern.compile("^(?<prefix>[hH][mM][cC][lL][.-])(?<version>\\d+(?:\\.\\d+)*)(?<suffix>\\.[^.]+)$").matcher(filename);
+        if (matcher.find()) {
+            String newFilename = matcher.group("prefix") + newVersion + matcher.group("suffix");
+            if (!newFilename.equals(filename)) {
+                return Optional.of(path.resolveSibling(newFilename));
+            }
+        }
+        return Optional.empty();
+    }
+
+    // ==== support for old versions ===
+    private static void performMigration() throws IOException {
+        LOG.info("Migrating from old versions");
+
+        Path location = getParentApplicationLocation()
+                .orElseThrow(() -> new IOException("Failed to get parent application location"));
+
+        Optional<LocalVersion> local = LocalRepository.getStored();
+        if (!local.isPresent() ||
+                asVersion(local.get().getVersion()).compareTo(asVersion(Metadata.VERSION)) < 0) {
+            LocalRepository.downloadFromCurrent();
+        }
+        local = LocalRepository.getStored();
+        if (!local.isPresent()) {
+            throw new IOException("Failed to find local repository");
+        }
+
+        requestUpdate(local.get().getLocation(), location);
+    }
+
+    /**
+     * This method must be called from the main thread.
+     */
+    private static boolean isNestedApplication() {
+        StackTraceElement[] stacktrace = Thread.currentThread().getStackTrace();
+        for (int i = 0; i < stacktrace.length; i++) {
+            StackTraceElement element = stacktrace[i];
+            if (Main.class.getName().equals(element.getClassName())) {
+                // we've reached the main method
+                if (i + 1 == stacktrace.length) {
+                    return false;
+                } else {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private static Optional<Path> getParentApplicationLocation() {
+        String command = System.getProperty("sun.java.command");
+        if (command != null) {
+            Path path = Paths.get(command);
+            if (Files.isRegularFile(path)) {
+                return Optional.of(path.toAbsolutePath());
+            }
+        }
+        return Optional.empty();
+    }
+
+    private static boolean isFirstLaunchAfterUpgrade() {
+        Optional<Path> currentPath = LocalVersion.current().map(LocalVersion::getLocation);
+        if (currentPath.isPresent()) {
+            Path updated = Launcher.HMCL_DIRECTORY.toPath().resolve("HMCL-" + Metadata.VERSION + ".jar");
+            if (currentPath.get().toAbsolutePath().equals(updated.toAbsolutePath())) {
+                return true;
+            }
+        }
+        return false;
+    }
+    // ====
+}
@@ -18,12 +18,16 @@
 package org.jackhuang.hmcl.util;

 import javafx.application.Platform;
-import org.jackhuang.hmcl.Launcher;
+
+import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.ui.CrashWindow;
 import org.jackhuang.hmcl.ui.construct.MessageBox;
+import org.jackhuang.hmcl.upgrade.IntegrityChecker;
+import org.jackhuang.hmcl.upgrade.UpdateChecker;

 import static java.util.Collections.newSetFromMap;
 import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 import java.io.IOException;
 import java.text.SimpleDateFormat;
@@ -41,19 +45,17 @@ public class CrashReporter implements Thread.UncaughtExceptionHandler {

    private static final Map<String, String> SOURCE = new HashMap<String, String>() {
        {
-            put("javafx.fxml.LoadException", Launcher.i18n("crash.NoClassDefFound"));
-            put("Location is not set", Launcher.i18n("crash.NoClassDefFound"));
-            put("UnsatisfiedLinkError", Launcher.i18n("crash.user_fault"));
-            put("java.lang.NoClassDefFoundError", Launcher.i18n("crash.NoClassDefFound"));
-            put("java.lang.VerifyError", Launcher.i18n("crash.NoClassDefFound"));
-            put("java.lang.NoSuchMethodError", Launcher.i18n("crash.NoClassDefFound"));
-            put("java.lang.NoSuchFieldError", Launcher.i18n("crash.NoClassDefFound"));
-            put("netscape.javascript.JSException", Launcher.i18n("crash.NoClassDefFound"));
-            put("java.lang.IncompatibleClassChangeError", Launcher.i18n("crash.NoClassDefFound"));
-            put("java.lang.ClassFormatError", Launcher.i18n("crash.NoClassDefFound"));
-            put("java.lang.OutOfMemoryError", "FUCKING MEMORY LIMIT!");
-            put("Trampoline", Launcher.i18n("launcher.update_java"));
-            put("com.sun.javafx.css.StyleManager.findMatchingStyles", Launcher.i18n("launcher.update_java"));
+            put("javafx.fxml.LoadException", i18n("crash.NoClassDefFound"));
+            put("Location is not set", i18n("crash.NoClassDefFound"));
+            put("UnsatisfiedLinkError", i18n("crash.user_fault"));
+            put("java.lang.NoClassDefFoundError", i18n("crash.NoClassDefFound"));
+            put("java.lang.VerifyError", i18n("crash.NoClassDefFound"));
+            put("java.lang.NoSuchMethodError", i18n("crash.NoClassDefFound"));
+            put("java.lang.NoSuchFieldError", i18n("crash.NoClassDefFound"));
+            put("netscape.javascript.JSException", i18n("crash.NoClassDefFound"));
+            put("java.lang.IncompatibleClassChangeError", i18n("crash.NoClassDefFound"));
+            put("java.lang.ClassFormatError", i18n("crash.NoClassDefFound"));
+            put("com.sun.javafx.css.StyleManager.findMatchingStyles", i18n("launcher.update_java"));
            put("NoSuchAlgorithmException", "Has your operating system been installed completely or is a ghost system?");
        }
    };
@@ -92,7 +94,7 @@ public class CrashReporter implements Thread.UncaughtExceptionHandler {
            CAUGHT_EXCEPTIONS.add(stackTrace);

            String text = "---- Hello Minecraft! Crash Report ----\n" +
-                    "  Version: " + Launcher.VERSION + "\n" +
+                    "  Version: " + Metadata.VERSION + "\n" +
                    "  Time: " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "\n" +
                    "  Thread: " + t.toString() + "\n" +
                    "\n  Content: \n    " +
@@ -106,8 +108,9 @@ public class CrashReporter implements Thread.UncaughtExceptionHandler {

            if (checkThrowable(e)) {
                Platform.runLater(() -> new CrashWindow(text).show());
-                if (!Launcher.UPDATE_CHECKER.isOutOfDate())
+                if (!UpdateChecker.isOutdated() && IntegrityChecker.isSelfVerified()) {
                    reportToServer(text);
+                }
            }
        } catch (Throwable handlingException) {
            LOG.log(Level.SEVERE, "Unable to handle uncaught exception", handlingException);
@@ -118,7 +121,7 @@ public class CrashReporter implements Thread.UncaughtExceptionHandler {
        Thread t = new Thread(() -> {
            HashMap<String, String> map = new HashMap<>();
            map.put("crash_report", text);
-            map.put("version", Launcher.VERSION);
+            map.put("version", Metadata.VERSION);
            map.put("log", Logging.getLogs());
            try {
                String response = NetworkUtils.doPost(NetworkUtils.toURL("https://hmcl.huangyuhui.net/hmcl/crash.php"), map);
@@ -0,0 +1,60 @@
+/*
+ * 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.util.i18n;
+
+import static org.jackhuang.hmcl.util.Logging.LOG;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+import java.util.logging.Level;
+
+import org.jackhuang.hmcl.setting.ConfigHolder;
+import org.jackhuang.hmcl.util.i18n.Locales.SupportedLocale;
+
+public final class I18n {
+
+    private I18n() {}
+
+    private static SupportedLocale getCurrentLocale() {
+        try {
+            return ConfigHolder.config().getLocalization();
+        } catch (IllegalStateException e) {
+            // e is thrown by ConfigHolder.config(), indicating the config hasn't been loaded
+            // fallback to use default locale
+            return Locales.DEFAULT;
+        }
+    }
+
+    public static ResourceBundle getResourceBundle() {
+        return getCurrentLocale().getResourceBundle();
+    }
+
+    public static String i18n(String key, Object... formatArgs) {
+        return String.format(i18n(key), formatArgs);
+    }
+
+    public static String i18n(String key) {
+        try {
+            return getResourceBundle().getString(key);
+        } catch (MissingResourceException e) {
+            LOG.log(Level.SEVERE, "Cannot find key " + key + " in resource bundle", e);
+            return key;
+        }
+    }
+
+}
@@ -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
@@ -15,11 +15,14 @@
 * 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;
+package org.jackhuang.hmcl.util.i18n;

-import org.jackhuang.hmcl.ui.construct.UTF8Control;
 import org.jackhuang.hmcl.util.Lang;

+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+
+import java.io.IOException;
 import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
@@ -53,7 +56,7 @@ public final class Locales {
     */
    public static final SupportedLocale RU = new SupportedLocale(new Locale("ru"));

-    public static final List<SupportedLocale> LOCALES = Lang.immutableListOf(DEFAULT, EN, ZH_CN);
+    public static final List<SupportedLocale> LOCALES = Lang.immutableListOf(DEFAULT, EN, ZH_CN, ZH);

    public static SupportedLocale getLocale(int index) {
        return Lang.get(LOCALES, index).orElse(DEFAULT);
@@ -108,5 +111,17 @@ public final class Locales {
            if (name == null) return resourceBundle.getString("lang");
            else return newResourceBundle.getString(name);
        }
+
+        public static class TypeAdapter extends com.google.gson.TypeAdapter<SupportedLocale> {
+            @Override
+            public void write(JsonWriter out, SupportedLocale value) throws IOException {
+                out.value(getNameByLocale(value));
+            }
+
+            @Override
+            public SupportedLocale read(JsonReader in) throws IOException {
+                return getLocaleByName(in.nextString());
+            }
+        }
    }
 }