Fixed #296

HMCL/build.gradle

@@ -1,137 +1,163 @@
-plugins {
-    id 'com.github.johnrengelman.shadow' version '2.0.4'
-}
+import org.apache.tools.ant.filters.ReplaceTokens
+import proguard.gradle.ProGuardTask
 
-import java.nio.file.FileSystems
-import java.security.KeyFactory
 import java.security.MessageDigest
-import java.security.Signature
-import java.security.spec.PKCS8EncodedKeySpec
 import java.util.jar.JarFile
-import java.util.jar.JarOutputStream
 import java.util.jar.Pack200
 import java.util.zip.GZIPOutputStream
-import java.util.zip.ZipFile
-import java.nio.file.Files
 
-import org.tukaani.xz.LZMA2Options
-import org.tukaani.xz.XZOutputStream
+if (!hasProperty('mainClass')) {
+    ext.mainClass = 'org.jackhuang.hmcl.Main'
+}
 
-def buildnumber = System.getenv("BUILD_NUMBER") ?: "SNAPSHOT"
-def versionroot = System.getenv("VERSION_ROOT") ?: "3.1"
-version = versionroot + '.' + buildnumber
+def buildnumber = System.getenv("TRAVIS_BUILD_NUMBER")
+if (buildnumber == null)
+    buildnumber = System.getenv("BUILD_NUMBER")
+if (buildnumber == null)
+    buildnumber = "SNAPSHOT"
+
+def versionroot = System.getenv("VERSION_ROOT")
+if (versionroot == null)
+    versionroot = "3.1"
+
+String mavenVersion = versionroot + '.' + buildnumber
+version = mavenVersion
 
 dependencies {
     compile project(":HMCLCore")
     compile rootProject.files("lib/JFoenix.jar")
 }
 
-def digest(String algorithm, byte[] bytes) {
-    return MessageDigest.getInstance(algorithm).digest(bytes)
+task generateSources(type: Sync) {
+    from 'src/main/java'
+    into "$buildDir/generated-src"
+    filter(ReplaceTokens, tokens: [
+            'HELLO_MINECRAFT_LAUNCHER_VERSION_FOR_GRADLE_REPLACING': mavenVersion
+    ])
 }
 
-def createChecksum(File file) {
-    def algorithm = "SHA-1"
-    def suffix = "sha1"
-    new File(file.parentFile, file.name + "." + suffix).text = digest(algorithm, file.bytes).encodeHex().toString() + "\n"
-}
+compileJava.setSource "$buildDir/generated-src"
+compileJava.dependsOn generateSources
 
-def attachSignature(File jar) {
-    def keyLocation = System.getenv("HMCL_SIGNATURE_KEY");
-    if (keyLocation == null)
-        return
-    def privatekey = KeyFactory.getInstance("RSA").generatePrivate(new PKCS8EncodedKeySpec(new File(keyLocation).bytes))
-
-    def signer = Signature.getInstance("SHA512withRSA")
-    signer.initSign(privatekey)
-    new ZipFile(jar).withCloseable { zip ->
-        zip.stream()
-                .sorted(Comparator.comparing { it.name })
-                .filter { it.name != "META-INF/hmcl_signature" }
-                .forEach {
-                    signer.update(digest("SHA-512", it.name.getBytes("UTF-8")))
-                    signer.update(digest("SHA-512", zip.getInputStream(it).bytes))
-                }
-    }
-    def signature = signer.sign()
-
-    FileSystems.newFileSystem(URI.create("jar:" + jar.toURI()), [:]).withCloseable { zipfs ->
-        Files.newOutputStream(zipfs.getPath("META-INF/hmcl_signature")).withCloseable { it << signature }
-    }
-}
-
-ext.packer = Pack200.newPacker()
-packer.properties()["pack.effort"] = "9"
-ext.unpacker = Pack200.newUnpacker()
-
-def repack(File file) {
-    def packed = new ByteArrayOutputStream()
-    new JarFile(file).withCloseable { packer.pack(it, packed) }
-    new JarOutputStream(file.newOutputStream()).withCloseable { unpacker.unpack(new ByteArrayInputStream(packed.toByteArray()), it) }
+configurations {
+    coreCompile.extendsFrom compile
+    coreRuntime.extendsFrom runtime
 }
 
 jar {
+    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
+
     manifest {
-        attributes 'Created-By': 'Copyright(c) 2013-2018 huangyuhui.',
-                'Main-Class': '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'))
+        attributes 'Created-By'        : 'Copyright(c) 2013-2017 huangyuhui.',
+                'Main-Class'        : mainClass,
+                'Multi-Release': "true"
     }
 
     doLast {
-        repack(jar.archivePath)
-        attachSignature(jar.archivePath)
-        createChecksum(jar.archivePath)
-    }
-}
+        new File("build/signed").mkdirs()
+        ant.signjar(signedjar: archivePath, jar: archivePath,
+                keystore: "HMCL.keystore", storepass: "123456",
+                alias: "HMCL")
 
-def createExecutable(String suffix, String header) {
-    def output = new File(jar.archivePath.parentFile, jar.archivePath.name[0..-4] + suffix)
-    output.bytes = new File(project.projectDir, header).bytes
-    output << jar.archivePath.bytes
-    createChecksum(output)
-}
-
-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 messageDigest = MessageDigest.getInstance("SHA1")
+        archivePath.eachByte 1024 * 1024, { byte[] buf, int bytesRead ->
+            messageDigest.update(buf, 0, bytesRead)
         }
-        createChecksum(outputPath)
+        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
     }
 }
 
-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)
+processResources {
+    from(sourceSets.main.resources.srcDirs) {
+        exclude 'icon.icns'
+    }
 }
 
-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 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: 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()
 
-task makeExecutables(dependsOn: jar) doLast {
-    createExecutable("exe", "src/main/resources/assets/HMCLauncher.exe")
+    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
 }
 
-build.dependsOn makePackXz
-build.dependsOn makePackGz
-build.dependsOn makeExecutables
+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

HMCL/proguard.pro

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

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

@@ -17,27 +17,30 @@
  */
 package org.jackhuang.hmcl;
 
-import static org.jackhuang.hmcl.util.Logging.LOG;
-
 import com.jfoenix.concurrency.JFXUtilities;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.stage.Stage;
-
+import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.upgrade.AppDataUpgrader;
+import org.jackhuang.hmcl.upgrade.IUpgrader;
 import org.jackhuang.hmcl.upgrade.UpdateChecker;
 import org.jackhuang.hmcl.util.*;
 
 import java.io.File;
-import java.lang.management.ManagementFactory;
+import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.nio.file.Paths;
+import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.ResourceBundle;
 import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
 
 public final class Launcher extends Application {
 
@@ -53,7 +56,12 @@ public final class Launcher extends Application {
             primaryStage.setResizable(false);
             primaryStage.setScene(Controllers.getScene());
 
-            UpdateChecker.init();
+            UPDATE_CHECKER.process(false)
+                    .then(Task.of(Schedulers.javafx(), () -> {
+                        if (UPDATE_CHECKER.isOutOfDate())
+                            Controllers.showUpdate();
+                    }))
+                    .start();
 
             primaryStage.show();
         } catch (Throwable e) {
@@ -64,25 +72,14 @@ public final class Launcher extends Application {
     public static void main(String[] args) {
         Thread.setDefaultUncaughtExceptionHandler(CRASH_REPORTER);
 
-        if (!FileUtils.makeDirectory(LOG_DIRECTORY))
-            System.out.println("Unable to create log directory " + LOG_DIRECTORY + ", log files cannot be generated.");
-
         try {
-            Logging.start(LOG_DIRECTORY);
+            Logging.start();
 
             // NetworkUtils.setUserAgentSupplier(() -> "Hello Minecraft! Launcher");
             Constants.UI_THREAD_SCHEDULER = Constants.JAVAFX_UI_THREAD_SCHEDULER;
+            UPGRADER.parseArguments(VersionNumber.asVersion(VERSION), Arrays.asList(args));
 
-            LOG.info("*** " + Metadata.TITLE + " ***");
-            LOG.info("Operating System: " + System.getProperty("os.name") + ' ' + OperatingSystem.SYSTEM_VERSION);
-            LOG.info("Java Version: " + System.getProperty("java.version") + ", " + System.getProperty("java.vendor"));
-            LOG.info("Java VM Version: " + System.getProperty("java.vm.name") + " (" + System.getProperty("java.vm.info") + "), " + System.getProperty("java.vm.vendor"));
-            LOG.info("Java Home: " + System.getProperty("java.home"));
-            LOG.info("Current Directory: " + Paths.get("").toAbsolutePath());
-            LOG.info("HMCL Directory: " + HMCL_DIRECTORY);
-            LOG.info("Memory: " + Runtime.getRuntime().maxMemory() / 1024 / 1024 + "MB");
-            ManagementFactory.getMemoryPoolMXBeans().stream().filter(bean -> bean.getName().equals("Metaspace")).findAny()
-                    .ifPresent(bean -> LOG.info("Metaspace: " + bean.getUsage().getUsed() / 1024 / 1024 + "MB"));
+            Logging.LOG.info("*** " + TITLE + " ***");
 
             launch(args);
         } catch (Throwable e) { // Fucking JavaFX will suppress the exception and will break our crash reporter.
@@ -91,7 +88,7 @@ public final class Launcher extends Application {
     }
 
     public static void stopApplication() {
-        LOG.info("Stopping application.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
+        Logging.LOG.info("Stopping application.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
 
         JFXUtilities.runInFX(() -> {
             if (Controllers.getStage() == null)
@@ -105,7 +102,7 @@ public final class Launcher extends Application {
     }
 
     public static void stopWithoutPlatform() {
-        LOG.info("Stopping application without JavaFX Toolkit.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
+        Logging.LOG.info("Stopping application without JavaFX Toolkit.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
 
         JFXUtilities.runInFX(() -> {
             if (Controllers.getStage() == null)
@@ -117,6 +114,21 @@ public final class Launcher extends Application {
         });
     }
 
+    public static File getWorkingDirectory(String folder) {
+        String home = System.getProperty("user.home", ".");
+        switch (OperatingSystem.CURRENT_OS) {
+            case LINUX:
+                return new File(home, "." + folder + "/");
+            case WINDOWS:
+                String appdata = System.getenv("APPDATA");
+                return new File(Lang.nonNull(appdata, home), "." + folder + "/");
+            case OSX:
+                return new File(home, "Library/Application Support/" + folder);
+            default:
+                return new File(home, folder + "/");
+        }
+    }
+
     public static List<File> getCurrentJarFiles() {
         List<File> result = new LinkedList<>();
         if (Launcher.class.getClassLoader() instanceof URLClassLoader) {
@@ -136,9 +148,30 @@ public final class Launcher extends Application {
             return result;
     }
 
-    public static final File MINECRAFT_DIRECTORY = OperatingSystem.getWorkingDirectory("minecraft");
-    public static final File HMCL_DIRECTORY = OperatingSystem.getWorkingDirectory("hmcl");
-    public static final File LOG_DIRECTORY = new File(Launcher.HMCL_DIRECTORY, "logs");
+    public static String i18n(String key) {
+        try {
+            return RESOURCE_BUNDLE.getString(key);
+        } catch (Exception e) {
+            Logging.LOG.log(Level.SEVERE, "Cannot find key " + key + " in resource bundle", e);
+            return key;
+        }
+    }
 
+    public static String i18n(String key, Object... formatArgs) {
+        return String.format(i18n(key), formatArgs);
+    }
+
+    public static final File MINECRAFT_DIRECTORY = getWorkingDirectory("minecraft");
+    public static final File HMCL_DIRECTORY = getWorkingDirectory("hmcl");
+
+    public static final String VERSION = "@HELLO_MINECRAFT_LAUNCHER_VERSION_FOR_GRADLE_REPLACING@";
+    public static final String NAME = "HMCL";
+    public static final String TITLE = NAME + " " + VERSION;
+    public static final ResourceBundle RESOURCE_BUNDLE = Settings.INSTANCE.getLocale().getResourceBundle();
+    public static final UpdateChecker UPDATE_CHECKER = new UpdateChecker(VersionNumber.asVersion(VERSION));
+    public static final IUpgrader UPGRADER = new AppDataUpgrader();
     public static final CrashReporter CRASH_REPORTER = new CrashReporter();
+
+    public static final String CONTACT = "http://huangyuhui.duapp.com/hmcl.php";
+    public static final String PUBLISH = "http://www.mcbbs.net/thread-142335-1-1.html";
 }

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

@@ -17,104 +17,24 @@
  */
 package org.jackhuang.hmcl;
 
-import static org.jackhuang.hmcl.util.Logging.LOG;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import org.jackhuang.hmcl.util.Logging;
 
+import javax.swing.*;
 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);
-    }
-
-    private static void checkDirectoryPath() {
         String currentDirectory = new File("").getAbsolutePath();
         if (currentDirectory.contains("!")) {
+            System.err.println("Exclamation mark(!) is not allowed in the path where HMCL is in. Forcibly exit.");
+
             // No Chinese translation because both Swing and JavaFX cannot render Chinese character properly when exclamation mark exists in the path.
-            showErrorAndExit("Exclamation mark(!) is not allowed in the path where HMCL is in.\n"
-                    + "The path is " + currentDirectory);
-        }
-    }
-
-    private static void checkJavaFX() {
-        try {
-            Class.forName("javafx.application.Application");
-        } catch (ClassNotFoundException e) {
-            showErrorAndExit(i18n("fatal.missing_javafx"));
-        }
-    }
-
-    private static void checkDSTRootCAX3() {
-        TrustManagerFactory tmf;
-        try {
-            tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-            tmf.init((KeyStore) null);
-        } catch (NoSuchAlgorithmException | KeyStoreException e) {
-            LOG.log(Level.WARNING, "Failed to init TrustManagerFactory", e);
-            // don't know what to do here
-            return;
-        }
-        for (TrustManager tm : tmf.getTrustManagers()) {
-            if (tm instanceof X509TrustManager) {
-                for (X509Certificate cert : ((X509TrustManager) tm).getAcceptedIssuers()) {
-                    if ("CN=DST Root CA X3, O=Digital Signature Trust Co.".equals((cert.getSubjectDN().getName()))) {
-                        return;
-                    }
-                }
-            }
-        }
-        showWarningAndContinue(i18n("fatal.missing_dst_root_ca_x3"));
-    }
-
-    /**
-     * Indicates that a fatal error has occurred, and that the application cannot start.
-     */
-    private static void showErrorAndExit(String message) {
-        System.err.println(message);
-        System.err.println("A fatal error has occurred, forcibly exiting.");
-        JOptionPane.showMessageDialog(null, message, "Error", JOptionPane.ERROR_MESSAGE);
-        System.exit(1);
-    }
-
-    /**
-     * Indicates that potential issues have been detected, and that the application may not function properly (but it can still run).
-     */
-    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);
+            String message = "Exclamation mark(!) is not allowed in the path where HMCL is in.\nThe path is " + currentDirectory;
+            JOptionPane.showMessageDialog(null, message, "Error", JOptionPane.ERROR_MESSAGE);
+            System.exit(1);
+        } else
+            Launcher.main(args);
     }
 
 }

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

@@ -1,35 +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;
-
-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";
-}

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

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

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

@@ -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,36 +15,39 @@
  * 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.authlibinjector;
+package org.jackhuang.hmcl.event;
 
-import java.nio.file.Path;
+import org.jackhuang.hmcl.util.ToStringBuilder;
+import org.jackhuang.hmcl.util.VersionNumber;
 
-public class AuthlibInjectorArtifactInfo {
+/**
+ *
+ * Result: Deny if do not upgrade HMCL.
+ *
+ * @author huangyuhui
+ */
+public final class OutOfDateEvent extends Event {
+    private final VersionNumber version;
 
-    private int buildNumber;
-    private String version;
-    private Path location;
-
-    public AuthlibInjectorArtifactInfo(int buildNumber, String version, Path location) {
-        this.buildNumber = buildNumber;
+    public OutOfDateEvent(Object source, VersionNumber version) {
+        super(source);
         this.version = version;
-        this.location = location;
     }
 
-    public int getBuildNumber() {
-        return buildNumber;
-    }
-
-    public String getVersion() {
+    public VersionNumber getVersion() {
         return version;
     }
 
-    public Path getLocation() {
-        return location;
+    @Override
+    public boolean hasResult() {
+        return true;
     }
 
     @Override
     public String toString() {
-        return "authlib-injector [buildNumber=" + buildNumber + ", version=" + version + "]";
+        return new ToStringBuilder(this)
+                .append("source", getSource())
+                .append("version", getVersion())
+                .toString();
     }
 }

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

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

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

@@ -22,6 +22,8 @@ import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.download.GameBuilder;
 import org.jackhuang.hmcl.setting.Profile;
 
+import java.net.Proxy;
+
 /**
  * @author huangyuhui
  */
@@ -29,7 +31,11 @@ public class HMCLDependencyManager extends DefaultDependencyManager {
     private final Profile profile;
 
     public HMCLDependencyManager(Profile profile, DownloadProvider downloadProvider) {
-        super(profile.getRepository(), downloadProvider);
+        this(profile, downloadProvider, Proxy.NO_PROXY);
+    }
+
+    public HMCLDependencyManager(Profile profile, DownloadProvider downloadProvider, Proxy proxy) {
+        super(profile.getRepository(), downloadProvider, proxy);
 
         this.profile = profile;
     }

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

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

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

@@ -17,14 +17,12 @@
  */
 package org.jackhuang.hmcl.game;
 
-import org.jackhuang.hmcl.Metadata;
+import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.auth.AuthInfo;
 import org.jackhuang.hmcl.launch.DefaultLauncher;
 import org.jackhuang.hmcl.launch.ProcessListener;
-import org.jackhuang.hmcl.util.CommandBuilder;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author huangyuhui
@@ -44,10 +42,10 @@ public final class HMCLGameLauncher extends DefaultLauncher {
     }
 
     @Override
-    protected Map<String, String> getConfigurations() {
-        Map<String, String> res = super.getConfigurations();
-        res.put("${launcher_name}", Metadata.NAME);
-        res.put("${launcher_version}", Metadata.VERSION);
-        return res;
+    protected void appendJvmArgs(List<String> result) {
+        super.appendJvmArgs(result);
+
+        result.add("-Dminecraft.launcher.version=" + Launcher.VERSION);
+        result.add("-Dminecraft.launcher.brand=" + Launcher.NAME);
     }
 }

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

@@ -27,6 +27,7 @@ import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.setting.VersionSetting;
 import org.jackhuang.hmcl.util.FileUtils;
+import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.Logging;
 
 import java.io.File;
@@ -34,8 +35,6 @@ import java.io.IOException;
 import java.util.*;
 import java.util.logging.Level;
 
-import static org.jackhuang.hmcl.setting.ConfigHolder.config;
-
 public class HMCLGameRepository extends DefaultGameRepository {
     private final Profile profile;
     private final Map<String, VersionSetting> versionSettings = new HashMap<>();
@@ -52,16 +51,17 @@ public class HMCLGameRepository extends DefaultGameRepository {
         return profile;
     }
 
-    private boolean useSelf(String assetId) {
-        return new File(getBaseDirectory(), "assets/indexes/" + assetId + ".json").exists();
+    private boolean useSelf(String version, String assetId) {
+        VersionSetting vs = profile.getVersionSetting(version);
+        return new File(getBaseDirectory(), "assets/indexes/" + assetId + ".json").exists() || vs.isNoCommon();
     }
 
     @Override
     public File getAssetDirectory(String version, String assetId) {
-        if (Settings.instance().isCommonDirectoryDisabled() || useSelf(assetId))
+        if (useSelf(version, assetId))
             return super.getAssetDirectory(version, assetId);
         else
-            return new File(Settings.instance().getCommonDirectory(), "assets");
+            return new File(Settings.INSTANCE.getCommonPath(), "assets");
     }
 
     @Override
@@ -83,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 (Settings.instance().isCommonDirectoryDisabled() || self.exists())
+        if (self.exists() || vs.isNoCommon())
             return self;
         else
-            return new File(Settings.instance().getCommonDirectory(), "libraries/" + lib.getPath());
+            return new File(Settings.INSTANCE.getCommonPath(), "libraries/" + lib.getPath());
     }
 
 

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

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

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

@@ -74,7 +74,7 @@ public final class HMCLModpackInstallTask extends Task {
             }
         } catch (JsonParseException | IOException ignore) {
         }
-        dependents.add(new ModpackInstallTask<>(zipFile, run, "/minecraft", it -> !"pack.json".equals(it), config));
+        dependents.add(new ModpackInstallTask<>(zipFile, run, "minecraft/", it -> !Objects.equals(it, "minecraft/pack.json"), 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).setId(name).setJar(null);
+        Version version = Constants.GSON.fromJson(json, Version.class).setJar(null);
         dependencies.add(new VersionJsonSaveTask(repository, version));
-        dependencies.add(new MinecraftInstanceTask<>(zipFile, "/minecraft", modpack, MODPACK_TYPE, repository.getModpackConfiguration(name)));
+        dependencies.add(new MinecraftInstanceTask<>(zipFile, "minecraft/", modpack, MODPACK_TYPE, repository.getModpackConfiguration(name)));
     }
 
     public static final String MODPACK_TYPE = "HMCL";

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

@@ -39,7 +39,7 @@ public final class HMCLModpackManager {
             "pack.json", "launcher.jar", "hmclmc.log", // HMCL
             "manifest.json", "minecraftinstance.json", ".curseclient", // Curse
             "minetweaker.log", // Mods
-            "jars", "logs", "versions", "assets", "libraries", "crash-reports", "NVIDIA", "AMD", "screenshots", "natives", "native", "$native", "server-resource-packs", // Minecraft
+            "logs", "versions", "assets", "libraries", "crash-reports", "NVIDIA", "AMD", "screenshots", "natives", "native", "$native", "server-resource-packs", // Minecraft
             "downloads", // Curse
             "asm", "backups", "TCNodeTracker", "CustomDISkins", "data" // Mods
     );

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

@@ -17,19 +17,18 @@
  */
 package org.jackhuang.hmcl.game;
 
+import com.jfoenix.concurrency.JFXUtilities;
 import javafx.application.Platform;
+import javafx.scene.layout.Region;
 import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.AuthInfo;
 import org.jackhuang.hmcl.auth.AuthenticationException;
-import org.jackhuang.hmcl.auth.CredentialExpiredException;
+import org.jackhuang.hmcl.auth.ServerDisconnectException;
 import org.jackhuang.hmcl.download.DefaultDependencyManager;
 import org.jackhuang.hmcl.download.MaintainTask;
-import org.jackhuang.hmcl.download.game.LibraryDownloadException;
 import org.jackhuang.hmcl.launch.*;
-import org.jackhuang.hmcl.mod.CurseCompletionException;
 import org.jackhuang.hmcl.mod.CurseCompletionTask;
-import org.jackhuang.hmcl.mod.ModpackConfiguration;
 import org.jackhuang.hmcl.setting.LauncherVisibility;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Settings;
@@ -38,21 +37,17 @@ import org.jackhuang.hmcl.task.*;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.DialogController;
 import org.jackhuang.hmcl.ui.LogWindow;
-import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 import org.jackhuang.hmcl.ui.construct.MessageBox;
+import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
 import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane;
 import org.jackhuang.hmcl.util.*;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
-
-import static org.jackhuang.hmcl.util.Lang.mapOf;
-import static org.jackhuang.hmcl.util.Pair.pair;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import java.util.function.Consumer;
 
 public final class LauncherHelper {
     public static final LauncherHelper INSTANCE = new LauncherHelper();
@@ -65,8 +60,6 @@ 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);
@@ -84,7 +77,7 @@ public final class LauncherHelper {
     }
 
     private void launch0(Profile profile, Account account, String selectedVersion, File scriptFile) {
-        HMCLGameRepository repository = profile.getRepository();
+        GameRepository repository = profile.getRepository();
         DefaultDependencyManager dependencyManager = profile.getDependency();
         Version version = MaintainTask.maintain(repository.getResolvedVersion(selectedVersion));
         VersionSetting setting = profile.getVersionSetting(selectedVersion);
@@ -98,49 +91,37 @@ public final class LauncherHelper {
                         return dependencyManager.checkGameCompletionAsync(version);
                 })
                 .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.MODS)))
-                .then(var -> {
-                    try {
-                        ModpackConfiguration<?> configuration = ModpackHelper.readModpackConfiguration(repository.getModpackConfiguration(selectedVersion));
-                        if ("Curse".equals(configuration.getType()))
-                            return new CurseCompletionTask(dependencyManager, selectedVersion);
-                        else
-                            return null;
-                    } catch (IOException e) {
-                        return null;
-                    }
-                })
+                .then(new CurseCompletionTask(dependencyManager, selectedVersion))
                 .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.LOGGING_IN)))
-                .then(Task.of(i18n("account.methods"), variables -> {
+                .then(Task.of(Launcher.i18n("account.methods"), variables -> {
                     try {
-                        variables.set("account", account.logIn());
-                    } catch (CredentialExpiredException e) {
-                        variables.set("account", DialogController.logIn(account));
+                        try {
+                            variables.set("account", account.logIn());
+                        } catch (ServerDisconnectException e) {
+                            if (account.canPlayOffline())
+                                variables.set("account", account.playOffline());
+                            else
+                                throw e;
+                        }
                     } catch (AuthenticationException e) {
-                        variables.set("account",
-                                account.playOffline().orElseThrow(() -> e));
+                        variables.set("account", DialogController.logIn(account));
                     }
                 }))
                 .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.LAUNCHING)))
                 .then(Task.of(variables -> {
                     variables.set("launcher", new HMCLGameLauncher(
-                            repository,
-                            selectedVersion,
-                            variables.get("account"),
-                            setting.toLaunchOptions(profile.getGameDir()),
-                            setting.getLauncherVisibility() == LauncherVisibility.CLOSE
-                                    ? null // Unnecessary to start listening to game process output when close launcher immediately after game launched.
-                                    : new HMCLProcessListener(variables.get("account"), setting, gameVersion.isPresent())
+                            repository, selectedVersion, variables.get("account"), setting.toLaunchOptions(profile.getGameDir()), new HMCLProcessListener(variables.get("account"), setting, gameVersion.isPresent())
                     ));
                 }))
                 .then(variables -> {
                     DefaultLauncher launcher = variables.get("launcher");
                     if (scriptFile == null) {
-                        return new LaunchTask<>(launcher::launch).setName(i18n("version.launch"));
+                        return new LaunchTask<>(launcher::launch).setName(Launcher.i18n("version.launch"));
                     } else {
                         return new LaunchTask<>(() -> {
                             launcher.makeLaunchScript(scriptFile);
                             return null;
-                        }).setName(i18n("version.launch_script"));
+                        }).setName(Launcher.i18n("version.launch_script"));
                     }
                 })
                 .then(Task.of(variables -> {
@@ -152,12 +133,12 @@ public final class LauncherHelper {
                         else
                             launchingStepsPane.setCancel(it -> {
                                 process.stop();
-                                it.fireEvent(new DialogCloseEvent());
+                                Controllers.closeDialog(it);
                             });
                     } else
                         Platform.runLater(() -> {
-                            launchingStepsPane.fireEvent(new DialogCloseEvent());
-                            Controllers.dialog(i18n("version.launch_script.success", scriptFile.getAbsolutePath()));
+                            Controllers.closeDialog(launchingStepsPane);
+                            Controllers.dialog(Launcher.i18n("version.launch_script.success", scriptFile.getAbsolutePath()));
                         });
 
                 }))
@@ -176,33 +157,13 @@ public final class LauncherHelper {
 
             @Override
             public void onStop(boolean success, TaskExecutor executor) {
-                if (!success && !Controllers.isStopped()) {
+                if (!success) {
                     Platform.runLater(() -> {
-                        // Check if the application has stopped
-                        // because onStop will be invoked if tasks fail when the executor service shut down.
-                        if (!Controllers.isStopped()) {
-                            launchingStepsPane.fireEvent(new DialogCloseEvent());
-                            Exception ex = executor.getLastException();
-                            if (ex != null) {
-                                String message;
-                                if (ex instanceof CurseCompletionException) {
-                                    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);
-                            }
-                        }
+                        Controllers.closeDialog(launchingStepsPane);
+                        if (executor.getLastException() != null)
+                            Controllers.dialog(I18nException.getStackTrace(executor.getLastException()),
+                                    scriptFile == null ? Launcher.i18n("launch.failed") : Launcher.i18n("version.launch_script.failed"),
+                                    MessageBox.ERROR_MESSAGE);
                     });
                 }
                 launchingStepsPane.setExecutor(null);
@@ -215,80 +176,37 @@ public final class LauncherHelper {
     private static void checkGameState(Profile profile, VersionSetting setting, Version version, Runnable onAccept) throws InterruptedException {
         boolean flag = false;
 
-        // Without onAccept called, the launching operation will be terminated.
-
         VersionNumber gameVersion = VersionNumber.asVersion(GameVersion.minecraftVersion(profile.getRepository().getVersionJar(version)).orElse("Unknown"));
         JavaVersion java = setting.getJavaVersion();
         if (java == null) {
-            Controllers.dialog(i18n("launch.wrong_javadir"), i18n("message.warning"), MessageBox.WARNING_MESSAGE, onAccept);
+            Controllers.dialog(Launcher.i18n("launch.wrong_javadir"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
             setting.setJava(null);
-            setting.setDefaultJavaPath(null);
             java = JavaVersion.fromCurrentEnvironment();
             flag = true;
         }
 
-        // Game later than 1.7.2 accepts Java 8.
-        if (!flag && java.getParsedVersion() < JavaVersion.JAVA_8 && gameVersion.compareTo(VersionNumber.asVersion("1.7.2")) > 0) {
-            Optional<JavaVersion> java8 = JavaVersion.getJREs().stream()
-                    .filter(javaVersion -> javaVersion.getParsedVersion() >= JavaVersion.JAVA_8)
-                    .max(Comparator.comparing(JavaVersion::getVersionNumber));
-            if (java8.isPresent()) {
-                setting.setJavaVersion(java8.get());
-            } else {
-                if (gameVersion.compareTo(VersionNumber.asVersion("1.13")) >= 0) {
-                    // Minecraft 1.13 and later versions only support Java 8 or later.
-                    // Terminate launching operation.
-                    Controllers.dialog(i18n("launch.advice.java8_1_13"), i18n("message.error"), MessageBox.ERROR_MESSAGE, null);
-                } else {
-                    // Most mods require Java 8 or later version.
-                    Controllers.dialog(i18n("launch.advice.newer_java"), i18n("message.warning"), MessageBox.WARNING_MESSAGE, onAccept);
-                }
-                flag = true;
-            }
+        if (!flag && java.getParsedVersion() < JavaVersion.JAVA_8) {
+            Controllers.dialog(Launcher.i18n("launch.advice.newer_java"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
+            flag = true;
         }
 
-        // LaunchWrapper 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.13")) < 0 && version.getMainClass().contains("launchwrapper")) {
-            Optional<JavaVersion> java8 = JavaVersion.getJREs().stream().filter(javaVersion -> javaVersion.getParsedVersion() == JavaVersion.JAVA_8).findAny();
-            if (java8.isPresent()) {
-                setting.setJavaVersion(java8.get());
-            } else {
-                Controllers.dialog(i18n("launch.advice.java9"), i18n("message.error"), MessageBox.ERROR_MESSAGE, null);
-                flag = true;
-            }
-        }
-
-        // Minecraft 1.13 may crash when generating world on Java 8 earlier than 1.8.0_51
-        VersionNumber JAVA_8 = VersionNumber.asVersion("1.8.0.51");
-        if (!flag && gameVersion.compareTo(VersionNumber.asVersion("1.13")) >= 0 && java.getParsedVersion() == JavaVersion.JAVA_8 && java.getVersionNumber().compareTo(JAVA_8) < 0) {
-            Optional<JavaVersion> java8 = JavaVersion.getJREs().stream()
-                    .filter(javaVersion -> javaVersion.getVersionNumber().compareTo(JAVA_8) >= 0)
-                    .max(Comparator.comparing(JavaVersion::getVersionNumber));
-            if (java8.isPresent()) {
-                setting.setJavaVersion(java8.get());
-            } else {
-                Controllers.dialog(i18n("launch.advice.java8_51_1_13"), i18n("message.warning"), MessageBox.WARNING_MESSAGE, onAccept);
-                flag = true;
-            }
+        if (!flag && java.getParsedVersion() >= JavaVersion.JAVA_9 && gameVersion.compareTo(VersionNumber.asVersion("1.12.5")) < 0 && version.getMainClass().contains("launchwrapper")) {
+            Controllers.dialog(Launcher.i18n("launch.advice.java9"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE, null);
+            flag = true;
         }
 
         if (!flag && java.getPlatform() == org.jackhuang.hmcl.util.Platform.BIT_32 &&
                 org.jackhuang.hmcl.util.Platform.IS_64_BIT) {
-            Controllers.dialog(i18n("launch.advice.different_platform"), i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
+            Controllers.dialog(Launcher.i18n("launch.advice.different_platform"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
             flag = true;
         }
-
         if (!flag && java.getPlatform() == org.jackhuang.hmcl.util.Platform.BIT_32 &&
                 setting.getMaxMemory() > 1.5 * 1024) {
-            // 1.5 * 1024 is an inaccurate number.
-            // Actual memory limit depends on operating system and memory.
-            Controllers.dialog(i18n("launch.advice.too_large_memory_for_32bit"), i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
+            Controllers.dialog(Launcher.i18n("launch.advice.too_large_memory_for_32bit"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
             flag = true;
         }
-        
         if (!flag && OperatingSystem.TOTAL_MEMORY > 0 && OperatingSystem.TOTAL_MEMORY < setting.getMaxMemory()) {
-            Controllers.dialog(i18n("launch.advice.not_enough_space", OperatingSystem.TOTAL_MEMORY), i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
+            Controllers.dialog(Launcher.i18n("launch.advice.not_enough_space", OperatingSystem.TOTAL_MEMORY), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
             flag = true;
         }
 
@@ -302,9 +220,8 @@ public final class LauncherHelper {
     }
 
     public void emitStatus(LoadingState state) {
-        if (state == LoadingState.DONE) {
-            launchingStepsPane.fireEvent(new DialogCloseEvent());
-        }
+        if (state == LoadingState.DONE)
+            Controllers.closeDialog(launchingStepsPane);
 
         launchingStepsPane.setTitle(state.getLocalizedMessage());
         launchingStepsPane.setSubtitle((state.ordinal() + 1) + " / " + LoadingState.values().length);
@@ -340,7 +257,15 @@ public final class LauncherHelper {
 
         @Override
         public void execute() throws Exception {
-            setResult(supplier.get());
+            try {
+                setResult(supplier.get());
+            } catch (PermissionException e) {
+                throw new I18nException(Launcher.i18n("launch.failed.executable_permission"), e);
+            } catch (ProcessCreationException e) {
+                throw new I18nException(Launcher.i18n("launch.failed.creating_process") + e.getLocalizedMessage(), e);
+            } catch (NotDecompressingNativesException e) {
+                throw new I18nException(Launcher.i18n("launch.failed.decompressing_natives") + e.getLocalizedMessage(), e);
+            }
         }
 
         @Override
@@ -375,10 +300,10 @@ public final class LauncherHelper {
             if (authInfo == null)
                 forbiddenTokens = Collections.emptyMap();
             else
-                forbiddenTokens = mapOf(
-                        pair(authInfo.getAccessToken(), "<access token>"),
-                        pair(UUIDTypeAdapter.fromUUID(authInfo.getUUID()), "<uuid>"),
-                        pair(authInfo.getUsername(), "<player>")
+                forbiddenTokens = Lang.mapOf(
+                        new Pair<>(authInfo.getAccessToken(), "<access token>"),
+                        new Pair<>(authInfo.getUserId(), "<uuid>"),
+                        new Pair<>(authInfo.getUsername(), "<player>")
                 );
 
             visibility = setting.getLauncherVisibility();
@@ -408,23 +333,20 @@ public final class LauncherHelper {
             else
                 System.out.print(log);
 
-            logs.add(pair(log, level));
-            if (logs.size() > Settings.instance().getLogLines())
+            logs.add(new Pair<>(log, level));
+            if (logs.size() > Settings.INSTANCE.getLogLines())
                 logs.removeFirst();
 
             if (setting.isShowLogs()) {
-                try {
+                Lang.invoke(() -> {
                     latch.await();
                     logWindow.waitForLoaded();
-                } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                    return;
-                }
+                });
 
                 Platform.runLater(() -> logWindow.logLine(log, level));
             }
 
-            if (!lwjgl && (log.contains("LWJGL Version: ") || !detectWindow)) {
+            if (!lwjgl && log.contains("LWJGL Version: ") || !detectWindow) {
                 lwjgl = true;
                 switch (visibility) {
                     case HIDE_AND_REOPEN:
@@ -462,16 +384,16 @@ public final class LauncherHelper {
 
                     switch (exitType) {
                         case JVM_ERROR:
-                            logWindow.setTitle(i18n("launch.failed.cannot_create_jvm"));
+                            logWindow.setTitle(Launcher.i18n("launch.failed.cannot_create_jvm"));
                             break;
                         case APPLICATION_ERROR:
-                            logWindow.setTitle(i18n("launch.failed.exited_abnormally"));
+                            logWindow.setTitle(Launcher.i18n("launch.failed.exited_abnormally"));
                             break;
                     }
 
                     logWindow.show();
                     logWindow.onDone.register(() -> {
-                        logWindow.logLine("Command: " + new CommandBuilder().addAll(process.getCommands()).toString(), Log4jLevel.INFO);
+                        logWindow.logLine("Commands: " + StringUtils.makeCommand(process.getCommands()), Log4jLevel.INFO);
                         for (Map.Entry<String, Log4jLevel> entry : logs)
                             logWindow.logLine(entry.getKey(), entry.getValue());
                     });

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

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

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

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

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

@@ -1,7 +1,7 @@
 /*
  * Hello Minecraft! Launcher.
  * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- *
+ * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -22,34 +22,23 @@ import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.AccountFactory;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccountFactory;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDownloader;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorBuildInfo;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServerResponse;
 import org.jackhuang.hmcl.auth.offline.OfflineAccount;
 import org.jackhuang.hmcl.auth.offline.OfflineAccountFactory;
 import org.jackhuang.hmcl.auth.yggdrasil.MojangYggdrasilProvider;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccountFactory;
+import org.jackhuang.hmcl.task.FileDownloadTask;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.task.TaskResult;
+import org.jackhuang.hmcl.util.*;
 
-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.File;
 import java.io.IOException;
+import java.net.URL;
+import java.util.HashMap;
 import java.util.Map;
-import java.util.Optional;
-import java.util.logging.Level;
-
-import static java.util.stream.Collectors.toList;
-import static javafx.collections.FXCollections.observableArrayList;
-import static org.jackhuang.hmcl.setting.ConfigHolder.config;
-import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
-import static org.jackhuang.hmcl.util.Lang.mapOf;
-import static org.jackhuang.hmcl.util.Logging.LOG;
-import static org.jackhuang.hmcl.util.Pair.pair;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 /**
  * @author huangyuhui
@@ -57,206 +46,60 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 public final class Accounts {
     private Accounts() {}
 
-    public static final OfflineAccountFactory FACTORY_OFFLINE = OfflineAccountFactory.INSTANCE;
-    public static final YggdrasilAccountFactory FACTORY_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 String OFFLINE_ACCOUNT_KEY = "offline";
+    public static final String YGGDRASIL_ACCOUNT_KEY = "yggdrasil";
+    public static final String AUTHLIB_INJECTOR_ACCOUNT_KEY = "authlibInjector";
 
-    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 final Map<String, AccountFactory<?>> ACCOUNT_FACTORY = Lang.mapOf(
+            new Pair<>(OFFLINE_ACCOUNT_KEY, OfflineAccountFactory.INSTANCE),
+            new Pair<>(YGGDRASIL_ACCOUNT_KEY, new YggdrasilAccountFactory(MojangYggdrasilProvider.INSTANCE)),
+            new Pair<>(AUTHLIB_INJECTOR_ACCOUNT_KEY, new AuthlibInjectorAccountFactory(Accounts::downloadAuthlibInjector))
+    );
 
-    private static 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 final Map<String, String> AUTHLIB_INJECTOR_SERVER_NAMES = new HashMap<>();
 
-    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);
+    public static String getAccountType(Account account) {
+        if (account instanceof OfflineAccount) return OFFLINE_ACCOUNT_KEY;
+        else if (account instanceof AuthlibInjectorAccount) return AUTHLIB_INJECTOR_ACCOUNT_KEY;
+        else if (account instanceof YggdrasilAccount) return YGGDRASIL_ACCOUNT_KEY;
+        else return YGGDRASIL_ACCOUNT_KEY;
     }
 
-    public static AccountFactory<?> getAccountFactory(Account account) {
-        return type2factory.get(accountType(account));
+    static String getAccountId(Account account) {
+        return getAccountId(account.getUsername(), account.getCharacter());
     }
 
-    static String accountId(Account account) {
-        return account.getUsername() + ":" + account.getCharacter();
+    static String getAccountId(String username, String character) {
+        return username + ":" + character;
     }
 
-    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));
+    private static String downloadAuthlibInjector() throws Exception {
+        AuthlibInjectorBuildInfo buildInfo = AuthlibInjectorBuildInfo.requestBuildInfo();
+        File jar = new File(Launcher.HMCL_DIRECTORY, "authlib-injector.jar");
+        File local = new File(Launcher.HMCL_DIRECTORY, "authlib-injector.txt");
+        int buildNumber = 0;
+        try {
+            buildNumber = Integer.parseInt(FileUtils.readText(local));
+        } catch (IOException | NumberFormatException ignore) {
         }
-
-        @Override
-        protected void invalidated() {
-            // this methods first checks whether the current selection is valid
-            // if it's valid, the underlying storage will be updated
-            // otherwise, the first account will be selected as an alternative(or null if accounts is empty)
-            Account selected = get();
-            if (accounts.isEmpty()) {
-                if (selected == null) {
-                    // valid
-                } else {
-                    // the previously selected account is gone, we can only set it to null here
-                    set(null);
-                    return;
-                }
-            } else {
-                if (accounts.contains(selected)) {
-                    // valid
-                } else {
-                    // the previously selected account is gone
-                    set(accounts.get(0));
-                    return;
-                }
-            }
-            // selection is valid, store it
-            if (!initialized)
-                return;
-            config().setSelectedAccount(selected == null ? "" : accountId(selected));
+        if (buildNumber < buildInfo.getBuildNumber()) {
+            new FileDownloadTask(new URL(buildInfo.getUrl()), jar).run();
+            FileUtils.writeText(local, String.valueOf(buildInfo.getBuildNumber()));
         }
-    };
-
-    /**
-     * True if {@link #init()} hasn't been called.
-     */
-    private static boolean initialized = false;
-
-    static {
-        accounts.addListener(onInvalidating(Accounts::updateAccountStorages));
+        return jar.getAbsolutePath();
     }
 
-    static Map<Object, Object> getAccountStorage(Account account) {
-        Map<Object, Object> storage = account.toStorage();
-        storage.put("type", accountType(account));
-        return storage;
+    public static String getAuthlibInjectorServerName(String serverIp) throws Exception {
+        if (AUTHLIB_INJECTOR_SERVER_NAMES.containsKey(serverIp))
+            return AUTHLIB_INJECTOR_SERVER_NAMES.get(serverIp);
+        else {
+            AuthlibInjectorServerResponse response = Constants.GSON.fromJson(NetworkUtils.doGet(NetworkUtils.toURL(serverIp)), AuthlibInjectorServerResponse.class);
+            AUTHLIB_INJECTOR_SERVER_NAMES.put(serverIp, response.getMeta().getServerName());
+            return response.getMeta().getServerName();
+        }
     }
 
-    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()));
+    public static TaskResult<String> getAuthlibInjectorServerNameAsync(AuthlibInjectorAccount account) {
+        return Task.ofResult("serverName", () -> Accounts.getAuthlibInjectorServerName(account.getServerBaseURL()));
     }
-
-    /**
-     * 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 config().getAuthlibInjectorServers().stream()
-                .filter(server -> url.equals(server.getUrl()))
-                .findFirst()
-                .orElseGet(() -> {
-                    // this usually happens when migrating data from an older version
-                    AuthlibInjectorServer server;
-                    try {
-                        server = AuthlibInjectorServer.fetchServerInfo(url);
-                        LOG.info("Migrated authlib injector server " + server);
-                    } catch (IOException e) {
-                        server = new AuthlibInjectorServer(url, url);
-                        LOG.log(Level.WARNING, "Failed to migrate authlib injector server " + url, e);
-                    }
-
-                    config().getAuthlibInjectorServers().add(server);
-                    return server;
-                });
-    }
-
-    /**
-     * After an {@link AuthlibInjectorServer} is removed, the associated accounts should also be removed.
-     * This method performs a check and removes the dangling accounts.
-     */
-    private static void removeDanglingAuthlibInjectorAccounts() {
-        accounts.stream()
-                .filter(AuthlibInjectorAccount.class::isInstance)
-                .map(AuthlibInjectorAccount.class::cast)
-                .filter(it -> !config().getAuthlibInjectorServers().contains(it.getServer()))
-                .collect(toList())
-                .forEach(accounts::remove);
-    }
-    // ====
-
-    // ==== Login type name i18n ===
-    private static Map<AccountFactory<?>, String> loginType2name = mapOf(
-            pair(Accounts.FACTORY_OFFLINE, i18n("account.methods.offline")),
-            pair(Accounts.FACTORY_YGGDRASIL, i18n("account.methods.yggdrasil")),
-            pair(Accounts.FACTORY_AUTHLIB_INJECTOR, i18n("account.methods.authlib_injector")));
-
-    public static String getAccountTypeName(AccountFactory<?> factory) {
-        return Optional.ofNullable(loginType2name.get(factory))
-                .orElseThrow(() -> new IllegalArgumentException("No corresponding login type name"));
-    }
-
-    public static String getAccountTypeName(Account account) {
-        return getAccountTypeName(getAccountFactory(account));
-    }
-    // ====
 }

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

@@ -17,437 +17,257 @@
  */
 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.upgrade.UpdateChannel;
-import org.jackhuang.hmcl.util.EnumOrdinalDeserializer;
-import org.jackhuang.hmcl.util.FileTypeAdapter;
-import org.jackhuang.hmcl.util.ObservableHelper;
-import org.jackhuang.hmcl.util.i18n.Locales;
-import org.jackhuang.hmcl.util.i18n.Locales.SupportedLocale;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonParseException;
 import com.google.gson.annotations.SerializedName;
+import org.jackhuang.hmcl.Launcher;
+import org.jackhuang.hmcl.util.JavaVersion;
 
-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;
+import java.util.*;
 
-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;
-    }
+public final class Config implements Cloneable {
 
     @SerializedName("last")
-    private StringProperty selectedProfile = new SimpleStringProperty("");
+    private String selectedProfile = "";
 
     @SerializedName("backgroundType")
-    private ObjectProperty<EnumBackgroundImage> backgroundImageType = new SimpleObjectProperty<>(EnumBackgroundImage.DEFAULT);
+    private int backgroundImageType = 0;
 
     @SerializedName("bgpath")
-    private StringProperty backgroundImage = new SimpleStringProperty();
-
-    @SerializedName("commonDirType")
-    private ObjectProperty<EnumCommonDirectory> commonDirType = new SimpleObjectProperty<>(EnumCommonDirectory.DEFAULT);
+    private String backgroundImage = null;
 
     @SerializedName("commonpath")
-    private StringProperty commonDirectory = new SimpleStringProperty(Launcher.MINECRAFT_DIRECTORY.getAbsolutePath());
+    private String commonDirectory = Launcher.MINECRAFT_DIRECTORY.getAbsolutePath();
 
     @SerializedName("hasProxy")
-    private BooleanProperty hasProxy = new SimpleBooleanProperty();
+    private boolean hasProxy = false;
 
     @SerializedName("hasProxyAuth")
-    private BooleanProperty hasProxyAuth = new SimpleBooleanProperty();
+    private boolean hasProxyAuth = false;
 
     @SerializedName("proxyType")
-    private ObjectProperty<Proxy.Type> proxyType = new SimpleObjectProperty<>(Proxy.Type.DIRECT);
+    private int proxyType = 0;
 
     @SerializedName("proxyHost")
-    private StringProperty proxyHost = new SimpleStringProperty();
+    private String proxyHost = null;
 
     @SerializedName("proxyPort")
-    private StringProperty proxyPort = new SimpleStringProperty();
+    private String proxyPort = null;
 
     @SerializedName("proxyUserName")
-    private StringProperty proxyUser = new SimpleStringProperty();
+    private String proxyUser = null;
 
     @SerializedName("proxyPassword")
-    private StringProperty proxyPass = new SimpleStringProperty();
+    private String proxyPass = null;
 
     @SerializedName("theme")
-    private ObjectProperty<Theme> theme = new SimpleObjectProperty<>(Theme.BLUE);
+    private String theme = null;
+
+    @SerializedName("java")
+    private List<JavaVersion> java = null;
 
     @SerializedName("localization")
-    private ObjectProperty<SupportedLocale> localization = new SimpleObjectProperty<>(Locales.DEFAULT);
+    private String localization;
 
     @SerializedName("downloadtype")
-    private IntegerProperty downloadType = new SimpleIntegerProperty(1);
+    private int downloadType = 0;
 
     @SerializedName("configurations")
-    private ObservableMap<String, Profile> configurations = FXCollections.observableMap(new TreeMap<>());
+    private Map<String, Profile> configurations = new TreeMap<>();
 
     @SerializedName("accounts")
-    private ObservableList<Map<Object, Object>> accountStorages = FXCollections.observableArrayList();
+    private List<Map<Object, Object>> accounts = new LinkedList<>();
 
     @SerializedName("selectedAccount")
-    private StringProperty selectedAccount = new SimpleStringProperty("");
+    private String selectedAccount = "";
 
     @SerializedName("fontFamily")
-    private StringProperty fontFamily = new SimpleStringProperty("Consolas");
+    private String fontFamily = "Consolas";
 
     @SerializedName("fontSize")
-    private DoubleProperty fontSize = new SimpleDoubleProperty(12);
+    private double fontSize = 12;
 
     @SerializedName("logLines")
-    private IntegerProperty logLines = new SimpleIntegerProperty(100);
+    private int logLines = 100;
 
-    @SerializedName("authlibInjectorServers")
-    private ObservableList<AuthlibInjectorServer> authlibInjectorServers = FXCollections.observableArrayList();
+    @SerializedName("authlibInjectorServerURLs")
+    private Set<String> authlibInjectorServerURLs = new HashSet<>();
 
-    @SerializedName("updateChannel")
-    private ObjectProperty<UpdateChannel> updateChannel = new SimpleObjectProperty<>(UpdateChannel.STABLE);
-
-    @SerializedName("_version")
-    private IntegerProperty configVersion = new SimpleIntegerProperty(0);
-
-    private transient ObservableHelper helper = new ObservableHelper(this);
-
-    public Config() {
-        addListenerToProperties();
-    }
-
-    private void addListenerToProperties() {
-        Stream.of(getClass().getDeclaredFields())
-                .filter(it -> {
-                    int modifiers = it.getModifiers();
-                    return !Modifier.isTransient(modifiers) && !Modifier.isStatic(modifiers);
-                })
-                .filter(it -> Observable.class.isAssignableFrom(it.getType()))
-                .map(it -> {
-                    try {
-                        return (Observable) it.get(this);
-                    } catch (IllegalAccessException e) {
-                        throw new IllegalStateException("Failed to get my own properties");
-                    }
-                })
-                .forEach(helper::receiveUpdatesFrom);
-    }
-
-    @Override
-    public void addListener(InvalidationListener listener) {
-        helper.addListener(listener);
-    }
-
-    @Override
-    public void removeListener(InvalidationListener listener) {
-        helper.removeListener(listener);
-    }
-
-    public String toJson() {
-        return CONFIG_GSON.toJson(this);
-    }
-
-    @Override
-    public Config clone() {
-        return fromJson(this.toJson());
-    }
-
-    // Getters & Setters & Properties
     public String getSelectedProfile() {
-        return selectedProfile.get();
-    }
-
-    public void setSelectedProfile(String selectedProfile) {
-        this.selectedProfile.set(selectedProfile);
-    }
-
-    public StringProperty selectedProfileProperty() {
         return selectedProfile;
     }
 
-    public EnumBackgroundImage getBackgroundImageType() {
-        return backgroundImageType.get();
-    }
-
-    public void setBackgroundImageType(EnumBackgroundImage backgroundImageType) {
-        this.backgroundImageType.set(backgroundImageType);
-    }
-
-    public ObjectProperty<EnumBackgroundImage> backgroundImageTypeProperty() {
-        return backgroundImageType;
+    public void setSelectedProfile(String selectedProfile) {
+        this.selectedProfile = selectedProfile;
     }
 
     public String getBackgroundImage() {
-        return backgroundImage.get();
-    }
-
-    public void setBackgroundImage(String backgroundImage) {
-        this.backgroundImage.set(backgroundImage);
-    }
-
-    public StringProperty backgroundImageProperty() {
         return backgroundImage;
     }
 
-    public EnumCommonDirectory getCommonDirType() {
-        return commonDirType.get();
+    public void setBackgroundImage(String backgroundImage) {
+        this.backgroundImage = backgroundImage;
     }
 
-    public ObjectProperty<EnumCommonDirectory> commonDirTypeProperty() {
-        return commonDirType;
+    public int getBackgroundImageType() {
+        return backgroundImageType;
     }
 
-    public void setCommonDirType(EnumCommonDirectory commonDirType) {
-        this.commonDirType.set(commonDirType);
+    public void setBackgroundImageType(int backgroundImageType) {
+        this.backgroundImageType = backgroundImageType;
     }
 
     public String getCommonDirectory() {
-        return commonDirectory.get();
-    }
-
-    public void setCommonDirectory(String commonDirectory) {
-        this.commonDirectory.set(commonDirectory);
-    }
-
-    public StringProperty commonDirectoryProperty() {
         return commonDirectory;
     }
 
-    public boolean hasProxy() {
-        return hasProxy.get();
+    public void setCommonDirectory(String commonDirectory) {
+        this.commonDirectory = commonDirectory;
     }
 
-    public void setHasProxy(boolean hasProxy) {
-        this.hasProxy.set(hasProxy);
-    }
-
-    public BooleanProperty hasProxyProperty() {
+    public boolean isHasProxy() {
         return hasProxy;
     }
 
-    public boolean hasProxyAuth() {
-        return hasProxyAuth.get();
+    public void setHasProxy(boolean hasProxy) {
+        this.hasProxy = hasProxy;
     }
 
-    public void setHasProxyAuth(boolean hasProxyAuth) {
-        this.hasProxyAuth.set(hasProxyAuth);
-    }
-
-    public BooleanProperty hasProxyAuthProperty() {
+    public boolean isHasProxyAuth() {
         return hasProxyAuth;
     }
 
-    public Proxy.Type getProxyType() {
-        return proxyType.get();
+    public void setHasProxyAuth(boolean hasProxyAuth) {
+        this.hasProxyAuth = hasProxyAuth;
     }
 
-    public void setProxyType(Proxy.Type proxyType) {
-        this.proxyType.set(proxyType);
-    }
-
-    public ObjectProperty<Proxy.Type> proxyTypeProperty() {
+    public int getProxyType() {
         return proxyType;
     }
 
+    public void setProxyType(int proxyType) {
+        this.proxyType = proxyType;
+    }
+
     public String getProxyHost() {
-        return proxyHost.get();
-    }
-
-    public void setProxyHost(String proxyHost) {
-        this.proxyHost.set(proxyHost);
-    }
-
-    public StringProperty proxyHostProperty() {
         return proxyHost;
     }
 
+    public void setProxyHost(String proxyHost) {
+        this.proxyHost = proxyHost;
+    }
+
     public String getProxyPort() {
-        return proxyPort.get();
-    }
-
-    public void setProxyPort(String proxyPort) {
-        this.proxyPort.set(proxyPort);
-    }
-
-    public StringProperty proxyPortProperty() {
         return proxyPort;
     }
 
+    public void setProxyPort(String proxyPort) {
+        this.proxyPort = proxyPort;
+    }
+
     public String getProxyUser() {
-        return proxyUser.get();
-    }
-
-    public void setProxyUser(String proxyUser) {
-        this.proxyUser.set(proxyUser);
-    }
-
-    public StringProperty proxyUserProperty() {
         return proxyUser;
     }
 
+    public void setProxyUser(String proxyUser) {
+        this.proxyUser = proxyUser;
+    }
+
     public String getProxyPass() {
-        return proxyPass.get();
-    }
-
-    public void setProxyPass(String proxyPass) {
-        this.proxyPass.set(proxyPass);
-    }
-
-    public StringProperty proxyPassProperty() {
         return proxyPass;
     }
 
-    public Theme getTheme() {
-        return theme.get();
+    public void setProxyPass(String proxyPass) {
+        this.proxyPass = proxyPass;
     }
 
-    public void setTheme(Theme theme) {
-        this.theme.set(theme);
-    }
-
-    public ObjectProperty<Theme> themeProperty() {
+    public String getTheme() {
         return theme;
     }
 
-    public SupportedLocale getLocalization() {
-        return localization.get();
+    public void setTheme(String theme) {
+        this.theme = theme;
     }
 
-    public void setLocalization(SupportedLocale localization) {
-        this.localization.set(localization);
+    public List<JavaVersion> getJava() {
+        return java;
     }
 
-    public ObjectProperty<SupportedLocale> localizationProperty() {
+    public void setJava(List<JavaVersion> java) {
+        this.java = java;
+    }
+
+    public String getLocalization() {
         return localization;
     }
 
+    public void setLocalization(String localization) {
+        this.localization = 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() {
+    public void setDownloadType(int downloadType) {
+        this.downloadType = downloadType;
+    }
+
+    public Map<String, Profile> getConfigurations() {
         return configurations;
     }
 
-    public ObservableList<Map<Object, Object>> getAccountStorages() {
-        return accountStorages;
+    public void setConfigurations(Map<String, Profile> configurations) {
+        this.configurations = configurations;
+    }
+
+    public List<Map<Object, Object>> getAccounts() {
+        return accounts;
+    }
+
+    public void setAccounts(List<Map<Object, Object>> accounts) {
+        this.accounts = accounts;
     }
 
     public String getSelectedAccount() {
-        return selectedAccount.get();
-    }
-
-    public void setSelectedAccount(String selectedAccount) {
-        this.selectedAccount.set(selectedAccount);
-    }
-
-    public StringProperty selectedAccountProperty() {
         return selectedAccount;
     }
 
+    public void setSelectedAccount(String selectedAccount) {
+        this.selectedAccount = selectedAccount;
+    }
+
     public String getFontFamily() {
-        return fontFamily.get();
-    }
-
-    public void setFontFamily(String fontFamily) {
-        this.fontFamily.set(fontFamily);
-    }
-
-    public StringProperty fontFamilyProperty() {
         return fontFamily;
     }
 
+    public void setFontFamily(String fontFamily) {
+        this.fontFamily = fontFamily;
+    }
+
     public double getFontSize() {
-        return fontSize.get();
-    }
-
-    public void setFontSize(double fontSize) {
-        this.fontSize.set(fontSize);
-    }
-
-    public DoubleProperty fontSizeProperty() {
         return fontSize;
     }
 
+    public void setFontSize(double fontSize) {
+        this.fontSize = fontSize;
+    }
+
     public int getLogLines() {
-        return logLines.get();
-    }
-
-    public void setLogLines(int logLines) {
-        this.logLines.set(logLines);
-    }
-
-    public IntegerProperty logLinesProperty() {
         return logLines;
     }
 
-    public ObservableList<AuthlibInjectorServer> getAuthlibInjectorServers() {
-        return authlibInjectorServers;
+    public void setLogLines(int logLines) {
+        this.logLines = logLines;
     }
 
-    public UpdateChannel getUpdateChannel() {
-        return updateChannel.get();
+    public Set<String> getAuthlibInjectorServerURLs() {
+        return authlibInjectorServerURLs;
     }
 
-    public ObjectProperty<UpdateChannel> updateChannelProperty() {
-        return updateChannel;
+    public void setAuthlibInjectorServerURLs(Set<String> authlibInjectorServerURLs) {
+        this.authlibInjectorServerURLs = authlibInjectorServerURLs;
     }
 
-    public void setUpdateChannel(UpdateChannel updateChannel) {
-        this.updateChannel.set(updateChannel);
+    public Config clone() {
+        return Settings.GSON.fromJson(Settings.GSON.toJson(this), Config.class);
     }
 }

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
 /*
  * Hello Minecraft! Launcher.
  * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- *
+ * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -15,14 +15,11 @@
  * 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;
+package org.jackhuang.hmcl.setting;
 
+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;
@@ -56,7 +53,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, ZH);
+    public static final List<SupportedLocale> LOCALES = Lang.immutableListOf(DEFAULT, EN, ZH_CN);
 
     public static SupportedLocale getLocale(int index) {
         return Lang.get(LOCALES, index).orElse(DEFAULT);
@@ -111,17 +108,5 @@ public final class Locales {
             if (name == null) return resourceBundle.getString("lang");
             else return newResourceBundle.getString(name);
         }
-
-        public static class TypeAdapter extends com.google.gson.TypeAdapter<SupportedLocale> {
-            @Override
-            public void write(JsonWriter out, SupportedLocale value) throws IOException {
-                out.value(getNameByLocale(value));
-            }
-
-            @Override
-            public SupportedLocale read(JsonReader in) throws IOException {
-                return getLocaleByName(in.nextString());
-            }
-        }
     }
 }

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

@@ -19,9 +19,6 @@ 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;
@@ -66,7 +63,7 @@ public final class Profile {
         return globalProperty.get();
     }
 
-    private void setGlobal(VersionSetting global) {
+    public void setGlobal(VersionSetting global) {
         if (global == null)
             global = new VersionSetting();
         globalProperty.set(global);
@@ -86,18 +83,8 @@ public final class Profile {
         nameProperty.set(name);
     }
 
-    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() {
+        this("Default");
     }
 
     public Profile(String name) {
@@ -122,14 +109,13 @@ public final class Profile {
     }
 
     public HMCLDependencyManager getDependency() {
-        return new HMCLDependencyManager(this, Settings.instance().getDownloadProvider());
+        return new HMCLDependencyManager(this, Settings.INSTANCE.getDownloadProvider(), Settings.INSTANCE.getProxy());
     }
 
     public VersionSetting getVersionSetting(String id) {
         VersionSetting vs = repository.getVersionSetting(id);
         if (vs == null || vs.isUsesGlobal()) {
             getGlobal().setGlobal(true); // always keep global.isGlobal = true
-            getGlobal().setUsesGlobal(true);
             return getGlobal();
         } else
             return vs;
@@ -166,7 +152,6 @@ public final class Profile {
         return new ToStringBuilder(this)
                 .append("gameDir", getGameDir())
                 .append("name", getName())
-                .append("useRelativePath", isUseRelativePath())
                 .toString();
     }
 
@@ -174,8 +159,6 @@ 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> {
@@ -192,7 +175,6 @@ 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;
         }
@@ -205,8 +187,6 @@ 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;
         }
 

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

@@ -17,22 +17,18 @@
  */
 package org.jackhuang.hmcl.setting;
 
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import org.jackhuang.hmcl.Launcher;
 
 public final class Profiles {
-
-    public static final String DEFAULT_PROFILE = "Default";
-    public static final String HOME_PROFILE = "Home";
-
     private Profiles() {
     }
 
     public static String getProfileDisplayName(Profile profile) {
         switch (profile.getName()) {
-            case Profiles.DEFAULT_PROFILE:
-                return i18n("profile.default");
-            case Profiles.HOME_PROFILE:
-                return i18n("profile.home");
+            case Settings.DEFAULT_PROFILE:
+                return Launcher.i18n("profile.default");
+            case Settings.HOME_PROFILE:
+                return Launcher.i18n("profile.home");
             default:
                 return profile.getName();
         }

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

@@ -1,7 +1,7 @@
 /*
  * Hello Minecraft! Launcher.
- * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
- *
+ * 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,20 +15,22 @@
  * 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.download.game;
+package org.jackhuang.hmcl.setting;
 
-import org.jackhuang.hmcl.game.Library;
+import org.jackhuang.hmcl.util.Lang;
 
-public class LibraryDownloadException extends Exception {
-    private final Library library;
+import java.net.Proxy;
+import java.util.List;
 
-    public LibraryDownloadException(Library library, Throwable cause) {
-        super("Unable to download library " + library, cause);
+/**
+ * @author huangyuhui
+ */
+public final class Proxies {
+    private Proxies() {}
 
-        this.library = library;
-    }
+    public static final List<Proxy.Type> PROXIES = Lang.immutableListOf(Proxy.Type.DIRECT, Proxy.Type.HTTP, Proxy.Type.SOCKS);
 
-    public Library getLibrary() {
-        return library;
+    public static Proxy.Type getProxyType(int index) {
+        return Lang.get(PROXIES, index).orElse(null);
     }
 }

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

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

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

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

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

@@ -24,11 +24,6 @@ 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;
@@ -36,15 +31,13 @@ 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 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
-    };
+    public static final Theme[] VALUES = new Theme[]{BLUE, DARK_BLUE, GREEN, ORANGE, PURPLE, RED};
 
     private final String color;
     private final String name;
@@ -75,7 +68,8 @@ public class Theme {
     }
 
     public String[] getStylesheets() {
-        String css;
+        String name = isCustom() ? BLUE.getName() : this.name;
+        String css = Theme.class.getResource("/assets/css/" + name + ".css").toExternalForm();
         try {
             File temp = File.createTempFile("hmcl", ".css");
             FileUtils.writeText(temp, IOUtils.readFullyAsString(Theme.class.getResourceAsStream("/assets/css/custom.css"))
@@ -83,11 +77,12 @@ 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. Fallback to blue theme.", e);
-            css = Theme.class.getResource("/assets/css/blue.css").toExternalForm();
+            Logging.LOG.log(Level.SEVERE, "Unable to create theme stylesheet", e);
         }
 
         return new String[]{
+                Theme.class.getResource("/css/jfoenix-fonts.css").toExternalForm(),
+                Theme.class.getResource("/css/jfoenix-design.css").toExternalForm(),
                 css,
                 Theme.class.getResource("/assets/css/root.css").toExternalForm()
         };
@@ -102,18 +97,10 @@ public class Theme {
     public static Optional<Theme> getTheme(String name) {
         if (name == null)
             return Optional.empty();
-        else if (name.equalsIgnoreCase("blue"))
-            return Optional.of(custom("#5C6BC0"));
-        else if (name.equalsIgnoreCase("darker_blue"))
-            return Optional.of(custom("#283593"));
-        else if (name.equalsIgnoreCase("green"))
-            return Optional.of(custom("#43A047"));
-        else if (name.equalsIgnoreCase("orange"))
-            return Optional.of(custom("#E67E22"));
-        else if (name.equalsIgnoreCase("purple"))
-            return Optional.of(custom("#9C27B0"));
-        else if (name.equalsIgnoreCase("red"))
-            return Optional.of(custom("#F44336"));
+
+        for (Theme theme : VALUES)
+            if (theme.name.equalsIgnoreCase(name))
+                return Optional.of(theme);
 
         if (name.startsWith("#"))
             try {
@@ -130,7 +117,7 @@ public class Theme {
     }
 
     public static ObjectBinding<Color> foregroundFillBinding() {
-        return Bindings.createObjectBinding(() -> config().getTheme().getForegroundColor(), config().themeProperty());
+        return Bindings.createObjectBinding(() -> Settings.INSTANCE.getTheme().getForegroundColor(), Settings.INSTANCE.themeProperty());
     }
 
     public static ObjectBinding<Color> blackFillBinding() {
@@ -140,16 +127,4 @@ public class Theme {
     public static ObjectBinding<Color> whiteFillBinding() {
         return Bindings.createObjectBinding(() -> Color.WHITE);
     }
-
-    public static class TypeAdapter extends com.google.gson.TypeAdapter<Theme> {
-        @Override
-        public void write(JsonWriter out, Theme value) throws IOException {
-            out.value(value.getName().toLowerCase());
-        }
-
-        @Override
-        public Theme read(JsonReader in) throws IOException {
-            return getTheme(in.nextString()).orElse(Theme.BLUE);
-        }
-    }
 }

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

@@ -19,19 +19,14 @@ package org.jackhuang.hmcl.setting;
 
 import com.google.gson.*;
 import javafx.beans.InvalidationListener;
-
-import org.jackhuang.hmcl.Metadata;
+import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.game.LaunchOptions;
 import org.jackhuang.hmcl.util.*;
 
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Type;
-import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
-
-import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 
 /**
  *
@@ -82,7 +77,7 @@ public final class VersionSetting {
     }
 
     /**
-     * Java version or "Custom" if user customizes java directory, "Default" if the jvm that this app relies on.
+     * Java version or null if user customizes java directory.
      */
     public String getJava() {
         return javaProperty.get();
@@ -92,29 +87,6 @@ public final class VersionSetting {
         javaProperty.set(java);
     }
 
-    public boolean isUsesCustomJavaDir() {
-        return "Custom".equals(getJava());
-    }
-
-    public void setUsesCustomJavaDir() {
-        setJava("Custom");
-        setDefaultJavaPath(null);
-    }
-
-    private final ImmediateStringProperty defaultJavaPathProperty = new ImmediateStringProperty(this, "defaultJavaPath", "");
-
-    /**
-     * Path to Java executable, or null if user customizes java directory.
-     * It's used to determine which JRE to use when multiple JREs match the selected Java version.
-     */
-    public String getDefaultJavaPath() {
-        return defaultJavaPathProperty.get();
-    }
-
-    public void setDefaultJavaPath(String defaultJavaPath) {
-        defaultJavaPathProperty.set(defaultJavaPath);
-    }
-
     private final ImmediateStringProperty javaDirProperty = new ImmediateStringProperty(this, "javaDir", "");
 
     public ImmediateStringProperty javaDirProperty() {
@@ -288,6 +260,23 @@ 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() {
@@ -448,33 +437,22 @@ public final class VersionSetting {
         if (StringUtils.isBlank(getJava()))
             setJava(StringUtils.isBlank(getJavaDir()) ? "Default" : "Custom");
         if ("Default".equals(getJava())) return JavaVersion.fromCurrentEnvironment();
-        else if (isUsesCustomJavaDir()) {
+        else if ("Custom".equals(getJava())) {
             try {
                 return JavaVersion.fromExecutable(new File(getJavaDir()));
             } catch (IOException e) {
                 return null; // Custom Java Directory not found,
             }
         } else if (StringUtils.isNotBlank(getJava())) {
-            List<JavaVersion> matchedJava = JavaVersion.getJREs().stream()
-                    .filter(java -> java.getVersion().equals(getJava()))
-                    .collect(Collectors.toList());
-            if (matchedJava.isEmpty()) {
+            JavaVersion c = JavaVersion.getJREs().get(getJava());
+            if (c == null) {
                 setJava("Default");
                 return JavaVersion.fromCurrentEnvironment();
-            } else {
-                return matchedJava.stream()
-                        .filter(java -> java.getBinary().toString().equals(getDefaultJavaPath()))
-                        .findFirst()
-                        .orElse(matchedJava.get(0));
-            }
+            } else
+                return c;
         } else throw new Error();
     }
 
-    public void setJavaVersion(JavaVersion java) {
-        setJava(java.getVersion());
-        setDefaultJavaPath(java.getBinary().toString());
-    }
-
     public void addPropertyChangedListener(InvalidationListener listener) {
         usesGlobalProperty.addListener(listener);
         javaProperty.addListener(listener);
@@ -488,6 +466,7 @@ 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);
@@ -496,7 +475,6 @@ public final class VersionSetting {
         gameDirTypeProperty.addListener(listener);
         gameDirProperty.addListener(listener);
         launcherVisibilityProperty.addListener(listener);
-        defaultJavaPathProperty.addListener(listener);
     }
 
     public LaunchOptions toLaunchOptions(File gameDir) throws InterruptedException {
@@ -504,8 +482,8 @@ public final class VersionSetting {
         return new LaunchOptions.Builder()
                 .setGameDir(gameDir)
                 .setJava(javaVersion)
-                .setVersionName(Metadata.TITLE)
-                .setProfileName(Metadata.TITLE)
+                .setVersionName(Launcher.TITLE)
+                .setProfileName(Launcher.TITLE)
                 .setMinecraftArgs(getMinecraftArgs())
                 .setJavaArgs(getJavaArgs())
                 .setMaxMemory(getMaxMemory())
@@ -516,10 +494,10 @@ public final class VersionSetting {
                 .setFullscreen(isFullscreen())
                 .setServerIp(getServerIp())
                 .setWrapper(getWrapper())
-                .setProxyHost(config().getProxyHost())
-                .setProxyPort(config().getProxyPort())
-                .setProxyUser(config().getProxyUser())
-                .setProxyPass(config().getProxyPass())
+                .setProxyHost(Settings.INSTANCE.getProxyHost())
+                .setProxyPort(Settings.INSTANCE.getProxyPort())
+                .setProxyUser(Settings.INSTANCE.getProxyUser())
+                .setProxyPass(Settings.INSTANCE.getProxyPass())
                 .setPrecalledCommand(getPreLaunchCommand())
                 .setNoGeneratedJVMArgs(isNoJVMArgs())
                 .create();
@@ -552,11 +530,11 @@ public final class VersionSetting {
             obj.addProperty("fullscreen", src.isFullscreen());
             obj.addProperty("noJVMArgs", src.isNoJVMArgs());
             obj.addProperty("notCheckGame", src.isNotCheckGame());
+            obj.addProperty("noCommon", src.isNoCommon());
             obj.addProperty("showLogs", src.isShowLogs());
             obj.addProperty("gameDir", src.getGameDir());
             obj.addProperty("launcherVisibility", src.getLauncherVisibility().ordinal());
             obj.addProperty("gameDirType", src.getGameDirType().ordinal());
-            obj.addProperty("defaultJavaPath", src.getDefaultJavaPath());
 
             return obj;
         }
@@ -589,10 +567,10 @@ public final class VersionSetting {
             vs.setFullscreen(Optional.ofNullable(obj.get("fullscreen")).map(JsonElement::getAsBoolean).orElse(false));
             vs.setNoJVMArgs(Optional.ofNullable(obj.get("noJVMArgs")).map(JsonElement::getAsBoolean).orElse(false));
             vs.setNotCheckGame(Optional.ofNullable(obj.get("notCheckGame")).map(JsonElement::getAsBoolean).orElse(false));
+            vs.setNoCommon(Optional.ofNullable(obj.get("noCommon")).map(JsonElement::getAsBoolean).orElse(false));
             vs.setShowLogs(Optional.ofNullable(obj.get("showLogs")).map(JsonElement::getAsBoolean).orElse(false));
             vs.setLauncherVisibility(LauncherVisibility.values()[Optional.ofNullable(obj.get("launcherVisibility")).map(JsonElement::getAsInt).orElse(1)]);
             vs.setGameDirType(EnumGameDirectory.values()[Optional.ofNullable(obj.get("gameDirType")).map(JsonElement::getAsInt).orElse(0)]);
-            vs.setDefaultJavaPath(Optional.ofNullable(obj.get("defaultJavaPath")).map(JsonElement::getAsString).orElse(null));
 
             return vs;
         }
@@ -602,9 +580,7 @@ public final class VersionSetting {
         }
 
         private int parseJsonPrimitive(JsonPrimitive primitive, int defaultValue) {
-            if (primitive == null)
-                return defaultValue;
-            else if (primitive.isNumber())
+            if (primitive.isNumber())
                 return primitive.getAsInt();
             else
                 return Lang.parseInt(primitive.getAsString(), defaultValue);

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

@@ -17,17 +17,20 @@
  */
 package org.jackhuang.hmcl.ui;
 
+import com.jfoenix.controls.JFXDialog;
 import com.jfoenix.controls.JFXPasswordField;
 import com.jfoenix.controls.JFXProgressBar;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
+import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.AuthInfo;
 import org.jackhuang.hmcl.auth.NoSelectedCharacterException;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
+import org.jackhuang.hmcl.ui.AddAccountPane;
+import org.jackhuang.hmcl.ui.FXUtils;
 
 import java.util.function.Consumer;
 
@@ -35,6 +38,7 @@ 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;
@@ -42,10 +46,11 @@ public class AccountLoginPane extends StackPane {
     @FXML private Label lblCreationWarning;
     @FXML private JFXProgressBar progressBar;
 
-    public AccountLoginPane(Account oldAccount, Consumer<AuthInfo> success, Runnable failed) {
+    public AccountLoginPane(Account oldAccount, Consumer<Region> closeConsumer, Consumer<AuthInfo> success, Runnable failed) {
         this.oldAccount = oldAccount;
         this.success = success;
         this.failed = failed;
+        this.closeConsumer = closeConsumer;
 
         FXUtils.loadFXML(this, "/assets/fxml/account-login.fxml");
 
@@ -68,9 +73,9 @@ public class AccountLoginPane extends StackPane {
             Object account = variable.get("login");
             if (account instanceof AuthInfo) {
                 success.accept(((AuthInfo) account));
-                fireEvent(new DialogCloseEvent());
+                closeConsumer.accept(this);
             } else if (account instanceof NoSelectedCharacterException) {
-                fireEvent(new DialogCloseEvent());
+                closeConsumer.accept(this);
             } else if (account instanceof Exception) {
                 lblCreationWarning.setText(AddAccountPane.accountException((Exception) account));
             }
@@ -82,6 +87,6 @@ public class AccountLoginPane extends StackPane {
     @FXML
     private void onCancel() {
         failed.run();
-        fireEvent(new DialogCloseEvent());
+        closeConsumer.accept(this);
     }
 }

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

@@ -28,29 +28,25 @@ 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.Accounts;
+import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.ui.construct.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 AdvancedListItem item;
+    private final VersionListItem item;
     private final Account account;
 
     @FXML
@@ -74,31 +70,34 @@ public class AccountPage extends StackPane implements DecoratorPage {
     @FXML
     private JFXProgressBar progressBar;
 
-    public AccountPage(Account account, AdvancedListItem item) {
+    public AccountPage(Account account, VersionListItem item) {
         this.account = account;
         this.item = item;
 
-        title = new SimpleStringProperty(this, "title", i18n("account") + " - " + account.getCharacter());
+        title = new SimpleStringProperty(this, "title", Launcher.i18n("account") + " - " + account.getCharacter());
 
         FXUtils.loadFXML(this, "/assets/fxml/account.fxml");
 
+        FXUtils.setLimitWidth(this, 300);
         if (account instanceof AuthlibInjectorAccount) {
-            AuthlibInjectorServer server = ((AuthlibInjectorAccount) account).getServer();
-            lblServer.setText(server.getName());
-            installTooltip(lblServer, server.getUrl());
+            Accounts.getAuthlibInjectorServerNameAsync((AuthlibInjectorAccount) account)
+                    .subscribe(Schedulers.javafx(), variables -> lblServer.setText(variables.get("serverName")));
+            FXUtils.setLimitHeight(this, 182);
         } else {
             componentList.removeChildren(paneServer);
 
             if (account instanceof OfflineAccount) {
                 componentList.removeChildren(paneEmail);
-            }
+                FXUtils.setLimitHeight(this, 110);
+            } else
+                FXUtils.setLimitHeight(this, 145);
         }
 
         btnDelete.setGraphic(SVG.delete(Theme.blackFillBinding(), 15, 15));
         btnRefresh.setGraphic(SVG.refresh(Theme.blackFillBinding(), 15, 15));
 
         lblCharacter.setText(account.getCharacter());
-        lblType.setText(Accounts.getAccountTypeName(account));
+        lblType.setText(AddAccountPane.accountType(account));
         lblEmail.setText(account.getUsername());
 
         btnRefresh.setVisible(account instanceof YggdrasilAccount);
@@ -106,7 +105,7 @@ public class AccountPage extends StackPane implements DecoratorPage {
 
     @FXML
     private void onDelete() {
-        Accounts.getAccounts().remove(account);
+        Settings.INSTANCE.deleteAccount(account);
         Optional.ofNullable(onDelete.get()).ifPresent(Runnable::run);
     }
 

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

@@ -19,46 +19,41 @@ 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.AuthlibInjectorServer;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
+import org.jackhuang.hmcl.auth.offline.OfflineAccount;
 import org.jackhuang.hmcl.auth.yggdrasil.GameProfile;
-import org.jackhuang.hmcl.auth.yggdrasil.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.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 java.util.Collection;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.CountDownLatch;
+import java.util.function.Consumer;
 import java.util.logging.Level;
-
-import 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;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class AddAccountPane extends StackPane {
 
@@ -66,125 +61,118 @@ public class AddAccountPane extends StackPane {
     @FXML private JFXPasswordField txtPassword;
     @FXML private Label lblCreationWarning;
     @FXML private Label lblPassword;
-    @FXML private JFXComboBox<AccountFactory<?>> cboType;
-    @FXML private JFXComboBox<AuthlibInjectorServer> cboServers;
-    @FXML private Label lblInjectorServer;
-    @FXML private Hyperlink linkManageInjectorServers;
+    @FXML private JFXComboBox<String> cboType;
+    @FXML private JFXComboBox<TwoLineListItem> cboServers;
+    @FXML private JFXProgressBar progressBar;
+    @FXML private Label lblAddInjectorServer;
+    @FXML private Hyperlink linkAddInjectorServer;
     @FXML private JFXDialogLayout layout;
     @FXML private JFXButton btnAccept;
-    @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));
-        Bindings.bindContent(cboServers.getItems(), config().getAuthlibInjectorServers());
-        cboServers.getItems().addListener(onInvalidating(this::selectDefaultServer));
-        selectDefaultServer();
+        loadServers();
 
-        cboType.getItems().setAll(Accounts.FACTORY_OFFLINE, Accounts.FACTORY_YGGDRASIL, Accounts.FACTORY_AUTHLIB_INJECTOR);
-        cboType.setConverter(stringConverter(Accounts::getAccountTypeName));
+        cboType.getItems().setAll(Launcher.i18n("account.methods.offline"), Launcher.i18n("account.methods.yggdrasil"), Launcher.i18n("account.methods.authlib_injector"));
+        cboType.getSelectionModel().selectedIndexProperty().addListener((a, b, newValue) -> {
+            txtPassword.setVisible(newValue.intValue() != 0);
+            lblPassword.setVisible(newValue.intValue() != 0);
+            cboServers.setVisible(newValue.intValue() == 2);
+            linkAddInjectorServer.setVisible(newValue.intValue() == 2);
+            lblAddInjectorServer.setVisible(newValue.intValue() == 2);
+            validateAcceptButton();
+        });
         cboType.getSelectionModel().select(0);
 
-        ReadOnlyObjectProperty<AccountFactory<?>> loginType = cboType.getSelectionModel().selectedItemProperty();
+        // These two lines can eliminate black, don't know why.
+        cboServers.getItems().setAll(new TwoLineListItem("", ""));
+        cboServers.getSelectionModel().select(0);
 
-        txtPassword.visibleProperty().bind(loginType.isNotEqualTo(Accounts.FACTORY_OFFLINE));
-        lblPassword.visibleProperty().bind(txtPassword.visibleProperty());
+        txtPassword.setOnAction(e -> onCreationAccept());
+        txtUsername.setOnAction(e -> onCreationAccept());
+        txtUsername.getValidators().add(new Validator(Launcher.i18n("input.email"), str -> !txtPassword.isVisible() || str.contains("@")));
 
-        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()));
+        txtUsername.textProperty().addListener(it -> validateAcceptButton());
+        txtPassword.textProperty().addListener(it -> validateAcceptButton());
     }
 
-    /**
-     * Selects the first server if no server is selected.
-     */
-    private void selectDefaultServer() {
-        if (!cboServers.getItems().isEmpty() && cboServers.getSelectionModel().isEmpty()) {
-            cboServers.getSelectionModel().select(0);
-        }
+    private void validateAcceptButton() {
+        btnAccept.setDisable(!txtUsername.validate() || (cboType.getSelectionModel().getSelectedIndex() != 0 && !txtPassword.validate()));
     }
 
-    /**
-     * 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;
+    private void loadServers() {
+        Task.ofResult("list", () -> Settings.INSTANCE.getAuthlibInjectorServerURLs().parallelStream()
+                .flatMap(serverURL -> {
+                    try {
+                        return Stream.of(new TwoLineListItem(Accounts.getAuthlibInjectorServerName(serverURL), serverURL));
+                    } catch (Exception e) {
+                        Logging.LOG.log(Level.WARNING, "Authlib-injector server root " + serverURL + " cannot be recognized.", e);
+                        return Stream.empty();
+                    }
+                })
+                .collect(Collectors.toList()))
+                .subscribe(Task.of(Schedulers.javafx(), variables -> {
+                    cboServers.getItems().setAll(variables.<Collection<TwoLineListItem>>get("list"));
+                    if (!cboServers.getItems().isEmpty())
+                        cboServers.getSelectionModel().select(0);
+                }));
     }
 
     @FXML
     private void onCreationAccept() {
-        if (btnAccept.isDisabled())
-            return;
-
-        acceptPane.showSpinner();
-        lblCreationWarning.setText("");
-        setDisable(true);
-
+        int type = cboType.getSelectionModel().getSelectedIndex();
         String username = txtUsername.getText();
         String password = txtPassword.getText();
-        AccountFactory<?> factory = cboType.getSelectionModel().getSelectedItem();
-        Object additionalData = getAuthAdditionalData();
+        String apiRoot = Optional.ofNullable(cboServers.getSelectionModel().getSelectedItem()).map(TwoLineListItem::getSubtitle).orElse(null);
+        progressBar.setVisible(true);
+        lblCreationWarning.setText("");
+        Task.ofResult("create_account", () -> {
+            AccountFactory<?> factory;
+            switch (type) {
+                case 0: factory = Accounts.ACCOUNT_FACTORY.get(Accounts.OFFLINE_ACCOUNT_KEY); break;
+                case 1: factory = Accounts.ACCOUNT_FACTORY.get(Accounts.YGGDRASIL_ACCOUNT_KEY); break;
+                case 2: factory = Accounts.ACCOUNT_FACTORY.get(Accounts.AUTHLIB_INJECTOR_ACCOUNT_KEY); break;
+                default: throw new Error();
+            }
 
-        Task.ofResult("create_account", () -> factory.create(new Selector(), username, password, additionalData))
-                .finalized(Schedulers.javafx(), variables -> {
-
-                    Account account = variables.get("create_account");
-                    int oldIndex = Accounts.getAccounts().indexOf(account);
-                    if (oldIndex == -1) {
-                        Accounts.getAccounts().add(account);
-                    } else {
-                        // adding an already-added account
-                        // instead of discarding the new account, we first remove the existing one then add the new one
-                        Accounts.getAccounts().remove(oldIndex);
-                        Accounts.getAccounts().add(oldIndex, account);
-                    }
-
-                    // select the new account
-                    Accounts.setSelectedAccount(account);
-
-                    acceptPane.hideSpinner();
-                    fireEvent(new DialogCloseEvent());
-                }, exception -> {
-                    if (exception instanceof NoSelectedCharacterException) {
-                        fireEvent(new DialogCloseEvent());
-                    } else {
-                        lblCreationWarning.setText(accountException(exception));
-                    }
-                    setDisable(false);
-                    acceptPane.hideSpinner();
-                }).start();
+            return factory.create(new Selector(), username, password, apiRoot, Settings.INSTANCE.getProxy());
+        }).finalized(Schedulers.javafx(), variables -> {
+            Settings.INSTANCE.addAccount(variables.get("create_account"));
+            progressBar.setVisible(false);
+            finalization.accept(this);
+        }, exception -> {
+            if (exception instanceof NoSelectedCharacterException) {
+                finalization.accept(this);
+            } else {
+                lblCreationWarning.setText(accountException(exception));
+            }
+            progressBar.setVisible(false);
+        }).start();
     }
 
     @FXML
     private void onCreationCancel() {
-        fireEvent(new DialogCloseEvent());
+        finalization.accept(this);
     }
 
     @FXML
-    private void onManageInjecterServers() {
-        fireEvent(new DialogCloseEvent());
+    private void onAddInjecterServer() {
+        finalization.accept(this);
         Controllers.navigate(Controllers.getServersPage());
     }
 
+    private void showSelector(Node node) {
+        getChildren().setAll(node);
+    }
+
+    private void closeSelector() {
+        getChildren().setAll(layout);
+    }
+
     private class Selector extends BorderPane implements CharacterSelector {
         private final AdvancedListBox listBox = new AdvancedListBox();
         private final JFXButton cancel = new JFXButton();
@@ -195,11 +183,11 @@ public class AddAccountPane extends StackPane {
         {
             setStyle("-fx-padding: 8px;");
 
-            cancel.setText(i18n("button.cancel"));
+            cancel.setText(Launcher.i18n("button.cancel"));
             StackPane.setAlignment(cancel, Pos.BOTTOM_RIGHT);
             cancel.setOnMouseClicked(e -> latch.countDown());
 
-            listBox.startCategory(i18n("account.choose"));
+            listBox.startCategory(Launcher.i18n("account.choose"));
 
             setCenter(listBox);
 
@@ -218,16 +206,15 @@ public class AddAccountPane extends StackPane {
             for (GameProfile profile : names) {
                 Image image;
                 try {
-                    image = AccountHelper.getSkinImmediately(yggdrasilAccount, profile, 4);
+                    image = AccountHelper.getSkinImmediately(yggdrasilAccount, profile, 4, Settings.INSTANCE.getProxy());
                 } catch (Exception e) {
-                    Logging.LOG.log(Level.WARNING, "Failed to get skin for " + profile.getName(), e);
-                    image = null;
+                    image = FXUtils.DEFAULT_ICON;
                 }
                 ImageView portraitView = new ImageView();
                 portraitView.setSmooth(false);
-                if (image == null) {
-                    portraitView.setImage(Constants.DEFAULT_ICON.get());
-                } else {
+                if (image == FXUtils.DEFAULT_ICON)
+                    portraitView.setImage(FXUtils.DEFAULT_ICON);
+                else {
                     portraitView.setImage(image);
                     portraitView.setViewport(AccountHelper.getViewport(4));
                 }
@@ -241,7 +228,7 @@ public class AddAccountPane extends StackPane {
                 listBox.add(accountItem);
             }
 
-            JFXUtilities.runInFX(() -> Controllers.dialog(this));
+            JFXUtilities.runInFX(() -> showSelector(this));
 
             try {
                 latch.await();
@@ -249,36 +236,35 @@ 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 NoCharacterException) {
-            return i18n("account.failed.no_character");
+        if (exception instanceof InvalidCredentialsException) {
+            return Launcher.i18n("account.failed.invalid_credentials");
+        } else if (exception instanceof NoCharacterException) {
+            return Launcher.i18n("account.failed.no_charactor");
         } else if (exception instanceof ServerDisconnectException) {
-            return 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();
+            return Launcher.i18n("account.failed.connect_authentication_server");
+        } else if (exception instanceof InvalidTokenException) {
+            return Launcher.i18n("account.failed.invalid_token");
+        } else if (exception instanceof InvalidPasswordException) {
+            return Launcher.i18n("account.failed.invalid_password");
         } else {
-            return exception.getClass().getName() + ": " + exception.getLocalizedMessage();
+            return exception.getClass() + ": " + exception.getLocalizedMessage();
         }
     }
+
+    public static String accountType(Account account) {
+        if (account instanceof OfflineAccount) return Launcher.i18n("account.methods.offline");
+        else if (account instanceof AuthlibInjectorAccount) return Launcher.i18n("account.methods.authlib_injector");
+        else if (account instanceof YggdrasilAccount) return Launcher.i18n("account.methods.yggdrasil");
+        else throw new Error(Launcher.i18n("account.methods.no_method") + ": " + account);
+    }
 }

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

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

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

@@ -23,19 +23,19 @@ import javafx.geometry.Pos;
 import javafx.scene.control.Label;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServerInfo;
 import org.jackhuang.hmcl.setting.Theme;
 
 import java.util.function.Consumer;
 
 public final class AuthlibInjectorServerItem extends BorderPane {
-    private final AuthlibInjectorServer server;
+    private final AuthlibInjectorServerInfo info;
 
     private final Label lblServerName = new Label();
     private final Label lblServerIp = new Label();
 
-    public AuthlibInjectorServerItem(AuthlibInjectorServer server, Consumer<AuthlibInjectorServerItem> deleteCallback) {
-        this.server = server;
+    public AuthlibInjectorServerItem(AuthlibInjectorServerInfo info, Consumer<AuthlibInjectorServerItem> deleteCallback) {
+        this.info = info;
 
         lblServerName.setStyle("-fx-font-size: 15;");
         lblServerIp.setStyle("-fx-font-size: 10;");
@@ -54,11 +54,11 @@ public final class AuthlibInjectorServerItem extends BorderPane {
 
         setStyle("-fx-background-radius: 2; -fx-background-color: white; -fx-padding: 8;");
         JFXDepthManager.setDepth(this, 1);
-        lblServerName.setText(server.getName());
-        lblServerIp.setText(server.getUrl());
+        lblServerName.setText(info.getServerName());
+        lblServerIp.setText(info.getServerIp());
     }
 
-    public AuthlibInjectorServer getServer() {
-        return server;
+    public AuthlibInjectorServerInfo getInfo() {
+        return info;
     }
 }

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

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

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

@@ -17,13 +17,14 @@
  */
 package org.jackhuang.hmcl.ui;
 
+import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.controls.JFXDialog;
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.image.Image;
 import javafx.scene.layout.Region;
 import javafx.stage.Stage;
 import org.jackhuang.hmcl.Launcher;
-import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
@@ -31,10 +32,8 @@ 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 org.jackhuang.hmcl.util.Lang;
 
 import java.util.function.Consumer;
 
@@ -98,29 +97,28 @@ public final class Controllers {
 
         stage.setOnCloseRequest(e -> Launcher.stopApplication());
 
-        decorator = new Decorator(stage, getMainPage(), Metadata.TITLE, false, true);
+        decorator = new Decorator(stage, getMainPage(), Launcher.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(config().getTheme().getStylesheets());
+        scene.getStylesheets().setAll(Settings.INSTANCE.getTheme().getStylesheets());
         stage.setMinWidth(804);
         stage.setMaxWidth(804);
         stage.setMinHeight(521);
         stage.setMaxHeight(521);
 
         stage.getIcons().add(new Image("/assets/img/icon.png"));
-        stage.setTitle(Metadata.TITLE);
+        stage.setTitle(Launcher.TITLE);
     }
 
     public static void dialog(Region content) {
-        if (decorator != null)
-            decorator.showDialog(content);
+        decorator.showDialog(content);
     }
 
     public static void dialog(String text) {
@@ -136,17 +134,15 @@ public final class Controllers {
     }
 
     public static void dialog(String text, String title, int type, Runnable onAccept) {
-        dialog(new MessageDialogPane(text, title, type, onAccept));
+        dialog(new MessageDialogPane(text, title, Controllers::closeDialog, type, onAccept));
     }
 
     public static void confirmDialog(String text, String title, Runnable onAccept, Runnable onCancel) {
-        dialog(new MessageDialogPane(text, title, onAccept, onCancel));
+        dialog(new MessageDialogPane(text, title, Controllers::closeDialog, onAccept, onCancel));
     }
 
-    public static InputDialogPane inputDialog(String text, FutureCallback<String> onResult) {
-        InputDialogPane pane = new InputDialogPane(text, onResult);
-        dialog(pane);
-        return pane;
+    public static void inputDialog(String text, Consumer<String> onResult) {
+        dialog(new InputDialogPane(text, Controllers::closeDialog, onResult));
     }
 
     public static Region taskDialog(TaskExecutor executor, String title, String subtitle) {
@@ -162,6 +158,11 @@ 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);
@@ -169,8 +170,8 @@ public final class Controllers {
             decorator.showPage(node);
     }
 
-    public static boolean isStopped() {
-        return decorator == null;
+    public static void showUpdate() {
+        getLeftPaneController().showUpdate();
     }
 
     public static void shutdown() {

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

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

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

@@ -22,17 +22,12 @@ 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;
@@ -43,8 +38,6 @@ 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;
@@ -52,38 +45,25 @@ 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.OperatingSystem;
+import org.jackhuang.hmcl.util.StringUtils;
 
-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.io.File;
 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),
@@ -95,8 +75,6 @@ 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);
 
@@ -105,14 +83,13 @@ 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 JFXDialog dialog;
-    private StackContainerPane dialogPane;
+    private final StackContainerPane dialogPane = new StackContainerPane();
 
     @FXML
     private StackPane contentPlaceHolder;
@@ -152,10 +129,6 @@ 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);
@@ -185,8 +158,6 @@ 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)));
@@ -195,18 +166,11 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
                 btnMax.fire();
         });
 
-        welcomeView.setCursor(Cursor.HAND);
-        welcomeView.setOnMouseClicked(e -> {
-            Timeline nowAnimation = new Timeline();
-            nowAnimation.getKeyFrames().addAll(
-                    new KeyFrame(Duration.ZERO, new KeyValue(welcomeView.opacityProperty(), 1.0D, Interpolator.EASE_BOTH)),
-                    new KeyFrame(new Duration(300), new KeyValue(welcomeView.opacityProperty(), 0.0D, Interpolator.EASE_BOTH)),
-                    new KeyFrame(new Duration(300), e2 -> drawerWrapper.getChildren().remove(welcomeView))
-            );
-            nowAnimation.play();
-        });
-        if (!ConfigHolder.isNewlyCreated() || config().getLocalization().getLocale() != Locale.CHINA)
-            drawerWrapper.getChildren().remove(welcomeView);
+        dialog = new JFXDialog();
+        dialog.setOverlayClose(false);
+        drawerWrapper.getChildren().add(0, dialog);
+        dialog.setDialogContainer(drawerWrapper);
+        dialog.setContent(dialogPane);
 
         if (!min) buttonsContainer.getChildren().remove(btnMin);
         if (!max) buttonsContainer.getChildren().remove(btnMax);
@@ -223,102 +187,83 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
 
         animationHandler = new TransitionHandler(contentPlaceHolder);
 
-        setupBackground();
-        setupAuthlibInjectorDnD();
+        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;
+    private void loadBackground() {
         try {
-            candidates = Files.list(imageDir)
-                    .filter(Files::isRegularFile)
-                    .filter(it -> {
-                        String filename = it.getFileName().toString();
-                        return filename.endsWith(".png") || filename.endsWith(".jpg");
-                    })
-                    .collect(toList());
-        } catch (IOException e) {
-            LOG.log(Level.WARNING, "Failed to list files in ./bg", e);
-            return Optional.empty();
-        }
+            Image background;
 
-        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);
-            }
+            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) {
         }
-        return Optional.empty();
     }
 
-    private Optional<Image> tryLoadImage(Path path) {
-        if (Files.isRegularFile(path)) {
+    private static Image searchBackgroundImage(Image def, String customPath) {
+        Random random = new Random();
+        boolean loaded = false;
+        Image background = def;
+
+        // custom path
+        if (StringUtils.isNotBlank(customPath)) {
             try {
-                return Optional.of(new Image(path.toAbsolutePath().toUri().toString()));
-            } catch (IllegalArgumentException ignored) {
+                background = new Image("file:" + customPath);
+                loaded = true;
+            } catch (IllegalArgumentException ignore) {
             }
         }
-        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();
+        // images in ./bg
+        if (!loaded) {
+            File backgroundImageFile = new File("bg");
+            if (backgroundImageFile.isDirectory()) {
+                File[] backgroundPath = backgroundImageFile.listFiles(file -> StringUtils.containsOne(FileUtils.getExtension(file), "png", "jpg"));
+                if (backgroundPath != null && backgroundPath.length > 0) {
+                    int index = random.nextInt(backgroundPath.length);
+                    try {
+                        background = new Image("file:" + backgroundPath[index].getAbsolutePath());
+                        loaded = true;
+                    } catch (IllegalArgumentException ignore) {
+                    }
+                }
+            }
         }
-    }
 
-    // ====
+        // background.png
+        if (!loaded) {
+            File backgroundImageFile = new File("background.png");
+            if (backgroundImageFile.exists()) {
+                try {
+                    background = new Image("file:" + backgroundImageFile.getAbsolutePath());
+                    loaded = true;
+                } catch (IllegalArgumentException ignore) {
+                }
+            }
+        }
+
+        // background.jpg
+        if (!loaded) {
+            File backgroundImageFile = new File("background.jpg");
+            if (backgroundImageFile.exists()) {
+                try {
+                    background = new Image("file:" + backgroundImageFile.getAbsolutePath());
+                    loaded = true;
+                } catch (IllegalArgumentException ignore) {
+                }
+            }
+        }
+
+        return background;
+    }
 
     @FXML
     private void onMouseMoved(MouseEvent mouseEvent) {
-        if (!isMaximized() && !primaryStage.isFullScreen() && !maximized) {
+        if (!primaryStage.isMaximized() && !primaryStage.isFullScreen() && !maximized) {
             if (!primaryStage.isResizable())
                 updateInitMouseValues(mouseEvent);
             else {
@@ -367,7 +312,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() && !isMaximized() && !this.maximized) {
+            if (!this.primaryStage.isFullScreen() && !mouseEvent.isStillSincePress() && !this.primaryStage.isMaximized() && !this.maximized) {
                 this.newX = mouseEvent.getScreenX();
                 this.newY = mouseEvent.getScreenY();
                 double deltaX = this.newX - this.initX;
@@ -597,39 +542,20 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
     public void showDialog(Node node) {
         FXUtils.checkFxUserThread();
 
-        if (dialog == null) {
-            dialog = new JFXDialog();
-            dialogPane = new StackContainerPane();
-
-            dialog.setContent(dialogPane);
-            dialog.setDialogContainer(drawerWrapper);
-            dialog.setOverlayClose(false);
+        if (dialogPane.isEmpty())
             dialog.show();
-        }
-
         dialogPane.push(node);
-
-        EventHandler<DialogCloseEvent> handler = event -> closeDialog(node);
-        node.getProperties().put(PROPERTY_DIALOG_CLOSE_HANDLER, handler);
-        node.addEventHandler(DialogCloseEvent.CLOSE, handler);
     }
 
-    @SuppressWarnings("unchecked")
-    private void closeDialog(Node node) {
+    public void closeDialog(Node node) {
         FXUtils.checkFxUserThread();
 
-        Optional.ofNullable(node.getProperties().get(PROPERTY_DIALOG_CLOSE_HANDLER))
-                .ifPresent(handler -> node.removeEventHandler(DialogCloseEvent.CLOSE, (EventHandler<DialogCloseEvent>) handler));
-
-        if (dialog != null) {
-            dialogPane.pop(node);
-
-            if (dialogPane.getChildren().isEmpty()) {
-                dialog.close();
-                dialog = null;
-                dialogPane = null;
-            }
-        }
+        dialogPane.pop(node);
+        if (dialogPane.getChildren().isEmpty())
+            Platform.runLater(() -> {
+                if (dialogPane.getChildren().isEmpty())
+                    dialog.close();
+            });
     }
 
     public void startWizard(WizardProvider wizardProvider) {
@@ -723,10 +649,4 @@ 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))));
-    }
 }

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

@@ -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, it -> {
+                AccountLoginPane pane = new AccountLoginPane(account, Controllers::closeDialog, it -> {
                         res.set(it);
                         latch.countDown();
                 }, latch::countDown);

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

@@ -17,13 +17,13 @@
  */
 package org.jackhuang.hmcl.ui;
 
+import com.jfoenix.adapters.ReflectionHelper;
 import com.jfoenix.controls.*;
 import javafx.animation.Animation;
 import javafx.animation.Interpolator;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
 import javafx.application.Platform;
-import javafx.beans.InvalidationListener;
 import javafx.beans.property.Property;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
@@ -31,36 +31,32 @@ import javafx.beans.value.WeakChangeListener;
 import javafx.event.EventHandler;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Node;
-import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
 import javafx.scene.control.ScrollBar;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.Tooltip;
+import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.input.ScrollEvent;
 import javafx.scene.layout.Region;
 import javafx.scene.shape.Rectangle;
-import javafx.util.Callback;
 import javafx.util.Duration;
-import javafx.util.StringConverter;
-
+import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.util.*;
-import org.jackhuang.hmcl.util.i18n.I18n;
 
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
 import java.net.URI;
+import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
-import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.logging.Level;
 
-import static org.jackhuang.hmcl.util.Lang.tryCast;
+import static org.jackhuang.hmcl.util.ReflectionHelper.call;
+import static org.jackhuang.hmcl.util.ReflectionHelper.construct;
 
 public final class FXUtils {
     private FXUtils() {
@@ -73,10 +69,6 @@ public final class FXUtils {
         }
     }
 
-    public static InvalidationListener onInvalidating(Runnable action) {
-        return arg -> action.run();
-    }
-
     public static <T> void onChange(ObservableValue<T> value, Consumer<T> consumer) {
         value.addListener((a, b, c) -> consumer.accept(c));
     }
@@ -133,7 +125,7 @@ public final class FXUtils {
     }
 
     public static void removeListener(Node node, String key) {
-        tryCast(node.getProperties().get(key), ListenerPair.class)
+        Lang.cast(node.getProperties().get(key), ListenerPair.class)
                 .ifPresent(info -> {
                     info.unbind();
                     node.getProperties().remove(key);
@@ -203,12 +195,18 @@ public final class FXUtils {
     }
 
     public static void loadFXML(Node node, String absolutePath) {
-        FXMLLoader loader = new FXMLLoader(node.getClass().getResource(absolutePath), I18n.getResourceBundle());
+        FXMLLoader loader = new FXMLLoader(node.getClass().getResource(absolutePath), Launcher.RESOURCE_BUNDLE);
         loader.setRoot(node);
         loader.setController(node);
         Lang.invoke((ExceptionalSupplier<Object, IOException>) loader::load);
     }
 
+    public static void resetChildren(JFXMasonryPane pane, List<Node> children) {
+        // Fixes mis-repositioning.
+        ReflectionHelper.setFieldContent(JFXMasonryPane.class, pane, "oldBoxes", null);
+        pane.getChildren().setAll(children);
+    }
+
     public static void installTooltip(Node node, String tooltip) {
         installTooltip(node, 0, 5000, 0, new Tooltip(tooltip));
     }
@@ -216,22 +214,17 @@ public final class FXUtils {
     public static void installTooltip(Node node, double openDelay, double visibleDelay, double closeDelay, Tooltip tooltip) {
         try {
             // Java 8
-            Class<?> behaviorClass = Class.forName("javafx.scene.control.Tooltip$TooltipBehavior");
-            Constructor<?> behaviorConstructor = behaviorClass.getDeclaredConstructor(Duration.class, Duration.class, Duration.class, boolean.class);
-            behaviorConstructor.setAccessible(true);
-            Object behavior = behaviorConstructor.newInstance(new Duration(openDelay), new Duration(visibleDelay), new Duration(closeDelay), false);
-            Method installMethod = behaviorClass.getDeclaredMethod("install", Node.class, Tooltip.class);
-            installMethod.setAccessible(true);
-            installMethod.invoke(behavior, node, tooltip);
-        } catch (ReflectiveOperationException e) {
+            call(construct(Class.forName("javafx.scene.control.Tooltip$TooltipBehavior"), new Duration(openDelay), new Duration(visibleDelay), new Duration(closeDelay), false),
+                    "install", node, tooltip);
+        } catch (Throwable e) {
             try {
                 // Java 9
-                Tooltip.class.getMethod("setShowDelay", Duration.class).invoke(tooltip, new Duration(openDelay));
-                Tooltip.class.getMethod("setShowDuration", Duration.class).invoke(tooltip, new Duration(visibleDelay));
-                Tooltip.class.getMethod("setHideDelay", Duration.class).invoke(tooltip, new Duration(closeDelay));
-            } catch (ReflectiveOperationException e2) {
+                call(tooltip, "setShowDelay", new Duration(openDelay));
+                call(tooltip, "setShowDuration", new Duration(visibleDelay));
+                call(tooltip, "setHideDelay", new Duration(closeDelay));
+            } catch (Throwable e2) {
                 e.addSuppressed(e2);
-                Logging.LOG.log(Level.SEVERE, "Cannot install tooltip", e);
+                Logging.LOG.log(Level.SEVERE, "Cannot install tooltip by reflection", e);
             }
             Tooltip.install(node, tooltip);
         }
@@ -340,7 +333,7 @@ public final class FXUtils {
      */
     @SuppressWarnings("unchecked")
     public static void unbindEnum(JFXComboBox<?> comboBox) {
-        ChangeListener listener = tryCast(comboBox.getProperties().get("FXUtils.bindEnum.listener"), ChangeListener.class).orElse(null);
+        ChangeListener listener = Lang.get(comboBox.getProperties(), "FXUtils.bindEnum.listener", ChangeListener.class).orElse(null);
         if (listener == null) return;
         comboBox.getSelectionModel().selectedIndexProperty().removeListener(listener);
     }
@@ -411,32 +404,7 @@ public final class FXUtils {
         }
     }
 
-    public static <T> StringConverter<T> stringConverter(Function<T, String> func) {
-        return new StringConverter<T>() {
-
-            @Override
-            public String toString(T object) {
-                return object == null ? "" : func.apply(object);
-            }
-
-            @Override
-            public T fromString(String string) {
-                throw new UnsupportedOperationException();
-            }
-        };
-    }
-
-    public static <T> Callback<ListView<T>, ListCell<T>> jfxListCellFactory(Function<T, Node> graphicBuilder) {
-        return view -> new JFXListCell<T>() {
-            @Override
-            public void updateItem(T item, boolean empty) {
-                super.updateItem(item, empty);
-                if (!empty) {
-                    setGraphic(graphicBuilder.apply(item));
-                }
-            }
-        };
-    }
+    public static final Image DEFAULT_ICON = new Image("/assets/img/icon.png");
 
     public static final Interpolator SINE = new Interpolator() {
         @Override

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

@@ -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,7 +30,6 @@ 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;
@@ -91,7 +90,7 @@ public class InstallerController {
         Optional<String> gameVersion = GameVersion.minecraftVersion(profile.getRepository().getVersionJar(version));
 
         if (!gameVersion.isPresent())
-            Controllers.dialog(i18n("version.cannot_read"));
+            Controllers.dialog(Launcher.i18n("version.cannot_read"));
         else
             Controllers.getDecorator().startWizard(new InstallerWizardProvider(profile, gameVersion.get(), version, forge, liteLoader, optiFine));
     }

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

@@ -21,8 +21,7 @@ import com.jfoenix.effects.JFXDepthManager;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.layout.BorderPane;
-
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import org.jackhuang.hmcl.Launcher;
 
 import java.util.function.Consumer;
 
@@ -45,7 +44,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(i18n("archive.version") + ": " + version);
+        lblInstallerVersion.setText(Launcher.i18n("archive.version") + ": " + version);
     }
 
     @FXML

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

@@ -21,12 +21,6 @@ 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;
@@ -34,7 +28,7 @@ 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;
@@ -49,71 +43,42 @@ 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.*;
-import org.jackhuang.hmcl.upgrade.UpdateChecker;
+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.util.Lang;
-import org.jackhuang.hmcl.util.MappedObservableList;
 
 import java.io.File;
 import java.util.LinkedList;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static javafx.collections.FXCollections.singletonObservableList;
-import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
 public final class LeftPaneController {
     private final AdvancedListBox leftPane;
     private final VBox profilePane = new VBox();
     private final VBox accountPane = new VBox();
     private final IconedItem launcherSettingsItem;
-
-    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)));
-        }
-    };
+    private final VersionListItem missingAccountItem = new VersionListItem(Launcher.i18n("account.missing"), Launcher.i18n("message.unknown"));
 
     public LeftPaneController(AdvancedListBox leftPane) {
         this.leftPane = leftPane;
 
-        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()));
+        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()));
+        });
 
         leftPane
-                .add(new ClassTitle(i18n("account").toUpperCase(), Lang.apply(new JFXButton(), button -> {
+                .add(new ClassTitle(Launcher.i18n("account").toUpperCase(), Lang.apply(new JFXButton(), button -> {
                     button.setGraphic(SVG.plus(Theme.blackFillBinding(), 10, 10));
                     button.getStyleClass().add("toggle-icon-tiny");
                     button.setOnMouseClicked(e -> addNewAccount());
                 })))
                 .add(accountPane)
-                .startCategory(i18n("launcher").toUpperCase())
+                .startCategory(Launcher.i18n("launcher").toUpperCase())
                 .add(launcherSettingsItem)
-                .add(new ClassTitle(i18n("profile.title").toUpperCase(), Lang.apply(new JFXButton(), button -> {
+                .add(new ClassTitle(Launcher.i18n("profile.title").toUpperCase(), Lang.apply(new JFXButton(), button -> {
                     button.setGraphic(SVG.plus(Theme.blackFillBinding(), 10, 10));
                     button.getStyleClass().add("toggle-icon-tiny");
                     button.setOnMouseClicked(e ->
@@ -121,91 +86,29 @@ public final class LeftPaneController {
                 })))
                 .add(profilePane);
 
-        // ==== 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(AccountLoadingEvent.class).register(this::onAccountsLoading);
         EventBus.EVENT_BUS.channel(ProfileLoadingEvent.class).register(this::onProfilesLoading);
         EventBus.EVENT_BUS.channel(ProfileChangedEvent.class).register(this::onProfileChanged);
         EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).register(this::onRefreshedVersions);
-    }
 
-    // ==== 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();
+        FXUtils.onChangeAndOperate(Settings.INSTANCE.selectedAccountProperty(), this::onSelectedAccountChanged);
+        onAccountsLoading();
     }
 
     private void addNewAccount() {
-        Controllers.dialog(new AddAccountPane());
+        Controllers.dialog(new AddAccountPane(Controllers::closeDialog));
+    }
+
+    private void onSelectedAccountChanged(Account newAccount) {
+        Platform.runLater(() -> {
+            for (Node node : accountPane.getChildren()) {
+                if (node instanceof RipplerContainer && node.getProperties().get("account") instanceof Account) {
+                    boolean current = Objects.equals(node.getProperties().get("account"), newAccount);
+                    ((RipplerContainer) node).setSelected(current);
+                }
+            }
+        });
     }
-    // ====
 
     private void onProfileChanged(ProfileChangedEvent event) {
         Profile profile = event.getProfile();
@@ -215,7 +118,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);
-                    ((AdvancedListItem) ((RipplerContainer) node).getContainer()).setSubtitle(current ? i18n("profile.selected") : "");
+                    ((VersionListItem) ((RipplerContainer) node).getContainer()).setGameVersion(current ? Launcher.i18n("profile.selected") : "");
                 }
             }
         });
@@ -223,11 +126,11 @@ public final class LeftPaneController {
 
     private void onProfilesLoading() {
         LinkedList<RipplerContainer> list = new LinkedList<>();
-        for (Profile profile : Settings.instance().getProfiles()) {
-            AdvancedListItem item = new AdvancedListItem(Profiles.getProfileDisplayName(profile));
+        for (Profile profile : Settings.INSTANCE.getProfiles()) {
+            VersionListItem item = new VersionListItem(Profiles.getProfileDisplayName(profile));
             RipplerContainer ripplerContainer = new RipplerContainer(item);
             item.setOnSettingsButtonClicked(e -> Controllers.getDecorator().showPage(new ProfilePage(profile)));
-            ripplerContainer.setOnMouseClicked(e -> Settings.instance().setSelectedProfile(profile));
+            ripplerContainer.setOnMouseClicked(e -> Settings.INSTANCE.setSelectedProfile(profile));
             ripplerContainer.getProperties().put("profile", profile.getName());
             ripplerContainer.maxWidthProperty().bind(leftPane.widthProperty());
             list.add(ripplerContainer);
@@ -235,6 +138,62 @@ 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 onAccountsLoading() {
+        LinkedList<RipplerContainer> list = new LinkedList<>();
+        Account selectedAccount = Settings.INSTANCE.getSelectedAccount();
+        for (Account account : Settings.INSTANCE.getAccounts()) {
+            VersionListItem item = new VersionListItem(account.getCharacter(), accountType(account));
+            RipplerContainer ripplerContainer = new RipplerContainer(item);
+            item.setOnSettingsButtonClicked(e -> {
+                AccountPage accountPage = new AccountPage(account, item);
+                JFXPopup popup = new JFXPopup(accountPage);
+                accountPage.setOnDelete(popup::hide);
+                popup.show((Node) e.getSource(), JFXPopup.PopupVPosition.TOP, JFXPopup.PopupHPosition.LEFT, e.getX(), e.getY());
+            });
+            ripplerContainer.setOnMouseClicked(e -> {
+                if (e.getButton() == MouseButton.PRIMARY)
+                    Settings.INSTANCE.setSelectedAccount(account);
+            });
+            ripplerContainer.getProperties().put("account", account);
+            ripplerContainer.maxWidthProperty().bind(leftPane.widthProperty());
+
+            if (account instanceof YggdrasilAccount) {
+                Image image = AccountHelper.getSkin((YggdrasilAccount) account, 4);
+                item.setImage(image, AccountHelper.getViewport(4));
+            } else
+                item.setImage(AccountHelper.getDefaultSkin(account, 4), AccountHelper.getViewport(4));
+
+            if (account instanceof AuthlibInjectorAccount)
+                Accounts.getAuthlibInjectorServerNameAsync((AuthlibInjectorAccount) account)
+                    .subscribe(Schedulers.javafx(), variables -> FXUtils.installTooltip(ripplerContainer, 500, 5000, 0, new Tooltip(variables.get("serverName"))));
+
+            if (selectedAccount == account)
+                ripplerContainer.setSelected(true);
+
+            list.add(ripplerContainer);
+        }
+
+        if (Settings.INSTANCE.getAccounts().isEmpty()) {
+            RipplerContainer container = new RipplerContainer(missingAccountItem);
+            missingAccountItem.setOnSettingsButtonClicked(e -> addNewAccount());
+            container.setOnMouseClicked(e -> addNewAccount());
+            list.add(container);
+        }
+
+        Platform.runLater(() -> accountPane.getChildren().setAll(list));
+    }
+
+    public void showUpdate() {
+        launcherSettingsItem.setText(Launcher.i18n("update.found"));
+        launcherSettingsItem.setTextFill(Color.RED);
+    }
+
     private boolean checkedModpack = false;
     private static boolean showNewAccount = true;
 
@@ -252,10 +211,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(), () -> {
-                                        region.get().fireEvent(new DialogCloseEvent());
+                                        Controllers.closeDialog(region.get());
                                         checkAccount();
                                     })).executor();
-                            region.set(Controllers.taskDialog(executor, i18n("modpack.installing"), ""));
+                            region.set(Controllers.taskDialog(executor, Launcher.i18n("modpack.installing"), ""));
                             executor.start();
                             showNewAccount = false;
                         } catch (UnsupportedModpackException ignore) {
@@ -270,4 +229,9 @@ public final class LeftPaneController {
             }
         });
     }
+
+    public void checkAccount() {
+        if (Settings.INSTANCE.getAccounts().isEmpty())
+            addNewAccount();
+    }
 }

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

@@ -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,9 +43,6 @@ 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;
 
 /**
@@ -65,8 +62,8 @@ public final class LogWindow extends Stage {
 
     public LogWindow() {
         setScene(new Scene(impl, 800, 480));
-        getScene().getStylesheets().addAll(config().getTheme().getStylesheets());
-        setTitle(i18n("logwindow.title"));
+        getScene().getStylesheets().addAll(Settings.INSTANCE.getTheme().getStylesheets());
+        setTitle(Launcher.i18n("logwindow.title"));
         getIcons().add(new Image("/assets/img/icon.png"));
     }
 
@@ -177,12 +174,12 @@ public final class LogWindow extends Stage {
 
             engine = webView.getEngine();
             engine.loadContent(Lang.ignoringException(() -> IOUtils.readFullyAsString(getClass().getResourceAsStream("/assets/log-window-content.html")))
-                    .replace("${FONT}", 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));
                 }
@@ -190,14 +187,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)

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

@@ -23,13 +23,12 @@ import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.fxml.FXML;
 import javafx.scene.Node;
-import javafx.scene.control.ScrollPane;
 import javafx.scene.image.Image;
 import javafx.scene.input.MouseButton;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import javafx.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,34 +36,32 @@ 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.construct.TaskExecutorDialogPane;
 import org.jackhuang.hmcl.ui.download.DownloadWizardProvider;
 import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.OperatingSystem;
-import org.jackhuang.hmcl.util.VersionNumber;
+import org.jackhuang.hmcl.util.StringUtils;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Collections;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.Callable;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
 
 import static org.jackhuang.hmcl.util.StringUtils.removePrefix;
 import static org.jackhuang.hmcl.util.StringUtils.removeSuffix;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class MainPage extends StackPane implements DecoratorPage {
 
-    private final StringProperty title = new SimpleStringProperty(this, "title", i18n("main_page"));
+    private final StringProperty title = new SimpleStringProperty(this, "title", Launcher.i18n("main_page"));
 
     private Profile profile;
 
@@ -78,8 +75,6 @@ public final class MainPage extends StackPane implements DecoratorPage {
     private JFXSpinner spinner;
     @FXML
     private JFXMasonryPane masonryPane;
-    @FXML
-    private ScrollPane scrollPane;
 
     {
         FXUtils.loadFXML(this, "/assets/fxml/main.fxml");
@@ -92,68 +87,64 @@ public final class MainPage extends StackPane implements DecoratorPage {
         });
         EventBus.EVENT_BUS.channel(RefreshingVersionsEvent.class).register(event -> {
             if (event.getSource() == profile.getRepository())
-                // This will occupy 0.5s. Too slow!
-                JFXUtilities.runInFX(this::loadingVersions);
+                JFXUtilities.runInFXAndWait(this::loadingVersions);
         });
         EventBus.EVENT_BUS.channel(ProfileChangedEvent.class).register(event -> {
             this.profile = event.getProfile();
         });
 
-        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"));
+        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"));
     }
 
     private String modifyVersion(String gameVersion, String version) {
         return removeSuffix(removePrefix(removeSuffix(removePrefix(version.replace(gameVersion, "").trim(), "-"), "-"), "_"), "_");
     }
 
-    private Node buildNode(HMCLGameRepository repository, Version version, Callable<String> gameCallable) {
+    private Node buildNode(HMCLGameRepository repository, Version version, String game) {
         Profile profile = repository.getProfile();
         String id = version.getId();
         VersionItem item = new VersionItem();
         item.setUpdate(repository.isModpack(id));
-        Task.ofResult("game", gameCallable).subscribe(Schedulers.javafx(), vars -> {
-            String game = vars.get("game");
-            item.setGameVersion(game);
-
-            StringBuilder libraries = new StringBuilder();
-            for (Library library : version.getLibraries()) {
-                if (library.getGroupId().equalsIgnoreCase("net.minecraftforge") && library.getArtifactId().equalsIgnoreCase("forge")) {
-                    libraries.append(i18n("install.installer.forge")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)forge", ""))).append("\n");
-                }
-                if (library.getGroupId().equalsIgnoreCase("com.mumfrey") && library.getArtifactId().equalsIgnoreCase("liteloader")) {
-                    libraries.append(i18n("install.installer.liteloader")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)liteloader", ""))).append("\n");
-                }
-                if (library.getGroupId().equalsIgnoreCase("net.optifine") && library.getArtifactId().equalsIgnoreCase("optifine")) {
-                    libraries.append(i18n("install.installer.optifine")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)optifine", ""))).append("\n");
-                }
-            }
-
-            item.setLibraries(libraries.toString());
-        });
+        item.setGameVersion(game);
         item.setVersionName(id);
+
+        StringBuilder libraries = new StringBuilder();
+        for (Library library : version.getLibraries()) {
+            if (library.getGroupId().equalsIgnoreCase("net.minecraftforge") && library.getArtifactId().equalsIgnoreCase("forge")) {
+                libraries.append(Launcher.i18n("install.installer.forge")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)forge", ""))).append("\n");
+            }
+            if (library.getGroupId().equalsIgnoreCase("com.mumfrey") && library.getArtifactId().equalsIgnoreCase("liteloader")) {
+                libraries.append(Launcher.i18n("install.installer.liteloader")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)liteloader", ""))).append("\n");
+            }
+            if (library.getGroupId().equalsIgnoreCase("net.optifine") && library.getArtifactId().equalsIgnoreCase("optifine")) {
+                libraries.append(Launcher.i18n("install.installer.optifine")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)optifine", ""))).append("\n");
+            }
+        }
+
+        item.setLibraries(libraries.toString());
         item.setOnLaunchButtonClicked(e -> {
-            if (Accounts.getSelectedAccount() == null)
+            if (Settings.INSTANCE.getSelectedAccount() == null)
                 Controllers.getLeftPaneController().checkAccount();
             else
-                LauncherHelper.INSTANCE.launch(profile, Accounts.getSelectedAccount(), id, null);
+                LauncherHelper.INSTANCE.launch(profile, Settings.INSTANCE.getSelectedAccount(), id, null);
         });
         item.setOnScriptButtonClicked(e -> {
-            if (Accounts.getSelectedAccount() == null)
-                Controllers.dialog(i18n("login.empty_username"));
+            if (Settings.INSTANCE.getSelectedAccount() == null)
+                Controllers.dialog(Launcher.i18n("login.empty_username"));
             else {
                 FileChooser chooser = new FileChooser();
                 if (repository.getRunDirectory(id).isDirectory())
                     chooser.setInitialDirectory(repository.getRunDirectory(id));
-                chooser.setTitle(i18n("version.launch_script.save"));
+                chooser.setTitle(Launcher.i18n("version.launch_script.save"));
                 chooser.getExtensionFilters().add(OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS
-                        ? new FileChooser.ExtensionFilter(i18n("extension.bat"), "*.bat")
-                        : new FileChooser.ExtensionFilter(i18n("extension.sh"), "*.sh"));
+                        ? new FileChooser.ExtensionFilter(Launcher.i18n("extension.bat"), "*.bat")
+                        : new FileChooser.ExtensionFilter(Launcher.i18n("extension.sh"), "*.sh"));
                 File file = chooser.showSaveDialog(Controllers.getStage());
                 if (file != null)
-                    LauncherHelper.INSTANCE.launch(profile, Accounts.getSelectedAccount(), id, file);
+                    LauncherHelper.INSTANCE.launch(profile, Settings.INSTANCE.getSelectedAccount(), id, file);
             }
         });
         item.setOnSettingsButtonClicked(e -> {
@@ -162,25 +153,25 @@ public final class MainPage extends StackPane implements DecoratorPage {
         });
         item.setOnUpdateButtonClicked(event -> {
             FileChooser chooser = new FileChooser();
-            chooser.setTitle(i18n("modpack.choose"));
-            chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("modpack"), "*.zip"));
+            chooser.setTitle(Launcher.i18n("modpack.choose"));
+            chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(Launcher.i18n("modpack"), "*.zip"));
             File selectedFile = chooser.showOpenDialog(Controllers.getStage());
             if (selectedFile != null) {
                 AtomicReference<Region> region = new AtomicReference<>();
                 try {
                     TaskExecutor executor = ModpackHelper.getUpdateTask(profile, selectedFile, id, ModpackHelper.readModpackConfiguration(repository.getModpackConfiguration(id)))
-                            .then(Task.of(Schedulers.javafx(), () -> region.get().fireEvent(new DialogCloseEvent()))).executor();
-                    region.set(Controllers.taskDialog(executor, i18n("modpack.update"), ""));
+                            .then(Task.of(Schedulers.javafx(), () -> Controllers.closeDialog(region.get()))).executor();
+                    region.set(Controllers.taskDialog(executor, Launcher.i18n("modpack.update"), ""));
                     executor.start();
                 } catch (UnsupportedModpackException e) {
-                    region.get().fireEvent(new DialogCloseEvent());
-                    Controllers.dialog(i18n("modpack.unsupported"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
+                    Controllers.closeDialog(region.get());
+                    Controllers.dialog(Launcher.i18n("modpack.unsupported"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE);
                 } catch (MismatchedModpackTypeException e) {
-                    region.get().fireEvent(new DialogCloseEvent());
-                    Controllers.dialog(i18n("modpack.mismatched_type"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
-                } catch (IOException e) {
-                    region.get().fireEvent(new DialogCloseEvent());
-                    Controllers.dialog(i18n("modpack.invalid"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
+                    Controllers.closeDialog(region.get());
+                    Controllers.dialog(Launcher.i18n("modpack.mismatched_type"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE);
+                } catch (IOException e)  {
+                    Controllers.closeDialog(region.get());
+                    Controllers.dialog(Launcher.i18n("modpack.invalid"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE);
                 }
             }
         });
@@ -191,12 +182,12 @@ public final class MainPage extends StackPane implements DecoratorPage {
                 versionList.getStyleClass().add("option-list-view");
                 FXUtils.setLimitWidth(versionList, 150);
                 versionList.getItems().setAll(Lang.immutableListOf(
-                        i18n("version.manage.rename"),
-                        i18n("version.manage.remove"),
-                        i18n("modpack.export"),
-                        i18n("folder.game")
+                        Launcher.i18n("version.manage.rename"),
+                        Launcher.i18n("version.manage.remove"),
+                        Launcher.i18n("modpack.export"),
+                        Launcher.i18n("folder.game")
                 ));
-                versionList.setOnMouseClicked(e -> {
+                versionList.setOnMouseClicked(e ->{
                     versionPopup.hide();
                     switch (versionList.getSelectionModel().getSelectedIndex()) {
                         case 0:
@@ -213,14 +204,13 @@ public final class MainPage extends StackPane implements DecoratorPage {
                             break;
                         default:
                             break;
-                    }
-                });
+                    }});
                 versionPopup.show(item, JFXPopup.PopupVPosition.TOP, JFXPopup.PopupHPosition.LEFT, event.getX(), event.getY());
             } else if (event.getButton() == MouseButton.PRIMARY && event.getClickCount() == 2) {
-                if (Accounts.getSelectedAccount() == null)
-                    Controllers.dialog(i18n("login.empty_username"));
+                if (Settings.INSTANCE.getSelectedAccount() == null)
+                    Controllers.dialog(Launcher.i18n("login.empty_username"));
                 else
-                    LauncherHelper.INSTANCE.launch(profile, Accounts.getSelectedAccount(), id, null);
+                    LauncherHelper.INSTANCE.launch(profile, Settings.INSTANCE.getSelectedAccount(), id, null);
             }
         });
         File iconFile = repository.getVersionIcon(id);
@@ -231,18 +221,18 @@ public final class MainPage extends StackPane implements DecoratorPage {
 
     private void loadingVersions() {
         getChildren().setAll(spinner);
-        masonryPane.getChildren().clear();
+        FXUtils.resetChildren(masonryPane, Collections.emptyList());
     }
 
     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());
+        List<Node> children = new LinkedList<>();
+        for (Version version : repository.getVersions()) {
+            children.add(buildNode(repository, version, GameVersion.minecraftVersion(repository.getVersionJar(version.getId())).orElse("Unknown")));
+        }
         JFXUtilities.runInFX(() -> {
             if (profile == repository.getProfile()) {
-                masonryPane.getChildren().setAll(children);
                 getChildren().setAll(contentPane);
+                FXUtils.resetChildren(masonryPane, children);
             }
         });
     }

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

@@ -26,23 +26,21 @@ 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;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.logging.Level;
-import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public final class ModController {
     @FXML
@@ -70,22 +68,21 @@ public final class ModController {
         });
 
         rootPane.setOnDragDropped(event -> {
-            List<File> files = event.getDragboard().getFiles();
-            if (files != null) {
-                Collection<File> mods = files.stream()
-                        .filter(it -> Arrays.asList("jar", "zip", "litemod").contains(FileUtils.getExtension(it)))
-                        .collect(Collectors.toList());
-                if (!mods.isEmpty()) {
-                    mods.forEach(it -> {
-                        try {
-                            modManager.addMod(versionId, it);
-                        } catch (IOException | IllegalArgumentException e) {
-                            Logging.LOG.log(Level.WARNING, "Unable to parse mod file " + it, e);
-                        }
-                    });
-                    loadMods(modManager, versionId);
-                    event.setDropCompleted(true);
-                }
+            List<File> mods = event.getDragboard().getFiles();
+            Stream<File> stream = null;
+            if (mods != null)
+                stream = mods.stream()
+                        .filter(it -> Arrays.asList("jar", "zip", "litemod").contains(FileUtils.getExtension(it)));
+            if (stream != null && stream.findAny().isPresent()) {
+                stream.forEach(it -> {
+                    try {
+                        modManager.addMod(versionId, it);
+                    } catch (IOException | IllegalArgumentException e) {
+                        Logging.LOG.log(Level.WARNING, "Unable to parse mod file " + it, e);
+                    }
+                });
+                loadMods(modManager, versionId);
+                event.setDropCompleted(true);
             }
             event.consume();
         });
@@ -140,8 +137,8 @@ public final class ModController {
     @FXML
     private void onAdd() {
         FileChooser chooser = new FileChooser();
-        chooser.setTitle(i18n("mods.choose_mod"));
-        chooser.getExtensionFilters().setAll(new FileChooser.ExtensionFilter(i18n("extension.mod"), "*.jar", "*.zip", "*.litemod"));
+        chooser.setTitle(Launcher.i18n("mods.choose_mod"));
+        chooser.getExtensionFilters().setAll(new FileChooser.ExtensionFilter(Launcher.i18n("extension.mod"), "*.jar", "*.zip", "*.litemod"));
         List<File> res = chooser.showOpenMultipleDialog(Controllers.getStage());
 
         // It's guaranteed that succeeded and failed are thread safe here.
@@ -163,10 +160,10 @@ public final class ModController {
         }).with(Task.of(Schedulers.javafx(), variables -> {
             List<String> prompt = new LinkedList<>();
             if (!succeeded.isEmpty())
-                prompt.add(i18n("mods.add.success", String.join(", ", succeeded)));
+                prompt.add(Launcher.i18n("mods.add.success", String.join(", ", succeeded)));
             if (!failed.isEmpty())
-                prompt.add(i18n("mods.add.failed", String.join(", ", failed)));
-            Controllers.dialog(String.join("\n", prompt), i18n("mods.add"));
+                prompt.add(Launcher.i18n("mods.add.failed", String.join(", ", failed)));
+            Controllers.dialog(String.join("\n", prompt), Launcher.i18n("mods.add"));
             loadMods(modManager, versionId);
         })).start();
     }

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

@@ -17,18 +17,14 @@
  */
 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;
 
@@ -44,9 +40,7 @@ public final class ModItem extends BorderPane {
         setCenter(modItem);
 
         JFXButton btnRemove = new JFXButton();
-        JFXUtilities.runInFX(() -> {
-            FXUtils.installTooltip(btnRemove, i18n("mods.remove"));
-        });
+        FXUtils.installTooltip(btnRemove, Launcher.i18n("mods.remove"));
         btnRemove.setOnMouseClicked(e -> deleteCallback.accept(this));
         btnRemove.getStyleClass().add("toggle-icon4");
         BorderPane.setAlignment(btnRemove, Pos.CENTER);
@@ -56,14 +50,7 @@ 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());
-        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());
+        modItem.setSubtitle(info.getName() + ", " + Launcher.i18n("archive.version") + ": " + info.getVersion() + ", " + Launcher.i18n("archive.game_version") + ": " + info.getGameVersion() + ", " + Launcher.i18n("archive.author") + ": " + info.getAuthors());
         chkEnabled.setSelected(info.isActive());
         chkEnabled.selectedProperty().addListener((a, b, newValue) ->
                 info.activeProperty().set(newValue));

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

@@ -18,20 +18,18 @@
 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;
@@ -41,11 +39,12 @@ 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.
@@ -55,7 +54,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 ? i18n("profile.new") : i18n("profile") + " - " + profileDisplayName);
+                profile == null ? Launcher.i18n("profile.new") : Launcher.i18n("profile") + " - " + profileDisplayName);
         location = new SimpleStringProperty(this, "location",
                 Optional.ofNullable(profile).map(Profile::getGameDir).map(File::getAbsolutePath).orElse(""));
 
@@ -65,22 +64,19 @@ public final class ProfilePage extends StackPane implements DecoratorPage {
         FXUtils.onChangeAndOperate(txtProfileName.textProperty(), it -> {
             btnSave.setDisable(!txtProfileName.validate() || StringUtils.isBlank(getLocation()));
         });
-        gameDir.pathProperty().bindBidirectional(location);
+        gameDir.setProperty(location);
         FXUtils.onChangeAndOperate(location, it -> {
             btnSave.setDisable(!txtProfileName.validate() || StringUtils.isBlank(getLocation()));
         });
-        gameDir.convertToRelativePathProperty().bind(toggleUseRelativePath.selectedProperty());
-        if (profile == null) {
+
+        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);
         }
     }
@@ -89,20 +85,16 @@ public final class ProfilePage extends StackPane implements DecoratorPage {
     private void onSave() {
         if (profile != null) {
             profile.setName(txtProfileName.getText());
-            profile.setUseRelativePath(toggleUseRelativePath.isSelected());
-            if (StringUtils.isNotBlank(getLocation())) {
+            if (StringUtils.isNotBlank(getLocation()))
                 profile.setGameDir(new File(getLocation()));
-            }
         } else {
             if (StringUtils.isBlank(getLocation())) {
                 gameDir.onExplore();
             }
-            Profile newProfile = new Profile(txtProfileName.getText(), new File(getLocation()));
-            newProfile.setUseRelativePath(toggleUseRelativePath.isSelected());
-            Settings.instance().putProfile(newProfile);
+            Settings.INSTANCE.putProfile(new Profile(txtProfileName.getText(), new File(getLocation())));
         }
 
-        Settings.instance().onProfileLoading();
+        Settings.INSTANCE.onProfileLoading();
         Controllers.navigate(null);
     }
 

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

@@ -20,12 +20,6 @@ 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;
@@ -33,37 +27,29 @@ 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 javafx.scene.text.Text;
+import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.setting.*;
-import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.ui.construct.FileItem;
 import org.jackhuang.hmcl.ui.construct.FontComboBox;
 import org.jackhuang.hmcl.ui.construct.MultiFileItem;
 import org.jackhuang.hmcl.ui.construct.Validator;
 import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
-import org.jackhuang.hmcl.upgrade.UpdateChannel;
-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.Objects;
-import java.util.Optional;
+import java.util.stream.Collectors;
 
 public final class SettingsPage extends StackPane implements DecoratorPage {
-    private final StringProperty title = new SimpleStringProperty(this, "title", i18n("settings.launcher"));
+    private final StringProperty title = new SimpleStringProperty(this, "title", Launcher.i18n("settings.launcher"));
 
     @FXML
     private JFXTextField txtProxyHost;
@@ -82,7 +68,7 @@ public final class SettingsPage extends StackPane implements DecoratorPage {
     @FXML
     private FontComboBox cboFont;
     @FXML
-    private MultiFileItem<EnumCommonDirectory> fileCommonLocation;
+    private FileItem fileCommonLocation;
     @FXML
     private Label lblDisplay;
     @FXML
@@ -90,21 +76,17 @@ 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<EnumBackgroundImage> backgroundItem;
+    private MultiFileItem backgroundItem;
     @FXML
     private StackPane themeColorPickerContainer;
     @FXML
-    private JFXCheckBox chkDisableProxy;
+    private JFXRadioButton chkNoProxy;
+    @FXML
+    private JFXRadioButton chkManualProxy;
     @FXML
     private JFXRadioButton chkProxyHttp;
     @FXML
@@ -116,181 +98,128 @@ 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);
 
-        cboDownloadSource.getSelectionModel().select(DownloadProviders.DOWNLOAD_PROVIDERS.indexOf(Settings.instance().getDownloadProvider()));
-        cboDownloadSource.getSelectionModel().selectedIndexProperty().addListener((a, b, newValue) -> Settings.instance().setDownloadProvider(DownloadProviders.getDownloadProvider(newValue.intValue())));
+        txtProxyHost.setText(Settings.INSTANCE.getProxyHost());
+        txtProxyHost.textProperty().addListener((a, b, newValue) -> Settings.INSTANCE.setProxyHost(newValue));
 
-        cboFont.getSelectionModel().select(Settings.instance().getFont().getFamily());
+        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.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(config().getLocalization().getResourceBundle())));
+            list.add(new Label(locale.getName(Settings.INSTANCE.getLocale().getResourceBundle())));
 
         cboLanguage.setItems(list);
-        cboLanguage.getSelectionModel().select(Locales.LOCALES.indexOf(config().getLocalization()));
-        cboLanguage.getSelectionModel().selectedIndexProperty().addListener((a, b, newValue) -> config().setLocalization(Locales.getLocale(newValue.intValue())));
+        cboLanguage.getSelectionModel().select(Locales.LOCALES.indexOf(Settings.INSTANCE.getLocale()));
+        cboLanguage.getSelectionModel().selectedIndexProperty().addListener((a, b, newValue) -> Settings.INSTANCE.setLocale(Locales.getLocale(newValue.intValue())));
 
-        // ==== Proxy ====
-        txtProxyHost.textProperty().bindBidirectional(config().proxyHostProperty());
-        txtProxyPort.textProperty().bindBidirectional(config().proxyPortProperty());
-        txtProxyUsername.textProperty().bindBidirectional(config().proxyUserProperty());
-        txtProxyPassword.textProperty().bindBidirectional(config().proxyPassProperty());
-
-        proxyPane.disableProperty().bind(chkDisableProxy.selectedProperty());
-        authPane.disableProperty().bind(chkProxyAuthentication.selectedProperty().not());
-
-        chkDisableProxy.setSelected(!config().hasProxy());
-        chkDisableProxy.selectedProperty().addListener(o -> config().setHasProxy(!chkDisableProxy.isSelected()));
-        config().hasProxyProperty().addListener(o -> chkDisableProxy.setSelected(!config().hasProxy()));
-        chkProxyAuthentication.selectedProperty().bindBidirectional(config().hasProxyAuthProperty());
-
-        selectedProxyType = new SimpleObjectProperty<Proxy.Type>(Proxy.Type.HTTP) {
-            {
-                invalidated();
-            }
-
-            @Override
-            protected void invalidated() {
-                Proxy.Type type = Objects.requireNonNull(get());
-                if (type == Proxy.Type.DIRECT) {
-                    set(Proxy.Type.HTTP); // HTTP by default
-                } else {
-                    chkProxyHttp.setSelected(type == Proxy.Type.HTTP);
-                    chkProxySocks.setSelected(type == Proxy.Type.SOCKS);
-                }
-            }
-        };
-        selectedProxyType.bindBidirectional(config().proxyTypeProperty());
 
         ToggleGroup proxyConfigurationGroup = new ToggleGroup();
         chkProxyHttp.setUserData(Proxy.Type.HTTP);
         chkProxyHttp.setToggleGroup(proxyConfigurationGroup);
         chkProxySocks.setUserData(Proxy.Type.SOCKS);
         chkProxySocks.setToggleGroup(proxyConfigurationGroup);
-        proxyConfigurationGroup.getToggles().forEach(
-                toggle -> toggle.selectedProperty().addListener((observable, oldValue, newValue) -> {
-                    if (newValue) {
-                        selectedProxyType.set((Proxy.Type) toggle.getUserData());
-                    }
-                }));
-        // ====
 
-        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()));
+        for (Toggle toggle : proxyConfigurationGroup.getToggles())
+            if (toggle.getUserData() == Settings.INSTANCE.getProxyType())
+                toggle.setSelected(true);
 
-        // ==== Update ====
-        FXUtils.installTooltip(btnUpdate, i18n("update.tooltip"));
-        updateListener = any -> {
-            btnUpdate.setVisible(UpdateChecker.isOutdated());
+        ToggleGroup hasProxyGroup = new ToggleGroup();
+        chkNoProxy.setToggleGroup(hasProxyGroup);
+        chkManualProxy.setToggleGroup(hasProxyGroup);
+        if (!Settings.INSTANCE.hasProxy())
+            chkNoProxy.setSelected(true);
+        else
+            chkManualProxy.setSelected(true);
+        proxyPane.disableProperty().bind(chkNoProxy.selectedProperty());
 
-            if (UpdateChecker.isOutdated()) {
-                lblUpdateSub.setText(i18n("update.newest_version", UpdateChecker.getLatestVersion().getVersion()));
-                lblUpdateSub.getStyleClass().setAll("update-label");
+        hasProxyGroup.selectedToggleProperty().addListener((a, b, newValue) ->
+                Settings.INSTANCE.setHasProxy(newValue != chkNoProxy));
 
-                lblUpdate.setText(i18n("update.found"));
-                lblUpdate.getStyleClass().setAll("update-label");
-            } else if (UpdateChecker.isCheckingUpdate()) {
-                lblUpdateSub.setText(i18n("update.checking"));
-                lblUpdateSub.getStyleClass().setAll("subtitle-label");
+        proxyConfigurationGroup.selectedToggleProperty().addListener((a, b, newValue) ->
+                Settings.INSTANCE.setProxyType((Proxy.Type) newValue.getUserData()));
 
-                lblUpdate.setText(i18n("update"));
-                lblUpdate.getStyleClass().setAll();
-            } else {
-                lblUpdateSub.setText(i18n("update.latest"));
-                lblUpdateSub.getStyleClass().setAll("subtitle-label");
+        chkProxyAuthentication.setSelected(Settings.INSTANCE.hasProxyAuth());
+        chkProxyAuthentication.selectedProperty().addListener((a, b, newValue) -> Settings.INSTANCE.setHasProxyAuth(newValue));
+        authPane.disableProperty().bind(chkProxyAuthentication.selectedProperty().not());
 
-                lblUpdate.setText(i18n("update"));
-                lblUpdate.getStyleClass().setAll();
-            }
-        };
-        UpdateChecker.latestVersionProperty().addListener(new WeakInvalidationListener(updateListener));
-        UpdateChecker.outdatedProperty().addListener(new WeakInvalidationListener(updateListener));
-        UpdateChecker.checkingUpdateProperty().addListener(new WeakInvalidationListener(updateListener));
-        updateListener.invalidated(null);
+        fileCommonLocation.setProperty(Settings.INSTANCE.commonPathProperty());
 
-        lblUpdateNote.setWrappingWidth(470);
+        FXUtils.installTooltip(btnUpdate, Launcher.i18n("update.tooltip"));
+        checkUpdate();
 
-        ObjectProperty<UpdateChannel> updateChannel = new SimpleObjectProperty<UpdateChannel>() {
-            @Override
-            protected void invalidated() {
-                UpdateChannel updateChannel = Objects.requireNonNull(get());
-                chkUpdateDev.setSelected(updateChannel == UpdateChannel.DEVELOPMENT);
-                chkUpdateStable.setSelected(updateChannel == UpdateChannel.STABLE);
-            }
-        };
-
-        ToggleGroup updateChannelGroup = new ToggleGroup();
-        chkUpdateDev.setToggleGroup(updateChannelGroup);
-        chkUpdateDev.setUserData(UpdateChannel.DEVELOPMENT);
-        chkUpdateStable.setToggleGroup(updateChannelGroup);
-        chkUpdateStable.setUserData(UpdateChannel.STABLE);
-        updateChannelGroup.getToggles().forEach(
-                toggle -> toggle.selectedProperty().addListener((observable, oldValue, newValue) -> {
-                    if (newValue) {
-                        updateChannel.set((UpdateChannel) toggle.getUserData());
-                    }
-                }));
-        updateChannel.bindBidirectional(ConfigHolder.config().updateChannelProperty());
-        // ====
-
-        // ==== Background ====
+        // background
         backgroundItem.loadChildren(Collections.singletonList(
-                backgroundItem.createChildren(i18n("launcher.background.default"), EnumBackgroundImage.DEFAULT)
-        ), EnumBackgroundImage.CUSTOM);
-        backgroundItem.customTextProperty().bindBidirectional(config().backgroundImageProperty());
-        backgroundItem.selectedDataProperty().bindBidirectional(config().backgroundImageTypeProperty());
-        backgroundItem.subtitleProperty().bind(
-                new When(backgroundItem.selectedDataProperty().isEqualTo(EnumBackgroundImage.DEFAULT))
-                        .then(i18n("launcher.background.default"))
-                        .otherwise(config().backgroundImageProperty()));
-        // ====
+                backgroundItem.createChildren(Launcher.i18n("launcher.background.default"), EnumBackgroundImage.DEFAULT)
+        ));
 
-        // ==== Theme ====
-        JFXColorPicker picker = new JFXColorPicker(Color.web(config().getTheme().getColor()), null);
-        picker.setCustomColorText(i18n("color.custom"));
-        picker.setRecentColorsText(i18n("color.recent"));
-        picker.getCustomColors().setAll(Theme.SUGGESTED_COLORS);
+        FXUtils.bindString(backgroundItem.getTxtCustom(), Settings.INSTANCE.backgroundImageProperty());
+
+        backgroundItem.setCustomUserData(EnumBackgroundImage.CUSTOM);
+        backgroundItem.getGroup().getToggles().stream().filter(it -> it.getUserData() == Settings.INSTANCE.getBackgroundImageType()).findFirst().ifPresent(it -> it.setSelected(true));
+
+        Settings.INSTANCE.backgroundImageProperty().setChangedListener(it -> initBackgroundItemSubtitle());
+        Settings.INSTANCE.backgroundImageTypeProperty().setChangedListener(it -> initBackgroundItemSubtitle());
+        initBackgroundItemSubtitle();
+
+        backgroundItem.setToggleSelectedListener(newValue ->
+                Settings.INSTANCE.setBackgroundImageType((EnumBackgroundImage) newValue.getUserData()));
+
+        // theme
+        JFXColorPicker picker = new JFXColorPicker(Color.web(Settings.INSTANCE.getTheme().getColor()), null);
+        picker.setCustomColorText(Launcher.i18n("color.custom"));
+        picker.setRecentColorsText(Launcher.i18n("color.recent"));
+        picker.getCustomColors().setAll(Arrays.stream(Theme.VALUES).map(Theme::getColor).map(Color::web).collect(Collectors.toList()));
         picker.setOnAction(e -> {
             Theme theme = Theme.custom(Theme.getColorDisplayName(picker.getValue()));
-            config().setTheme(theme);
+            Settings.INSTANCE.setTheme(theme);
             Controllers.getScene().getStylesheets().setAll(theme.getStylesheets());
         });
         themeColorPickerContainer.getChildren().setAll(picker);
         Platform.runLater(() -> JFXDepthManager.setDepth(picker, 0));
-        // ====
+    }
+
+    private void initBackgroundItemSubtitle() {
+        switch (Settings.INSTANCE.getBackgroundImageType()) {
+            case DEFAULT:
+                backgroundItem.setSubtitle(Launcher.i18n("launcher.background.default"));
+                break;
+            case CUSTOM:
+                backgroundItem.setSubtitle(Settings.INSTANCE.getBackgroundImage());
+                break;
+        }
     }
 
     public String getTitle() {
@@ -306,12 +235,26 @@ 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() {
-        RemoteVersion target = UpdateChecker.getLatestVersion();
-        if (target == null) {
-            return;
-        }
-        UpdateHandler.updateFrom(target);
+        Launcher.UPDATE_CHECKER.checkOutdate();
     }
 }

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

@@ -1,20 +1,3 @@
-/*
- * 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;

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

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

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

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hmcl.ui.construct;
+package org.jackhuang.hmcl.ui;
 
 import com.jfoenix.controls.JFXButton;
 import javafx.event.EventHandler;
@@ -26,28 +26,27 @@ 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 AdvancedListItem extends StackPane {
+public final class VersionListItem extends StackPane {
     @FXML
     private StackPane imageViewContainer;
     @FXML
-    private Label lblTitle;
+    private Label lblVersionName;
     @FXML
-    private Label lblSubtitle;
+    private Label lblGameVersion;
     @FXML
     private ImageView imageView;
     @FXML private JFXButton btnSettings;
 
-    public AdvancedListItem(String title) {
-        this(title, "");
+    public VersionListItem(String versionName) {
+        this(versionName, "");
     }
 
-    public AdvancedListItem(String title, String subtitle) {
-        FXUtils.loadFXML(this, "/assets/fxml/advanced-list-item.fxml");
+    public VersionListItem(String versionName, String gameVersion) {
+        FXUtils.loadFXML(this, "/assets/fxml/version-list-item.fxml");
 
-        lblTitle.setText(title);
-        lblSubtitle.setText(subtitle);
+        lblVersionName.setText(versionName);
+        lblGameVersion.setText(gameVersion);
 
         FXUtils.limitSize(imageView, 32, 32);
     }
@@ -56,12 +55,12 @@ public final class AdvancedListItem extends StackPane {
         btnSettings.setOnMouseClicked(handler);
     }
 
-    public void setTitle(String title) {
-        lblTitle.setText(title);
+    public void setVersionName(String versionName) {
+        lblVersionName.setText(versionName);
     }
 
-    public void setSubtitle(String subtitle) {
-        lblSubtitle.setText(subtitle);
+    public void setGameVersion(String gameVersion) {
+        lblGameVersion.setText(gameVersion);
     }
 
     public void setImage(Image image, Rectangle2D viewport) {

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

@@ -26,8 +26,8 @@ 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.EnumGameDirectory;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.ui.export.ExportWizardProvider;
 import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
@@ -35,8 +35,6 @@ import org.jackhuang.hmcl.util.FileUtils;
 
 import java.io.File;
 
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
 public final class VersionPage extends StackPane implements DecoratorPage {
     private final StringProperty title = new SimpleStringProperty(this, "title", null);
 
@@ -81,17 +79,17 @@ public final class VersionPage extends StackPane implements DecoratorPage {
         browsePopup = new JFXPopup(browseList);
         managementPopup = new JFXPopup(managementList);
 
-        FXUtils.installTooltip(btnDelete, i18n("version.manage.remove"));
-        FXUtils.installTooltip(btnBrowseMenu, i18n("settings.game.exploration"));
-        FXUtils.installTooltip(btnManagementMenu, i18n("settings.game.management"));
-        FXUtils.installTooltip(btnExport, i18n("modpack.export"));
+        FXUtils.installTooltip(btnDelete, Launcher.i18n("version.manage.remove"));
+        FXUtils.installTooltip(btnBrowseMenu, Launcher.i18n("settings.game.exploration"));
+        FXUtils.installTooltip(btnManagementMenu, Launcher.i18n("settings.game.management"));
+        FXUtils.installTooltip(btnExport, Launcher.i18n("modpack.export"));
     }
 
     public void load(String id, Profile profile) {
         this.version = id;
         this.profile = profile;
 
-        title.set(i18n("settings.game") + " - " + id);
+        title.set(Launcher.i18n("settings.game") + " - " + id);
 
         versionSettingsController.loadVersionSetting(profile, id);
         modController.setParentTab(tabPane);
@@ -148,7 +146,7 @@ public final class VersionPage extends StackPane implements DecoratorPage {
                 sub = "saves";
                 break;
             default:
-                return;
+                throw new RuntimeException();
         }
         FXUtils.openFolder(new File(profile.getRepository().getRunDirectory(version), sub));
     }
@@ -187,12 +185,7 @@ public final class VersionPage extends StackPane implements DecoratorPage {
     }
 
     public static void deleteVersion(Profile profile, String version) {
-        boolean isIndependent = profile.getVersionSetting(version).getGameDirType() == EnumGameDirectory.VERSION_FOLDER;
-        boolean isMovingToTrashSupported = FileUtils.isMovingToTrashSupported();
-        String message = isIndependent ? i18n("version.manage.remove.confirm.independent", version) :
-                isMovingToTrashSupported ? i18n("version.manage.remove.confirm.trash", version, version + "_removed") :
-                        i18n("version.manage.remove.confirm", version);
-        Controllers.confirmDialog(message, i18n("message.confirm"), () -> {
+        Controllers.confirmDialog(Launcher.i18n("version.manage.remove.confirm", version), Launcher.i18n("message.confirm"), () -> {
             if (profile.getRepository().removeVersionFromDisk(version)) {
                 profile.getRepository().refreshVersionsAsync().start();
                 Controllers.navigate(null);
@@ -201,18 +194,15 @@ public final class VersionPage extends StackPane implements DecoratorPage {
     }
 
     public static void renameVersion(Profile profile, String version) {
-        Controllers.inputDialog(i18n("version.manage.rename.message"), (res, resolve, reject) -> {
+        Controllers.inputDialog(Launcher.i18n("version.manage.rename.message"), res -> {
             if (profile.getRepository().renameVersion(version, res)) {
                 profile.getRepository().refreshVersionsAsync().start();
                 Controllers.navigate(null);
-                resolve.run();
-            } else {
-                reject.accept(i18n("version.manage.rename.fail"));
             }
-        }).setInitialText(version);
+        });
     }
 
     public static void exportVersion(Profile profile, String version) {
-        Controllers.getDecorator().startWizard(new ExportWizardProvider(profile, version), i18n("modpack.wizard"));
+        Controllers.getDecorator().startWizard(new ExportWizardProvider(profile, version), Launcher.i18n("modpack.wizard"));
     }
 }

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

@@ -22,15 +22,15 @@ 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.Node;
 import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.Toggle;
 import javafx.scene.image.Image;
 import javafx.scene.layout.VBox;
 import javafx.stage.FileChooser;
-
+import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.setting.EnumGameDirectory;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.VersionSetting;
@@ -40,13 +40,12 @@ 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.Collection;
+import java.util.Optional;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
@@ -54,7 +53,6 @@ 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;
@@ -72,47 +70,43 @@ 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<Boolean> globalItem;
-    @FXML private MultiFileItem<JavaVersion> javaItem;
-    @FXML private MultiFileItem<EnumGameDirectory> gameDirItem;
+    @FXML private MultiFileItem globalItem;
+    @FXML private MultiFileItem javaItem;
+    @FXML private MultiFileItem gameDirItem;
     @FXML private JFXToggleButton chkShowLogs;
     @FXML private ImagePickerItem iconPickerItem;
 
     @FXML
     private void initialize() {
-        lblPhysicalMemory.setText(i18n("settings.physical_memory") + ": " + OperatingSystem.TOTAL_MEMORY + "MB");
+        lblPhysicalMemory.setText(Launcher.i18n("settings.physical_memory") + ": " + OperatingSystem.TOTAL_MEMORY + "MB");
 
         FXUtils.smoothScrolling(scroll);
 
-        Task.of(variables -> variables.set("list", JavaVersion.getJREs()))
-                .subscribe(Schedulers.javafx(), variables -> {
-                    javaItem.loadChildren(
-                            (variables.<List<JavaVersion>>get("list")).stream()
-                                    .map(javaVersion -> javaItem.createChildren(javaVersion.getVersion(), javaVersion.getBinary().getAbsolutePath(), javaVersion))
-                                    .collect(Collectors.toList()));
-                    javaItemsLoaded = true;
-                    initializeSelectedJava();
-                });
+        Task.of(variables -> variables.set("list", JavaVersion.getJREs().values().stream().map(javaVersion ->
+                javaItem.createChildren(javaVersion.getVersion(), javaVersion.getBinary().getAbsolutePath(), javaVersion)
+        ).collect(Collectors.toList()))).subscribe(Schedulers.javafx(), variables ->
+                javaItem.loadChildren(variables.<Collection<Node>>get("list"))
+        );
 
-        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(i18n("settings.advanced.game_dir.default"), EnumGameDirectory.ROOT_FOLDER),
-                gameDirItem.createChildren(i18n("settings.advanced.game_dir.independent"), EnumGameDirectory.VERSION_FOLDER)
+                gameDirItem.createChildren(Launcher.i18n("settings.advanced.game_dir.default"), EnumGameDirectory.ROOT_FOLDER),
+                gameDirItem.createChildren(Launcher.i18n("settings.advanced.game_dir.independent"), EnumGameDirectory.VERSION_FOLDER)
         ));
 
         globalItem.loadChildren(Arrays.asList(
-                globalItem.createChildren(i18n("settings.type.global"), true),
-                globalItem.createChildren(i18n("settings.type.special"), false)
+                globalItem.createChildren(Launcher.i18n("settings.type.global"), true),
+                globalItem.createChildren(Launcher.i18n("settings.type.special"), false)
         ));
     }
 
     public void loadVersionSetting(Profile profile, String versionId) {
+        rootPane.getChildren().remove(advancedSettingsPane);
+
         this.profile = profile;
         this.versionId = versionId;
 
@@ -121,7 +115,6 @@ 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());
@@ -136,21 +129,11 @@ public final class VersionSettingsController {
             FXUtils.unbindString(txtServerIP, lastVersionSetting.serverIpProperty());
             FXUtils.unbindBoolean(chkFullscreen, lastVersionSetting.fullscreenProperty());
             FXUtils.unbindBoolean(chkNoGameCheck, lastVersionSetting.notCheckGameProperty());
-            FXUtils.unbindBoolean(chkNoJVMArgs, lastVersionSetting.noJVMArgsProperty());
+            FXUtils.unbindBoolean(chkNoCommon, lastVersionSetting.noCommonProperty());
             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());
@@ -164,29 +147,42 @@ public final class VersionSettingsController {
         FXUtils.bindString(txtServerIP, versionSetting.serverIpProperty());
         FXUtils.bindBoolean(chkFullscreen, versionSetting.fullscreenProperty());
         FXUtils.bindBoolean(chkNoGameCheck, versionSetting.notCheckGameProperty());
-        FXUtils.bindBoolean(chkNoJVMArgs, versionSetting.noJVMArgsProperty());
+        FXUtils.bindBoolean(chkNoCommon, versionSetting.noCommonProperty());
         FXUtils.bindBoolean(chkShowLogs, versionSetting.showLogsProperty());
         FXUtils.bindEnum(cboLauncherVisibility, versionSetting.launcherVisibilityProperty());
 
+        boolean flag = false;
+        Toggle defaultToggle = null;
+        for (Toggle toggle : javaItem.getGroup().getToggles()) {
+            if (toggle.getUserData() == Lang.invoke(versionSetting::getJavaVersion)) {
+                toggle.setSelected(true);
+                flag = true;
+            } else if (toggle.getUserData() == JavaVersion.fromCurrentEnvironment()) {
+                defaultToggle = toggle;
+            }
+        }
+
         javaItem.setToggleSelectedListener(newValue -> {
             if (javaItem.isCustomToggle(newValue)) {
-                versionSetting.setUsesCustomJavaDir();
+                versionSetting.setJava("Custom");
             } else {
-                versionSetting.setJavaVersion((JavaVersion) newValue.getUserData());
+                versionSetting.setJava(((JavaVersion) newValue.getUserData()).getVersion());
             }
         });
 
+        if (!flag) {
+            Optional.ofNullable(defaultToggle).ifPresent(t -> t.setSelected(true));
+        }
+
         versionSetting.javaDirProperty().setChangedListener(it -> initJavaSubtitle(versionSetting));
         versionSetting.javaProperty().setChangedListener(it -> initJavaSubtitle(versionSetting));
         initJavaSubtitle(versionSetting);
 
-        globalItem.selectedDataProperty().bindBidirectional(versionSetting.usesGlobalProperty());
-        globalItem.subtitleProperty().bind(Bindings.createStringBinding(() -> i18n(versionSetting.isUsesGlobal() ? "settings.type.global" : "settings.type.special"),
-                versionSetting.usesGlobalProperty()));
+        if (versionSetting.isUsesGlobal())
+            globalItem.getGroup().getToggles().stream().filter(it -> it.getUserData() == Boolean.TRUE).findFirst().ifPresent(it -> it.setSelected(true));
+        else
+            globalItem.getGroup().getToggles().stream().filter(it -> it.getUserData() == Boolean.FALSE).findFirst().ifPresent(it -> it.setSelected(true));
         globalItem.setToggleSelectedListener(newValue -> {
-            // 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
@@ -195,34 +191,25 @@ public final class VersionSettingsController {
             Platform.runLater(() -> loadVersionSetting(profile, versionId));
         });
 
-        gameDirItem.selectedDataProperty().bindBidirectional(versionSetting.gameDirTypeProperty());
-        gameDirItem.subtitleProperty().bind(Bindings.createStringBinding(() -> Paths.get(profile.getRepository().getRunDirectory(versionId).getAbsolutePath()).normalize().toString(),
-                versionSetting.gameDirProperty(), versionSetting.gameDirTypeProperty()));
+        versionSetting.usesGlobalProperty().setChangedListenerAndOperate(it ->
+                globalItem.setSubtitle(Launcher.i18n(versionSetting.isUsesGlobal() ? "settings.type.global" : "settings.type.special")));
+
+        gameDirItem.getGroup().getToggles().stream()
+                .filter(it -> it.getUserData() == versionSetting.getGameDirType())
+                .findFirst().ifPresent(toggle -> toggle.setSelected(true));
+
+        gameDirItem.setCustomUserData(EnumGameDirectory.CUSTOM);
+        gameDirItem.setToggleSelectedListener(newValue -> versionSetting.setGameDirType((EnumGameDirectory) newValue.getUserData()));
+
+        versionSetting.gameDirProperty().setChangedListener(it -> initGameDirSubtitle(versionSetting));
+        versionSetting.gameDirTypeProperty().setChangedListener(it -> initGameDirSubtitle(versionSetting));
+        initGameDirSubtitle(versionSetting);
 
         lastVersionSetting = versionSetting;
 
-        initializeSelectedJava();
-
         loadIcon();
     }
 
-    private void initializeSelectedJava() {
-        if (lastVersionSetting == null
-                || !javaItemsLoaded /* JREs are still being loaded */) {
-            return;
-        }
-
-        if (lastVersionSetting.isUsesCustomJavaDir()) {
-            javaItem.setSelectedData(null);
-        } else {
-            try {
-                javaItem.setSelectedData(lastVersionSetting.getJavaVersion());
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-            }
-        }
-    }
-
     private void initJavaSubtitle(VersionSetting versionSetting) {
         Task.of(variables -> variables.set("java", versionSetting.getJavaVersion()))
                 .subscribe(Task.of(Schedulers.javafx(),
@@ -230,10 +217,22 @@ 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(i18n("extension.png"), "*.png"));
+        chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(Launcher.i18n("extension.png"), "*.png"));
         File selectedFile = chooser.showOpenDialog(Controllers.getStage());
         if (selectedFile != null) {
             File iconFile = profile.getRepository().getVersionIcon(versionId);
@@ -251,7 +250,7 @@ public final class VersionSettingsController {
         if (iconFile.exists())
             iconPickerItem.setImage(new Image("file:" + iconFile.getAbsolutePath()));
         else
-            iconPickerItem.setImage(Constants.DEFAULT_ICON.get());
+            iconPickerItem.setImage(FXUtils.DEFAULT_ICON);
         FXUtils.limitSize(iconPickerItem.getImageView(), 32, 32);
     }
 }

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

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

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

@@ -18,12 +18,11 @@
 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);
 }

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

@@ -20,43 +20,17 @@ 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 -> {
-        c.getPreviousNode().setTranslateX(0);
-        c.getPreviousNode().setTranslateY(0);
-        c.getPreviousNode().setScaleX(1);
-        c.getPreviousNode().setScaleY(1);
-        c.getPreviousNode().setOpacity(1);
-        c.getCurrentNode().setTranslateX(0);
-        c.getCurrentNode().setTranslateY(0);
-        c.getCurrentNode().setScaleX(1);
-        c.getCurrentNode().setScaleY(1);
-        c.getCurrentNode().setOpacity(1);
-    }, c -> Collections.emptyList()),
+    NONE(c -> Collections.emptyList()),
     /**
      * A fade between the old and new view
      */
-    FADE(c -> {
-        c.getPreviousNode().setTranslateX(0);
-        c.getPreviousNode().setTranslateY(0);
-        c.getPreviousNode().setScaleX(1);
-        c.getPreviousNode().setScaleY(1);
-        c.getCurrentNode().setTranslateX(0);
-        c.getCurrentNode().setTranslateY(0);
-        c.getCurrentNode().setScaleX(1);
-        c.getCurrentNode().setScaleY(1);
-    }, c ->
+    FADE(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)),
@@ -66,12 +40,7 @@ public enum ContainerAnimations {
     /**
      * A zoom effect
      */
-    ZOOM_IN(c -> {
-        c.getPreviousNode().setTranslateX(0);
-        c.getPreviousNode().setTranslateY(0);
-        c.getCurrentNode().setTranslateX(0);
-        c.getCurrentNode().setTranslateY(0);
-    }, c ->
+    ZOOM_IN(c ->
             Arrays.asList(new KeyFrame(Duration.ZERO,
                             new KeyValue(c.getPreviousNode().scaleXProperty(), 1, Interpolator.EASE_BOTH),
                             new KeyValue(c.getPreviousNode().scaleYProperty(), 1, Interpolator.EASE_BOTH),
@@ -83,12 +52,7 @@ public enum ContainerAnimations {
     /**
      * A zoom effect
      */
-    ZOOM_OUT(c -> {
-        c.getPreviousNode().setTranslateX(0);
-        c.getPreviousNode().setTranslateY(0);
-        c.getCurrentNode().setTranslateX(0);
-        c.getCurrentNode().setTranslateY(0);
-    }, c ->
+    ZOOM_OUT(c ->
             (Arrays.asList(new KeyFrame(Duration.ZERO,
                             new KeyValue(c.getPreviousNode().scaleXProperty(), 1, Interpolator.EASE_BOTH),
                             new KeyValue(c.getPreviousNode().scaleYProperty(), 1, Interpolator.EASE_BOTH),
@@ -100,14 +64,7 @@ public enum ContainerAnimations {
     /**
      * A swipe effect
      */
-    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 ->
+    SWIPE_LEFT(c ->
             Arrays.asList(new KeyFrame(Duration.ZERO,
                             new KeyValue(c.getCurrentNode().translateXProperty(), c.getCurrentRoot().getWidth(), Interpolator.EASE_BOTH),
                             new KeyValue(c.getPreviousNode().translateXProperty(), 0, Interpolator.EASE_BOTH)),
@@ -118,14 +75,7 @@ public enum ContainerAnimations {
     /**
      * A swipe effect
      */
-    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 ->
+    SWIPE_RIGHT(c ->
             Arrays.asList(new KeyFrame(Duration.ZERO,
                             new KeyValue(c.getCurrentNode().translateXProperty(), -c.getCurrentRoot().getWidth(), Interpolator.EASE_BOTH),
                             new KeyValue(c.getPreviousNode().translateXProperty(), 0, Interpolator.EASE_BOTH)),
@@ -135,18 +85,8 @@ public enum ContainerAnimations {
 
     private final AnimationProducer animationProducer;
 
-    ContainerAnimations(Consumer<AnimationHandler> init, Function<AnimationHandler, List<KeyFrame>> animationProducer) {
-        this.animationProducer = new AnimationProducer() {
-            @Override
-            public void init(AnimationHandler handler) {
-                init.accept(handler);
-            }
-
-            @Override
-            public List<KeyFrame> animate(AnimationHandler handler) {
-                return animationProducer.apply(handler);
-            }
-        };
+    ContainerAnimations(AnimationProducer animationProducer) {
+        this.animationProducer = animationProducer;
     }
 
     public AnimationProducer getAnimationProducer() {

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

@@ -19,11 +19,9 @@ package org.jackhuang.hmcl.ui.animation;
 
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
-import javafx.application.Platform;
 import javafx.scene.Node;
 import javafx.scene.Parent;
 import javafx.scene.layout.StackPane;
-import javafx.scene.shape.Rectangle;
 import javafx.util.Duration;
 
 public final class TransitionHandler implements AnimationHandler {
@@ -38,12 +36,6 @@ public final class TransitionHandler implements AnimationHandler {
     public TransitionHandler(StackPane view) {
         this.view = view;
         currentNode = view.getChildren().stream().findFirst().orElse(null);
-
-        // prevent content overflow
-        Rectangle clip = new Rectangle();
-        clip.widthProperty().bind(view.widthProperty());
-        clip.heightProperty().bind(view.heightProperty());
-        view.setClip(clip);
     }
 
     @Override
@@ -79,38 +71,28 @@ public final class TransitionHandler implements AnimationHandler {
 
         updateContent(newView);
 
-        transition.init(this);
-
-        // runLater or "init" will not work
-        Platform.runLater(() -> {
-            Timeline nowAnimation = new Timeline();
-            nowAnimation.getKeyFrames().addAll(transition.animate(this));
-            nowAnimation.getKeyFrames().add(new KeyFrame(duration, e -> {
-                view.setMouseTransparent(false);
-                view.getChildren().remove(previousNode);
-            }));
-            nowAnimation.play();
-            animation = nowAnimation;
-        });
+        Timeline nowAnimation = new Timeline();
+        nowAnimation.getKeyFrames().addAll(transition.animate(this));
+        nowAnimation.getKeyFrames().add(new KeyFrame(duration, e -> view.getChildren().remove(previousNode)));
+        nowAnimation.play();
+        animation = nowAnimation;
     }
 
     private void updateContent(Node newView) {
         if (view.getWidth() > 0 && view.getHeight() > 0) {
             previousNode = currentNode;
             if (previousNode == null)
-                previousNode = EMPTY_PANE;
+                previousNode = NULL;
         } else
-            previousNode = EMPTY_PANE;
+            previousNode = NULL;
 
-        if (previousNode == newView)
-            previousNode = EMPTY_PANE;
-
-        view.setMouseTransparent(true);
+        if (previousNode == currentNode)
+            previousNode = NULL;
 
         currentNode = newView;
 
         view.getChildren().setAll(previousNode, currentNode);
     }
 
-    private final StackPane EMPTY_PANE = new StackPane();
+    private static final StackPane NULL = new StackPane();
 }

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

@@ -50,6 +50,10 @@ 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())

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

@@ -27,8 +27,6 @@ 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;
@@ -77,47 +75,31 @@ public class ComponentListCell extends StackPane {
             content.getStyleClass().remove("options-list");
             content.getStyleClass().add("options-sublist");
 
-            BorderPane groupNode = new BorderPane();
+            StackPane groupNode = new StackPane();
             groupNode.getStyleClass().add("options-list-item-header");
 
             Node expandIcon = SVG.expand(Theme.blackFillBinding(), 10, 10);
             JFXButton expandButton = new JFXButton();
             expandButton.setGraphic(expandIcon);
             expandButton.getStyleClass().add("options-list-item-expand-button");
+            StackPane.setAlignment(expandButton, Pos.CENTER_RIGHT);
 
             VBox labelVBox = new VBox();
+            Label label = new Label();
+            label.textProperty().bind(list.titleProperty());
+            label.setMouseTransparent(true);
+            labelVBox.getChildren().add(label);
 
-            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);
-                }
+            if (list.isHasSubtitle()) {
+                Label subtitleLabel = new Label();
+                subtitleLabel.textProperty().bind(list.subtitleProperty());
+                subtitleLabel.setMouseTransparent(true);
+                subtitleLabel.getStyleClass().add("subtitle-label");
+                labelVBox.getChildren().add(subtitleLabel);
             }
 
-            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);
+            StackPane.setAlignment(labelVBox, Pos.CENTER_LEFT);
+            groupNode.getChildren().setAll(labelVBox, expandButton);
 
             VBox container = new VBox();
             container.setStyle("-fx-padding: 8 0 0 0;");

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

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

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

@@ -18,9 +18,7 @@
 package org.jackhuang.hmcl.ui.construct;
 
 import com.jfoenix.controls.JFXButton;
-
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.Property;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.scene.control.Label;
@@ -28,70 +26,46 @@ 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 final Label lblPath = new Label();
+    private Property<String> property;
+    private final Label x = 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());
-        lblPath.getStyleClass().addAll("subtitle-label");
-        lblPath.textProperty().bind(path);
-        left.getChildren().addAll(name, lblPath);
+        x.getStyleClass().addAll("subtitle-label");
+        left.getChildren().addAll(name, x);
         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, i18n("button.edit"));
+        FXUtils.installTooltip(right, Launcher.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 (path.get() != null) {
-            File file = new File(path.get());
+        if (property.getValue() != null) {
+            File file = new File(property.getValue());
             if (file.exists()) {
                 if (file.isFile())
                     file = file.getAbsoluteFile().getParentFile();
@@ -102,12 +76,16 @@ public class FileItem extends BorderPane {
         }
         chooser.titleProperty().bind(titleProperty());
         File selectedDir = chooser.showDialog(Controllers.getStage());
-        if (selectedDir != null) {
-            path.set(processPath(selectedDir.toString()));
-        }
+        if (selectedDir != null)
+            property.setValue(selectedDir.getAbsolutePath());
         chooser.titleProperty().unbind();
     }
 
+    public void setProperty(Property<String> property) {
+        this.property = property;
+        x.textProperty().bind(property);
+    }
+
     public String getName() {
         return name.get();
     }
@@ -143,28 +121,4 @@ public class FileItem extends BorderPane {
     public void setTooltip(String tooltip) {
         this.tooltip.set(tooltip);
     }
-
-    public String getPath() {
-        return path.get();
-    }
-
-    public StringProperty pathProperty() {
-        return path;
-    }
-
-    public void setPath(String path) {
-        this.path.set(path);
-    }
-
-    public boolean isConvertToRelativePath() {
-        return convertToRelativePath.get();
-    }
-
-    public BooleanProperty convertToRelativePathProperty() {
-        return convertToRelativePath;
-    }
-
-    public void setConvertToRelativePath(boolean convertToRelativePath) {
-        this.convertToRelativePath.set(convertToRelativePath);
-    }
 }

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

@@ -21,25 +21,18 @@ 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) {
-        this(icon);
-        label.setText(text);
+        super(createHBox(icon, text));
     }
 
-    public IconedItem(Node icon) {
-        super(createHBox(icon));
-        label = ((Label) lookup("#label"));
-    }
-
-    private static HBox createHBox(Node icon) {
+    private static HBox createHBox(Node icon, String text) {
         HBox hBox = new HBox();
         icon.setMouseTransparent(true);
-        Label textLabel = new Label();
+        Label textLabel = new Label(text);
         textLabel.setId("label");
         textLabel.setAlignment(Pos.CENTER);
         textLabel.setMouseTransparent(true);
@@ -49,7 +42,11 @@ public class IconedItem extends RipplerContainer {
         return hBox;
     }
 
-    public Label getLabel() {
-        return label;
+    public void setText(String text) {
+        ((Label) lookup("#label")).setText(text);
+    }
+
+    public void setTextFill(Paint paint) {
+        ((Label) lookup("#label")).setTextFill(paint);
     }
 }

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

@@ -15,9 +15,7 @@ import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
-
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
+import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
@@ -43,7 +41,7 @@ public final class ImagePickerItem extends BorderPane {
         selectButton.onMouseClickedProperty().bind(onSelectButtonClicked);
         selectButton.getStyleClass().add("toggle-icon4");
 
-        FXUtils.installTooltip(selectButton, i18n("button.edit"));
+        FXUtils.installTooltip(selectButton, Launcher.i18n("button.edit"));
 
         HBox hBox = new HBox();
         hBox.getChildren().setAll(imageView, selectButton);

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

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

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

@@ -17,22 +17,21 @@
  */
 package org.jackhuang.hmcl.ui.construct;
 
+import com.jfoenix.concurrency.JFXUtilities;
 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 javax.swing.*;
-
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
 import java.util.Optional;
 
 public final class MessageBox {
     private MessageBox() {
     }
 
-    private static final String TITLE = i18n("message.info");
+    private static final String TITLE = Launcher.i18n("message.info");
 
     /**
      * User Operation: Yes

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

@@ -18,19 +18,22 @@
 package org.jackhuang.hmcl.ui.construct;
 
 import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXDialog;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
+import javafx.scene.layout.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;
@@ -45,7 +48,7 @@ public final class MessageDialogPane extends StackPane {
     @FXML
     private HBox actions;
 
-    public MessageDialogPane(String text, String title, int type, Runnable onAccept) {
+    public MessageDialogPane(String text, String title, Consumer<Region> closeConsumer, int type, Runnable onAccept) {
         FXUtils.loadFXML(this, "/assets/fxml/message-dialog.fxml");
 
         if (title != null)
@@ -53,7 +56,7 @@ public final class MessageDialogPane extends StackPane {
 
         content.setText(text);
         acceptButton.setOnMouseClicked(e -> {
-            fireEvent(new DialogCloseEvent());
+            closeConsumer.accept(MessageDialogPane.this);
             Optional.ofNullable(onAccept).ifPresent(Runnable::run);
         });
 
@@ -80,18 +83,22 @@ public final class MessageDialogPane extends StackPane {
         }
     }
 
-    public MessageDialogPane(String text, String title, Runnable onAccept, Runnable onCancel) {
-        this(text, title, MessageBox.QUESTION_MESSAGE, onAccept);
+    public MessageDialogPane(String text, String title, Consumer<Region> closeConsumer, Runnable onAccept, Runnable onCancel) {
+        this(text, title, closeConsumer, MessageBox.QUESTION_MESSAGE, onAccept);
 
         cancelButton.setVisible(true);
         cancelButton.setOnMouseClicked(e -> {
-            fireEvent(new DialogCloseEvent());
+            closeConsumer.accept(MessageDialogPane.this);
             Optional.ofNullable(onCancel).ifPresent(Runnable::run);
         });
 
-        acceptButton.setText(i18n("button.yes"));
-        cancelButton.setText(i18n("button.no"));
+        acceptButton.setText(Launcher.i18n("button.yes"));
+        cancelButton.setText(Launcher.i18n("button.no"));
 
         actions.getChildren().add(cancelButton);
     }
+
+    public void disableClosingDialog() {
+        closingDialog = false;
+    }
 }

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

@@ -13,17 +13,16 @@ 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", i18n("selector.custom"));
-    private final StringProperty chooserTitle = new SimpleStringProperty(this, "chooserTitle", i18n("selector.choose_file"));
+    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 ToggleGroup group = new ToggleGroup();
     private final JFXColorPicker colorPicker = new JFXColorPicker();

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

@@ -21,7 +21,10 @@ import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXRadioButton;
 import com.jfoenix.controls.JFXTextField;
 import javafx.beans.NamedArg;
-import javafx.beans.property.*;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.geometry.Pos;
@@ -29,29 +32,27 @@ import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.control.Toggle;
 import javafx.scene.control.ToggleGroup;
+import javafx.scene.control.Tooltip;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.stage.DirectoryChooser;
 import javafx.stage.FileChooser;
-
+import org.jackhuang.hmcl.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<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"));
+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"));
     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 SimpleStringProperty tooltip = new SimpleStringProperty(this, "tooltip");
     private final ObservableList<FileChooser.ExtensionFilter> extensionFilters = FXCollections.observableArrayList();
 
     private final ToggleGroup group = new ToggleGroup();
@@ -64,7 +65,6 @@ public class MultiFileItem<T> extends ComponentList {
 
     private Consumer<Toggle> toggleSelectedListener;
 
-    @SuppressWarnings("unchecked")
     public MultiFileItem(@NamedArg(value = "hasCustom", defaultValue = "true") boolean hasCustom) {
         this.hasCustom = hasCustom;
 
@@ -111,32 +111,22 @@ public class MultiFileItem<T> 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));
-        });
+        Tooltip tip = new Tooltip();
+        tip.textProperty().bind(tooltipProperty());
+        Tooltip.install(this, tip);
     }
 
     public Node createChildren(String title) {
         return createChildren(title, null);
     }
 
-    public Node createChildren(String title, T userData) {
+    public Node createChildren(String title, Object userData) {
         return createChildren(title, "", userData);
     }
 
-    public Node createChildren(String title, String subtitle, T userData) {
+    public Node createChildren(String title, String subtitle, Object userData) {
         BorderPane pane = new BorderPane();
         pane.setStyle("-fx-padding: 3;");
         FXUtils.setLimitHeight(pane, 20);
@@ -161,9 +151,12 @@ public class MultiFileItem<T> extends ComponentList {
             pane.getChildren().add(custom);
     }
 
-    public void loadChildren(Collection<Node> list, T customUserData) {
-        loadChildren(list);
-        setCustomUserData(customUserData);
+    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 ToggleGroup getGroup() {
@@ -194,7 +187,7 @@ public class MultiFileItem<T> extends ComponentList {
         this.chooserTitle.set(chooserTitle);
     }
 
-    public void setCustomUserData(T userData) {
+    public void setCustomUserData(Object userData) {
         radioCustom.setUserData(userData);
     }
 
@@ -238,27 +231,15 @@ public class MultiFileItem<T> extends ComponentList {
         return extensionFilters;
     }
 
-    public T getSelectedData() {
-        return selectedData.get();
+    public String getTooltip() {
+        return tooltip.get();
     }
 
-    public ObjectProperty<T> selectedDataProperty() {
-        return selectedData;
+    public StringProperty tooltipProperty() {
+        return tooltip;
     }
 
-    public void setSelectedData(T selectedData) {
-        this.selectedData.set(selectedData);
-    }
-
-    public T getFallbackData() {
-        return fallbackData.get();
-    }
-
-    public ObjectProperty<T> fallbackDataProperty() {
-        return fallbackData;
-    }
-
-    public void setFallbackData(T fallbackData) {
-        this.fallbackData.set(fallbackData);
+    public void setTooltip(String tooltip) {
+        this.tooltip.set(tooltip);
     }
 }

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

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

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

@@ -19,14 +19,13 @@ 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;
 
@@ -35,11 +34,11 @@ public interface TaskExecutorDialogWizardDisplayer extends AbstractWizardDisplay
     @Override
     default void handleTask(Map<String, Object> settings, Task task) {
         TaskExecutorDialogPane pane = new TaskExecutorDialogPane(it -> {
-            it.fireEvent(new DialogCloseEvent());
+            Controllers.closeDialog(it);
             Controllers.navigate(null);
         });
 
-        pane.setTitle(i18n("message.doing"));
+        pane.setTitle(Launcher.i18n("message.doing"));
         pane.setProgress(Double.MAX_VALUE);
         if (settings.containsKey("title")) {
             Object title = settings.get("title");
@@ -62,12 +61,12 @@ public interface TaskExecutorDialogWizardDisplayer extends AbstractWizardDisplay
                 @Override
                 public void onStop(boolean success, TaskExecutor executor) {
                     JFXUtilities.runInFX(() -> {
-                        pane.fireEvent(new DialogCloseEvent());
+                        Controllers.closeDialog(pane);
                         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(i18n("message.success"), null, MessageBox.FINE_MESSAGE, () -> Controllers.navigate(null));
+                                Controllers.dialog(Launcher.i18n("message.success"), null, MessageBox.FINE_MESSAGE, () -> Controllers.navigate(null));
                         } else {
                             if (executor.getLastException() == null)
                                 return;
@@ -75,7 +74,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, i18n("wizard.failed"), MessageBox.ERROR_MESSAGE, () -> Controllers.navigate(null));
+                                Controllers.dialog(appendix, Launcher.i18n("wizard.failed"), MessageBox.ERROR_MESSAGE, () -> Controllers.navigate(null));
                         }
 
                     });

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

@@ -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,7 +35,6 @@ 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;
@@ -63,29 +62,29 @@ public final class TaskListPane extends StackPane {
                     return;
 
                 if (task instanceof GameAssetRefreshTask) {
-                    task.setName(i18n("assets.download"));
+                    task.setName(Launcher.i18n("assets.download"));
                 } else if (task instanceof GameAssetDownloadTask) {
-                    task.setName(i18n("assets.download_all"));
+                    task.setName(Launcher.i18n("assets.download_all"));
                 } else if (task instanceof ForgeInstallTask) {
-                    task.setName(i18n("install.installer.install", i18n("install.installer.forge")));
+                    task.setName(Launcher.i18n("install.installer.install", Launcher.i18n("install.installer.forge")));
                 } else if (task instanceof LiteLoaderInstallTask) {
-                    task.setName(i18n("install.installer.install", i18n("install.installer.liteloader")));
+                    task.setName(Launcher.i18n("install.installer.install", Launcher.i18n("install.installer.liteloader")));
                 } else if (task instanceof OptiFineInstallTask) {
-                    task.setName(i18n("install.installer.install", i18n("install.installer.optifine")));
+                    task.setName(Launcher.i18n("install.installer.install", Launcher.i18n("install.installer.optifine")));
                 } else if (task instanceof CurseCompletionTask) {
-                    task.setName(i18n("modpack.type.curse.completion"));
+                    task.setName(Launcher.i18n("modpack.type.curse.completion"));
                 } else if (task instanceof ModpackInstallTask) {
-                    task.setName(i18n("modpack.installing"));
+                    task.setName(Launcher.i18n("modpack.installing"));
                 } else if (task instanceof CurseInstallTask) {
-                    task.setName(i18n("modpack.install", i18n("modpack.type.curse")));
+                    task.setName(Launcher.i18n("modpack.install", Launcher.i18n("modpack.type.curse")));
                 } else if (task instanceof MultiMCModpackInstallTask) {
-                    task.setName(i18n("modpack.install", i18n("modpack.type.multimc")));
+                    task.setName(Launcher.i18n("modpack.install", Launcher.i18n("modpack.type.multimc")));
                 } else if (task instanceof HMCLModpackInstallTask) {
-                    task.setName(i18n("modpack.install", i18n("modpack.type.hmcl")));
+                    task.setName(Launcher.i18n("modpack.install", Launcher.i18n("modpack.type.hmcl")));
                 } else if (task instanceof HMCLModpackExportTask) {
-                    task.setName(i18n("modpack.export"));
+                    task.setName(Launcher.i18n("modpack.export"));
                 } else if (task instanceof MinecraftInstanceTask) {
-                    task.setName(i18n("modpack.scan"));
+                    task.setName(Launcher.i18n("modpack.scan"));
                 }
 
                 ProgressListNode node = new ProgressListNode(task);

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

@@ -1,6 +1,7 @@
 package org.jackhuang.hmcl.ui.construct;
 
 import com.jfoenix.validation.base.ValidatorBase;
+import javafx.beans.NamedArg;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.control.TextInputControl;

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

@@ -1,7 +1,7 @@
 /*
  * Hello Minecraft! Launcher.
  * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- *
+ * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -15,9 +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.util.i18n;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
+package org.jackhuang.hmcl.ui.construct;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -28,14 +26,14 @@ import java.util.Locale;
 import java.util.PropertyResourceBundle;
 import java.util.ResourceBundle;
 
-final class UTF8Control extends ResourceBundle.Control {
-
+public final class UTF8Control extends ResourceBundle.Control {
     public static final UTF8Control INSTANCE = new UTF8Control();
 
     private UTF8Control() {}
 
     @Override
-    public ResourceBundle newBundle(String baseName, Locale locale, String format, ClassLoader loader, boolean reload) throws IOException {
+    public ResourceBundle newBundle(String baseName, Locale locale, String format, ClassLoader loader, boolean reload)
+    throws IOException {
         // The below is a copy of the default implementation.
         String bundleName = toBundleName(baseName, locale);
         String resourceName = toResourceName(bundleName, "properties");
@@ -56,7 +54,7 @@ final class UTF8Control extends ResourceBundle.Control {
         if (stream != null) {
             try {
                 // Only this line is changed to make it to read properties files as UTF-8.
-                bundle = new PropertyResourceBundle(new InputStreamReader(stream, UTF_8));
+                bundle = new PropertyResourceBundle(new InputStreamReader(stream, "UTF-8"));
             } finally {
                 stream.close();
             }

HMCL/src/main/java/org/jackhuang/hmcl/ui/download/AdditionalInstallersPage.java

@@ -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,11 +30,12 @@ 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;
@@ -99,33 +100,33 @@ class AdditionalInstallersPage extends StackPane implements WizardPage {
 
     @Override
     public String getTitle() {
-        return i18n("settings.tabs.installers");
+        return Launcher.i18n("settings.tabs.installers");
     }
 
     private String getVersion(String id) {
-        return Optional.ofNullable(controller.getSettings().get(id)).map(it -> (RemoteVersion) it).map(RemoteVersion::getSelfVersion).orElse(null);
+        return Optional.ofNullable(controller.getSettings().get(id)).map(it -> (RemoteVersion<?>) it).map(RemoteVersion::getSelfVersion).orElse(null);
     }
 
     @Override
     public void onNavigate(Map<String, Object> settings) {
-        lblGameVersion.setText(i18n("install.new_game.current_game_version") + ": " + provider.getGameVersion());
+        lblGameVersion.setText(Launcher.i18n("install.new_game.current_game_version") + ": " + provider.getGameVersion());
         btnForge.setDisable(provider.getForge() != null);
         if (provider.getForge() != null || controller.getSettings().containsKey("forge"))
-            lblForge.setText(i18n("install.installer.version", i18n("install.installer.forge")) + ": " + Lang.nonNull(provider.getForge(), getVersion("forge")));
+            lblForge.setText(Launcher.i18n("install.installer.version", Launcher.i18n("install.installer.forge")) + ": " + Lang.nonNull(provider.getForge(), getVersion("forge")));
         else
-            lblForge.setText(i18n("install.installer.not_installed", i18n("install.installer.forge")));
+            lblForge.setText(Launcher.i18n("install.installer.not_installed", Launcher.i18n("install.installer.forge")));
 
         btnLiteLoader.setDisable(provider.getLiteLoader() != null);
         if (provider.getLiteLoader() != null || controller.getSettings().containsKey("liteloader"))
-            lblLiteLoader.setText(i18n("install.installer.version", i18n("install.installer.liteloader")) + ": " + Lang.nonNull(provider.getLiteLoader(), getVersion("liteloader")));
+            lblLiteLoader.setText(Launcher.i18n("install.installer.version", Launcher.i18n("install.installer.liteloader")) + ": " + Lang.nonNull(provider.getLiteLoader(), getVersion("liteloader")));
         else
-            lblLiteLoader.setText(i18n("install.installer.not_installed", i18n("install.installer.liteloader")));
+            lblLiteLoader.setText(Launcher.i18n("install.installer.not_installed", Launcher.i18n("install.installer.liteloader")));
 
         btnOptiFine.setDisable(provider.getOptiFine() != null);
         if (provider.getOptiFine() != null || controller.getSettings().containsKey("optifine"))
-            lblOptiFine.setText(i18n("install.installer.version", i18n("install.installer.optifine")) + ": " + Lang.nonNull(provider.getOptiFine(), getVersion("optifine")));
+            lblOptiFine.setText(Launcher.i18n("install.installer.version", Launcher.i18n("install.installer.optifine")) + ": " + Lang.nonNull(provider.getOptiFine(), getVersion("optifine")));
         else
-            lblOptiFine.setText(i18n("install.installer.not_installed", i18n("install.installer.optifine")));
+            lblOptiFine.setText(Launcher.i18n("install.installer.not_installed", Launcher.i18n("install.installer.optifine")));
 
     }
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/download/DownloadWizardProvider.java

@@ -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,18 +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.util.Lang.tryCast;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import static org.jackhuang.hmcl.Launcher.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);
     }
 
@@ -49,16 +49,16 @@ public final class DownloadWizardProvider implements WizardProvider {
         GameBuilder builder = profile.getDependency().gameBuilder();
 
         builder.name((String) settings.get("name"));
-        builder.gameVersion(((RemoteVersion) settings.get("game")).getGameVersion());
+        builder.gameVersion(((RemoteVersion<?>) settings.get("game")).getGameVersion());
 
         if (settings.containsKey("forge"))
-            builder.version((RemoteVersion) settings.get("forge"));
+            builder.version((RemoteVersion<?>) settings.get("forge"));
 
         if (settings.containsKey("liteloader"))
-            builder.version((RemoteVersion) settings.get("liteloader"));
+            builder.version((RemoteVersion<?>) settings.get("liteloader"));
 
         if (settings.containsKey("optifine"))
-            builder.version((RemoteVersion) settings.get("optifine"));
+            builder.version((RemoteVersion<?>) settings.get("optifine"));
 
         return builder.buildAsync().finalized((a, b) -> profile.getRepository().refreshVersions());
     }
@@ -67,9 +67,9 @@ public final class DownloadWizardProvider implements WizardProvider {
         if (!settings.containsKey(ModpackPage.MODPACK_FILE))
             return null;
 
-        File selected = tryCast(settings.get(ModpackPage.MODPACK_FILE), File.class).orElse(null);
-        Modpack modpack = tryCast(settings.get(ModpackPage.MODPACK_MANIFEST), Modpack.class).orElse(null);
-        String name = tryCast(settings.get(ModpackPage.MODPACK_NAME), String.class).orElse(null);
+        File selected = Lang.get(settings, ModpackPage.MODPACK_FILE, File.class).orElse(null);
+        Modpack modpack = Lang.get(settings, ModpackPage.MODPACK_CURSEFORGE_MANIFEST, Modpack.class).orElse(null);
+        String name = Lang.get(settings, ModpackPage.MODPACK_NAME, String.class).orElse(null);
         if (selected == null || modpack == null || name == null) return null;
 
         return ModpackHelper.getInstallTask(profile, selected, name, modpack);
@@ -77,8 +77,8 @@ public final class DownloadWizardProvider implements WizardProvider {
 
     @Override
     public Object finish(Map<String, Object> settings) {
-        settings.put("success_message", i18n("install.success"));
-        settings.put("failure_message", i18n("install.failed"));
+        settings.put("success_message", Launcher.i18n("install.success"));
+        settings.put("failure_message", Launcher.i18n("install.failed"));
 
         switch (Lang.parseInt(settings.get(InstallTypePage.INSTALL_TYPE), -1)) {
             case 0: return finishVersionDownloadingAsync(settings);
@@ -101,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 + ", pages: " + controller.getPages());
+                        throw new IllegalStateException("Error step " + step + ", subStep " + subStep + ", settings: " + settings);
                 }
             default:
-                throw new IllegalStateException("error step " + step + ", settings: " + settings + ", pages: " + controller.getPages());
+                throw new IllegalStateException("error step " + step + ", settings: " + settings);
         }
     }
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/download/InstallTypePage.java

@@ -20,11 +20,10 @@ 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;
 
@@ -50,7 +49,7 @@ public final class InstallTypePage extends StackPane implements WizardPage {
 
     @Override
     public String getTitle() {
-        return i18n("install.select");
+        return Launcher.i18n("install.select");
     }
 
     public static final String INSTALL_TYPE = "INSTALL_TYPE";

HMCL/src/main/java/org/jackhuang/hmcl/ui/download/InstallerWizardProvider.java

@@ -18,16 +18,14 @@
 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;
 
@@ -82,29 +80,28 @@ public final class InstallerWizardProvider implements WizardProvider {
 
     @Override
     public Object finish(Map<String, Object> settings) {
-        settings.put("success_message", i18n("install.success"));
-        settings.put("failure_message", i18n("install.failed"));
+        settings.put("success_message", Launcher.i18n("install.success"));
+        settings.put("failure_message", Launcher.i18n("install.failed"));
 
-        Task ret = Task.ofResult("version", () -> version);
+        Task ret = Task.empty();
 
         if (settings.containsKey("forge"))
-            ret = ret.then(profile.getDependency().installLibraryAsync((RemoteVersion) settings.get("forge")));
+            ret = ret.then(profile.getDependency().installLibraryAsync(version, (RemoteVersion<?>) settings.get("forge")));
 
         if (settings.containsKey("liteloader"))
-            ret = ret.then(profile.getDependency().installLibraryAsync((RemoteVersion) settings.get("liteloader")));
+            ret = ret.then(profile.getDependency().installLibraryAsync(version, (RemoteVersion<?>) settings.get("liteloader")));
 
         if (settings.containsKey("optifine"))
-            ret = ret.then(profile.getDependency().installLibraryAsync((RemoteVersion) settings.get("optifine")));
+            ret = ret.then(profile.getDependency().installLibraryAsync(version, (RemoteVersion<?>) settings.get("optifine")));
 
         return ret.then(profile.getRepository().refreshVersionsAsync());
     }
 
     @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(), provider);
+                return new AdditionalInstallersPage(this, controller, profile.getRepository(), BMCLAPIDownloadProvider.INSTANCE);
             default:
                 throw new IllegalStateException();
         }

HMCL/src/main/java/org/jackhuang/hmcl/ui/download/InstallersPage.java

@@ -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,7 +32,6 @@ 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;
 
@@ -74,55 +73,55 @@ public class InstallersPage extends StackPane implements WizardPage {
 
         FXUtils.loadFXML(this, "/assets/fxml/download/installers.fxml");
 
-        String gameVersion = ((RemoteVersion) controller.getSettings().get("game")).getGameVersion();
+        String gameVersion = ((RemoteVersion<?>) controller.getSettings().get("game")).getGameVersion();
         Validator hasVersion = new Validator(s -> !repository.hasVersion(s) && StringUtils.isNotBlank(s));
-        hasVersion.setMessage(i18n("install.new_game.already_exists"));
+        hasVersion.setMessage(Launcher.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, i18n("install.installer.choose", i18n("install.installer.forge")), gameVersion, downloadProvider, "forge", () -> controller.onPrev(false)));
+            controller.onNext(new VersionsPage(controller, Launcher.i18n("install.installer.choose", Launcher.i18n("install.installer.forge")), gameVersion, downloadProvider, "forge", () -> controller.onPrev(false)));
         });
 
         btnLiteLoader.setOnMouseClicked(e -> {
             controller.getSettings().put(INSTALLER_TYPE, 1);
-            controller.onNext(new VersionsPage(controller, i18n("install.installer.choose", i18n("install.installer.liteloader")), gameVersion, downloadProvider, "liteloader", () -> controller.onPrev(false)));
+            controller.onNext(new VersionsPage(controller, Launcher.i18n("install.installer.choose", Launcher.i18n("install.installer.liteloader")), gameVersion, downloadProvider, "liteloader", () -> controller.onPrev(false)));
         });
 
         btnOptiFine.setOnMouseClicked(e -> {
             controller.getSettings().put(INSTALLER_TYPE, 2);
-            controller.onNext(new VersionsPage(controller, i18n("install.installer.choose", i18n("install.installer.optifine")), gameVersion, downloadProvider, "optifine", () -> controller.onPrev(false)));
+            controller.onNext(new VersionsPage(controller, Launcher.i18n("install.installer.choose", Launcher.i18n("install.installer.optifine")), gameVersion, downloadProvider, "optifine", () -> controller.onPrev(false)));
         });
     }
 
     @Override
     public String getTitle() {
-        return i18n("install.new_game");
+        return Launcher.i18n("install.new_game");
     }
 
     private String getVersion(String id) {
-        return ((RemoteVersion) controller.getSettings().get(id)).getSelfVersion();
+        return ((RemoteVersion<?>) controller.getSettings().get(id)).getSelfVersion();
     }
 
     @Override
     public void onNavigate(Map<String, Object> settings) {
-        lblGameVersion.setText(i18n("install.new_game.current_game_version") + ": " + getVersion("game"));
+        lblGameVersion.setText(Launcher.i18n("install.new_game.current_game_version") + ": " + getVersion("game"));
         if (controller.getSettings().containsKey("forge"))
-            lblForge.setText(i18n("install.installer.version", i18n("install.installer.forge")) + ": " + getVersion("forge"));
+            lblForge.setText(Launcher.i18n("install.installer.version", Launcher.i18n("install.installer.forge")) + ": " + getVersion("forge"));
         else
-            lblForge.setText(i18n("install.installer.not_installed", i18n("install.installer.forge")));
+            lblForge.setText(Launcher.i18n("install.installer.not_installed", Launcher.i18n("install.installer.forge")));
 
         if (controller.getSettings().containsKey("liteloader"))
-            lblLiteLoader.setText(i18n("install.installer.version", i18n("install.installer.liteloader")) + ": " + getVersion("liteloader"));
+            lblLiteLoader.setText(Launcher.i18n("install.installer.version", Launcher.i18n("install.installer.liteloader")) + ": " + getVersion("liteloader"));
         else
-            lblLiteLoader.setText(i18n("install.installer.not_installed", i18n("install.installer.liteloader")));
+            lblLiteLoader.setText(Launcher.i18n("install.installer.not_installed", Launcher.i18n("install.installer.liteloader")));
 
         if (controller.getSettings().containsKey("optifine"))
-            lblOptiFine.setText(i18n("install.installer.version", i18n("install.installer.optifine")) + ": " + getVersion("optifine"));
+            lblOptiFine.setText(Launcher.i18n("install.installer.version", Launcher.i18n("install.installer.optifine")) + ": " + getVersion("optifine"));
         else
-            lblOptiFine.setText(i18n("install.installer.not_installed", i18n("install.installer.optifine")));
+            lblOptiFine.setText(Launcher.i18n("install.installer.not_installed", Launcher.i18n("install.installer.optifine")));
     }
 
     @Override

HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackPage.java

@@ -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,7 +37,6 @@ 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;
@@ -76,29 +75,28 @@ public final class ModpackPage extends StackPane implements WizardPage {
         Profile profile = (Profile) controller.getSettings().get("PROFILE");
 
         FileChooser chooser = new FileChooser();
-        chooser.setTitle(i18n("modpack.choose"));
-        chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("modpack"), "*.zip"));
+        chooser.setTitle(Launcher.i18n("modpack.choose"));
+        chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(Launcher.i18n("modpack"), "*.zip"));
         File selectedFile = chooser.showOpenDialog(Controllers.getStage());
         if (selectedFile == null) Platform.runLater(() -> Controllers.navigate(null));
         else {
             controller.getSettings().put(MODPACK_FILE, selectedFile);
             lblModpackLocation.setText(selectedFile.getAbsolutePath());
             txtModpackName.getValidators().addAll(
-                    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))
+                    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))
             );
             txtModpackName.textProperty().addListener(e -> btnInstall.setDisable(!txtModpackName.validate()));
 
             try {
                 manifest = ModpackHelper.readModpackManifest(selectedFile);
-                controller.getSettings().put(MODPACK_MANIFEST, manifest);
+                controller.getSettings().put(MODPACK_CURSEFORGE_MANIFEST, manifest);
                 lblName.setText(manifest.getName());
                 lblVersion.setText(manifest.getVersion());
                 lblAuthor.setText(manifest.getAuthor());
                 txtModpackName.setText(manifest.getName() + (StringUtils.isBlank(manifest.getVersion()) ? "" : "-" + manifest.getVersion()));
             } catch (UnsupportedModpackException e) {
-                txtModpackName.setText(i18n("modpack.task.install.error"));
-                btnInstall.setDisable(true);
+                txtModpackName.setText(Launcher.i18n("modpack.task.install.error"));
             }
         }
     }
@@ -120,17 +118,17 @@ public final class ModpackPage extends StackPane implements WizardPage {
         if (manifest != null) {
             WebStage stage = new WebStage();
             stage.getWebView().getEngine().loadContent(manifest.getDescription());
-            stage.setTitle(i18n("modpack.wizard.step.3"));
+            stage.setTitle(Launcher.i18n("modpack.wizard.step.3"));
             stage.showAndWait();
         }
     }
 
     @Override
     public String getTitle() {
-        return i18n("modpack.task.install");
+        return Launcher.i18n("modpack.task.install");
     }
 
     public static final String MODPACK_FILE = "MODPACK_FILE";
     public static final String MODPACK_NAME = "MODPACK_NAME";
-    public static final String MODPACK_MANIFEST = "MODPACK_MANIFEST";
+    public static final String MODPACK_CURSEFORGE_MANIFEST = "CURSEFORGE_MANIFEST";
 }

HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPage.java

@@ -27,8 +27,9 @@ import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import org.jackhuang.hmcl.download.DownloadProvider;
-import org.jackhuang.hmcl.download.RemoteVersion;
 import org.jackhuang.hmcl.download.VersionList;
+import org.jackhuang.hmcl.download.game.GameRemoteVersionTag;
+import org.jackhuang.hmcl.download.game.GameVersionList;
 import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
@@ -47,7 +48,6 @@ public final class VersionsPage extends StackPane implements WizardPage, Refresh
     private final DownloadProvider downloadProvider;
     private final String libraryId;
     private final String title;
-    private final WizardController controller;
 
     @FXML
     private JFXListView<VersionsPageItem> list;
@@ -56,8 +56,6 @@ public final class VersionsPage extends StackPane implements WizardPage, Refresh
     @FXML
     private StackPane failedPane;
     @FXML
-    private StackPane emptyPane;
-    @FXML
     private JFXCheckBox chkRelease;
     @FXML
     private JFXCheckBox chkSnapshot;
@@ -77,12 +75,11 @@ public final class VersionsPage extends StackPane implements WizardPage, Refresh
         this.gameVersion = gameVersion;
         this.downloadProvider = downloadProvider;
         this.libraryId = libraryId;
-        this.controller = controller;
         this.versionList = downloadProvider.getVersionListById(libraryId);
 
         FXUtils.loadFXML(this, "/assets/fxml/download/versions.fxml");
 
-        if (versionList.hasType()) {
+        if (versionList instanceof GameVersionList) {
             centrePane.getChildren().setAll(checkPane, list);
         } else
             centrePane.getChildren().setAll(list);
@@ -102,19 +99,21 @@ public final class VersionsPage extends StackPane implements WizardPage, Refresh
     }
 
     private List<VersionsPageItem> loadVersions() {
+        boolean isGameVersionList = versionList instanceof GameVersionList;
         return versionList.getVersions(gameVersion).stream()
                 .filter(it -> {
-                    switch (it.getVersionType()) {
-                        case RELEASE:
-                            return chkRelease.isSelected();
-                        case SNAPSHOT:
-                            return chkSnapshot.isSelected();
-                        case OLD:
-                            return chkOld.isSelected();
-                        default:
-                            return true;
-                    }
+                    if (isGameVersionList)
+                        switch (((GameRemoteVersionTag) it.getTag()).getType()) {
+                            case RELEASE:
+                                return chkRelease.isSelected();
+                            case SNAPSHOT:
+                                return chkSnapshot.isSelected();
+                            default:
+                                return chkOld.isSelected();
+                        }
+                    else return true;
                 })
+                .filter(Objects::nonNull)
                 .sorted()
                 .map(VersionsPageItem::new).collect(Collectors.toList());
     }
@@ -127,12 +126,8 @@ public final class VersionsPage extends StackPane implements WizardPage, Refresh
                 List<VersionsPageItem> items = loadVersions();
 
                 Platform.runLater(() -> {
-                    if (items.isEmpty()) {
-                        transitionHandler.setContent(emptyPane, ContainerAnimations.FADE.getAnimationProducer());
-                    } else {
-                        list.getItems().setAll(items);
-                        transitionHandler.setContent(centrePane, ContainerAnimations.FADE.getAnimationProducer());
-                    }
+                    list.getItems().setAll(items);
+                    transitionHandler.setContent(centrePane, ContainerAnimations.FADE.getAnimationProducer());
                 });
             } else {
                 Platform.runLater(() -> {
@@ -158,7 +153,4 @@ public final class VersionsPage extends StackPane implements WizardPage, Refresh
     private void onRefresh() {
         refresh();
     }
-
-    @FXML
-    private void onBack() { controller.onPrev(true); }
 }

HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPageItem.java

@@ -23,14 +23,12 @@ 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.forge.ForgeRemoteVersion;
-import org.jackhuang.hmcl.download.game.GameRemoteVersion;
-import org.jackhuang.hmcl.download.liteloader.LiteLoaderRemoteVersion;
+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;
 
@@ -38,7 +36,7 @@ import java.util.Objects;
  * @author huangyuhui
  */
 public final class VersionsPageItem extends StackPane {
-    private final RemoteVersion remoteVersion;
+    private final RemoteVersion<?> remoteVersion;
     @FXML
     private Label lblSelfVersion;
     @FXML
@@ -50,34 +48,34 @@ public final class VersionsPageItem extends StackPane {
     @FXML
     private StackPane imageViewContainer;
 
-    public VersionsPageItem(RemoteVersion remoteVersion) {
+    public VersionsPageItem(RemoteVersion<?> remoteVersion) {
         this.remoteVersion = Objects.requireNonNull(remoteVersion);
 
         FXUtils.loadFXML(this, "/assets/fxml/download/versions-list-item.fxml");
         lblSelfVersion.setText(remoteVersion.getSelfVersion());
 
-        if (remoteVersion instanceof GameRemoteVersion) {
-            switch (remoteVersion.getVersionType()) {
+        if (remoteVersion.getTag() instanceof GameRemoteVersionTag) {
+            switch (((GameRemoteVersionTag) remoteVersion.getTag()).getType()) {
                 case RELEASE:
-                    lblGameVersion.setText(i18n("version.game.release"));
+                    lblGameVersion.setText(Launcher.i18n("version.game.release"));
                     imageView.setImage(new Image("/assets/img/icon.png", 32, 32, false, true));
                     break;
                 case SNAPSHOT:
-                    lblGameVersion.setText(i18n("version.game.snapshot"));
+                    lblGameVersion.setText(Launcher.i18n("version.game.snapshot"));
                     imageView.setImage(new Image("/assets/img/command.png", 32, 32, false, true));
                     break;
                 default:
-                    lblGameVersion.setText(i18n("version.game.old"));
+                    lblGameVersion.setText(Launcher.i18n("version.game.old"));
                     imageView.setImage(new Image("/assets/img/grass.png", 32, 32, false, true));
                     break;
             }
-        } else if (remoteVersion instanceof LiteLoaderRemoteVersion) {
+        } else if (remoteVersion.getTag() instanceof LiteLoaderRemoteVersionTag) {
             imageView.setImage(new Image("/assets/img/chicken.png", 32, 32, false, true));
             lblGameVersion.setText(remoteVersion.getGameVersion());
         } else if (remoteVersion instanceof OptiFineRemoteVersion) {
             // optifine has no icon.
             lblGameVersion.setText(remoteVersion.getGameVersion());
-        } else if (remoteVersion instanceof ForgeRemoteVersion) {
+        } else { // forge
             imageView.setImage(new Image("/assets/img/forge.png", 32, 32, false, true));
             lblGameVersion.setText(remoteVersion.getGameVersion());
         }
@@ -85,7 +83,7 @@ public final class VersionsPageItem extends StackPane {
         leftPane.getChildren().remove(imageViewContainer);
     }
 
-    public RemoteVersion getRemoteVersion() {
+    public RemoteVersion<?> getRemoteVersion() {
         return remoteVersion;
     }
 }

HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ExportWizardProvider.java

@@ -23,12 +23,13 @@ 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.Zipper;
+import org.jackhuang.hmcl.util.Constants;
+import org.jackhuang.hmcl.util.ZipEngine;
 
 import java.io.File;
 import java.nio.file.Files;
@@ -37,8 +38,6 @@ 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;
@@ -81,19 +80,27 @@ public final class ExportWizardProvider implements WizardProvider {
                     dependency = dependency.then(Task.of(() -> {
                         boolean flag = true;
 
-                        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);
+                        try (ZipEngine zip = new ZipEngine(modpackFile)) {
+                            Config config = Settings.INSTANCE.getRawConfig();
+
+                            config.setHasProxy(false);
+                            config.setSelectedProfile("");
+                            config.setCommonDirectory(null);
+                            config.setFontFamily("Consolas");
+                            config.setFontSize(12);
+                            config.setJava(null);
+                            config.setLocalization(null);
+                            config.setAccounts(null);
+                            config.setSelectedAccount("");
+                            config.setLogLines(100);
+                            config.setConfigurations(null);
+
+                            zip.putTextFile(Settings.GSON.toJson(config), Settings.SETTINGS_FILE_NAME);
                             zip.putFile(tempModpack, "modpack.zip");
 
                             File bg = new File("bg").getAbsoluteFile();
                             if (bg.isDirectory())
-                                zip.putDirectory(bg.toPath(), "bg");
+                                zip.putDirectory(bg);
 
                             File background_png = new File("background.png").getAbsoluteFile();
                             if (background_png.isFile())

HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackFileSelectionPage.java

@@ -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;
@@ -33,17 +33,16 @@ import org.jackhuang.hmcl.ui.construct.NoneMultipleSelectionModel;
 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.Lang;
+import org.jackhuang.hmcl.util.Pair;
 import org.jackhuang.hmcl.util.StringUtils;
+
 import java.io.File;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 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 +150,23 @@ public final class ModpackFileSelectionPage extends StackPane implements WizardP
 
     @Override
     public String getTitle() {
-        return i18n("modpack.wizard.step.2.title");
+        return Launcher.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", 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"))
+    private static final Map<String, String> TRANSLATION = Lang.mapOf(
+            new Pair<>("minecraft/servers.dat", Launcher.i18n("modpack.files.servers_dat")),
+            new Pair<>("minecraft/saves", Launcher.i18n("modpack.files.saves")),
+            new Pair<>("minecraft/mods", Launcher.i18n("modpack.files.mods")),
+            new Pair<>("minecraft/config", Launcher.i18n("modpack.files.config")),
+            new Pair<>("minecraft/liteconfig", Launcher.i18n("modpack.files.liteconfig")),
+            new Pair<>("minecraft/resourcepacks", Launcher.i18n("modpack.files.resourcepacks")),
+            new Pair<>("minecraft/resources", Launcher.i18n("modpack.files.resourcepacks")),
+            new Pair<>("minecraft/options.txt", Launcher.i18n("modpack.files.options_txt")),
+            new Pair<>("minecraft/optionsshaders.txt", Launcher.i18n("modpack.files.optionsshaders_txt")),
+            new Pair<>("minecraft/mods/VoxelMods", Launcher.i18n("modpack.files.mods.voxelmods")),
+            new Pair<>("minecraft/dumps", Launcher.i18n("modpack.files.dumps")),
+            new Pair<>("minecraft/blueprints", Launcher.i18n("modpack.files.blueprints")),
+            new Pair<>("minecraft/scripts", Launcher.i18n("modpack.files.scripts"))
     );
 }

HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackInfoPage.java

@@ -28,12 +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.Accounts;
+import org.jackhuang.hmcl.setting.Settings;
 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 org.jackhuang.hmcl.util.FileUtils;
 
 import java.io.File;
 import java.util.List;
@@ -67,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(Accounts.getSelectedAccount()).map(Account::getUsername).orElse(""));
+        txtModpackAuthor.setText(Optional.ofNullable(Settings.INSTANCE.getSelectedAccount()).map(Account::getUsername).orElse(""));
         lblVersionName.setText(version);
 
         List<File> launcherJar = Launcher.getCurrentJarFiles();
@@ -82,8 +82,8 @@ public final class ModpackInfoPage extends StackPane implements WizardPage {
     @FXML
     private void onNext() {
         FileChooser fileChooser = new FileChooser();
-        fileChooser.setTitle(i18n("modpack.wizard.step.initialization.save"));
-        fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("modpack"), "*.zip"));
+        fileChooser.setTitle(Launcher.i18n("modpack.wizard.step.initialization.save"));
+        fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(Launcher.i18n("modpack"), "*.zip"));
         File file = fileChooser.showSaveDialog(Controllers.getStage());
         if (file == null) {
             Controllers.navigate(null);
@@ -110,7 +110,7 @@ public final class ModpackInfoPage extends StackPane implements WizardPage {
 
     @Override
     public String getTitle() {
-        return i18n("modpack.wizard.step.1.title");
+        return Launcher.i18n("modpack.wizard.step.1.title");
     }
 
     public static final String MODPACK_NAME = "modpack.name";

HMCL/src/main/java/org/jackhuang/hmcl/ui/wizard/WizardController.java

@@ -20,7 +20,10 @@ package org.jackhuang.hmcl.ui.wizard;
 import javafx.scene.Node;
 import org.jackhuang.hmcl.task.Task;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Stack;
 
 public class WizardController implements Navigation {
     private final WizardDisplayer displayer;
@@ -44,10 +47,6 @@ public class WizardController implements Navigation {
         this.provider = provider;
     }
 
-    public List<Node> getPages() {
-        return Collections.unmodifiableList(pages);
-    }
-
     @Override
     public void onStart() {
         Objects.requireNonNull(provider);
@@ -82,10 +81,6 @@ 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);

HMCL/src/main/java/org/jackhuang/hmcl/upgrade/AppDataUpgrader.java

@@ -0,0 +1,259 @@
+/*
+ * 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.Schedulers;
+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.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+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 boolean launchNewerVersion(List<String> args, File jar) throws IOException, PrivilegedActionException {
+        try (JarFile jarFile = new JarFile(jar)) {
+            String mainClass = jarFile.getManifest().getMainAttributes().getValue("Main-Class");
+            if (mainClass != null) {
+                ArrayList<String> al = new ArrayList<>(args);
+                al.add("--noupdate");
+                ClassLoader pre = Thread.currentThread().getContextClassLoader();
+                try {
+                    AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> {
+                        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])});
+                        return null;
+                    });
+                } finally {
+                    Logging.start();
+                    Thread.currentThread().setContextClassLoader(pre);
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @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 | PrivilegedActionException t) {
+                Logging.LOG.log(Level.SEVERE, "Unable to execute newer version application", t);
+            }
+    }
+
+    @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 (MessageBox.confirm(Launcher.i18n("update.newest_version", version.toString()) + "\n"
+                            + Launcher.i18n("update.should_open_link"),
+                    MessageBox.YES_NO_OPTION) == MessageBox.YES_OPTION)
+                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(); 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 = Launcher.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);
+        }
+
+    }
+}

HMCL/src/main/java/org/jackhuang/hmcl/upgrade/ExecutableHeaderHelper.java

@@ -1,124 +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 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);
-        }
-    }
-}

HMCL/src/main/java/org/jackhuang/hmcl/upgrade/IUpgrader.java

@@ -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.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);
+}

HMCL/src/main/java/org/jackhuang/hmcl/upgrade/IntegrityChecker.java

@@ -1,130 +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 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);
-    }
-}

HMCL/src/main/java/org/jackhuang/hmcl/upgrade/LocalRepository.java

@@ -1,162 +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.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());
-    }
-}

HMCL/src/main/java/org/jackhuang/hmcl/upgrade/NewFileUpgrader.java

@@ -0,0 +1,94 @@
+/*
+ * 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.Charsets;
+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;
+
+/**
+ *
+ * @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, Charsets.DEFAULT_CHARSET.name());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return realPath;
+    }
+
+    private URL requestDownloadLink() {
+        return null;
+    }
+
+}
+

HMCL/src/main/java/org/jackhuang/hmcl/upgrade/RemoteVersion.java

@@ -1,90 +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 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
-    }
-}

HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateChecker.java

@@ -1,7 +1,7 @@
 /*
  * Hello Minecraft! Launcher.
  * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- *
+ * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -17,119 +17,124 @@
  */
 package org.jackhuang.hmcl.upgrade;
 
-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.Lang.thread;
-import static org.jackhuang.hmcl.util.Logging.LOG;
-import static org.jackhuang.hmcl.util.Pair.pair;
-import static org.jackhuang.hmcl.util.VersionNumber.asVersion;
+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.TaskResult;
+import org.jackhuang.hmcl.ui.construct.MessageBox;
+import org.jackhuang.hmcl.util.Constants;
+import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.NetworkUtils;
+import org.jackhuang.hmcl.util.VersionNumber;
 
 import java.io.IOException;
+import java.util.Map;
 import java.util.logging.Level;
 
-import javafx.beans.property.*;
-import org.jackhuang.hmcl.Metadata;
-import org.jackhuang.hmcl.setting.ConfigHolder;
-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;
-
+/**
+ *
+ * @author huangyuhui
+ */
 public final class UpdateChecker {
-    private UpdateChecker() {}
 
-    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);
+    private volatile boolean outOfDate = false;
+    private final VersionNumber base;
+    private String versionString;
+    private Map<String, String> download_link = null;
 
-    public static void init() {
-        ConfigHolder.config().updateChannelProperty().addListener(onInvalidating(UpdateChecker::requestCheckUpdate));
-        requestCheckUpdate();
+    public UpdateChecker(VersionNumber base) {
+        this.base = base;
     }
 
-    public static RemoteVersion getLatestVersion() {
-        return latestVersion.get();
+    private VersionNumber value;
+
+    public boolean isOutOfDate() {
+        return outOfDate;
     }
 
-    public static ReadOnlyObjectProperty<RemoteVersion> latestVersionProperty() {
-        return latestVersion;
-    }
+    /**
+     * 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>() {
+            @Override
+            public void execute() throws Exception {
+                if (Launcher.VERSION.contains("@"))
+                    return;
 
-    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();
-    }
-
-    private static RemoteVersion checkUpdate(UpdateChannel channel) throws IOException {
-        if (!IntegrityChecker.isSelfVerified()) {
-            throw new IOException("Self verification failed");
-        }
-
-        String url = NetworkUtils.withQuery(Metadata.UPDATE_URL, mapOf(
-                pair("version", Metadata.VERSION),
-                pair("channel", channel.channelName)));
-
-        return RemoteVersion.fetch(url);
-    }
-
-    private static boolean isDevelopmentVersion(String version) {
-        return version.contains("@") || // eg. @develop@
-                version.contains("SNAPSHOT"); // eg. 3.1.SNAPSHOT
-    }
-
-    public static void requestCheckUpdate() {
-        Platform.runLater(() -> {
-            if (isCheckingUpdate())
-                return;
-            checkingUpdate.set(true);
-            UpdateChannel channel = config().getUpdateChannel();
-
-            thread(() -> {
-                RemoteVersion result = null;
-                try {
-                    result = checkUpdate(channel);
-                    LOG.info("Latest version (" + channel + ") is " + result);
-                } catch (IOException e) {
-                    LOG.log(Level.WARNING, "Failed to check for update", e);
+                if (value == null) {
+                    versionString = NetworkUtils.doGet(NetworkUtils.toURL("https://huangyuhui.duapp.com/hmcl/update.php?version=" + Launcher.VERSION));
+                    value = VersionNumber.asVersion(versionString);
                 }
 
-                RemoteVersion finalResult = result;
-                Platform.runLater(() -> {
-                    checkingUpdate.set(false);
-                    if (finalResult != null) {
-                        if (channel.equals(config().getUpdateChannel())) {
-                            latestVersion.set(finalResult);
-                        } else {
-                            // the channel has been changed during the period
-                            // check update again
-                            requestCheckUpdate();
-                        }
+                if (value == null) {
+                    Logging.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";
+            }
+        };
+    }
+
+    /**
+     * 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("https://huangyuhui.duapp.com/hmcl/update_link.php")), Map.class);
+                    } catch (JsonSyntaxException | IOException e) {
+                        Logging.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());
+            }
     }
 }