Merge pull request #616 from machinesmith42/javafx

Update I18N.properties

HMCL/build.gradle

@@ -112,7 +112,7 @@ def createExecutable(String suffix, String header) {
 
 processResources {
     ext.convertToBSS = { String resource ->
-        exclude resource
+        // exclude resource
         doFirst {
             def cssFile = new File(this.projectDir, "src/main/resources/" + resource)
             def bssFile = new File(this.projectDir, "build/compiled-resources/" + resource[0..-4] + "bss")
@@ -140,7 +140,7 @@ task makePack(dependsOn: jar) {
 
 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 }
+    new XZOutputStream(packXz.newOutputStream(), new LZMA2Options(5)).withCloseable { it << makePack.outputPath.bytes }
     createChecksum(packXz)
 }
 

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

@@ -17,15 +17,20 @@
  */
 package org.jackhuang.hmcl;
 
-import com.jfoenix.utils.JFXUtilities;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.stage.Stage;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
+import org.jackhuang.hmcl.setting.Accounts;
+import org.jackhuang.hmcl.setting.AuthlibInjectorServers;
 import org.jackhuang.hmcl.setting.ConfigHolder;
 import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.upgrade.UpdateChecker;
-import org.jackhuang.hmcl.util.*;
+import org.jackhuang.hmcl.util.CrashReporter;
+import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 
 import java.io.File;
@@ -39,6 +44,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.Logging.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
@@ -51,6 +58,14 @@ public final class Launcher extends Application {
         try {
             try {
                 ConfigHolder.init();
+                AuthlibInjectorServers.init();
+
+                if (ConfigHolder.isNewlyCreated() && !AuthlibInjectorServers.getConfigInstance().getUrls().isEmpty()) {
+                    config().setPreferredLoginType(Accounts.getLoginType(Accounts.FACTORY_AUTHLIB_INJECTOR));
+                    AuthlibInjectorServers.getConfigInstance().getUrls().stream()
+                            .map(AuthlibInjectorServer::new)
+                            .forEach(config().getAuthlibInjectorServers()::add);
+                }
             } catch (IOException e) {
                 Main.showErrorAndExit(i18n("fatal.config_loading_failure", Paths.get("").toAbsolutePath().normalize()));
             }
@@ -75,6 +90,7 @@ public final class Launcher extends Application {
 
     public static void main(String[] args) {
         Thread.setDefaultUncaughtExceptionHandler(CRASH_REPORTER);
+        TaskExecutor.setUncaughtExceptionHandler(new CrashReporter(false));
 
         try {
             LOG.info("*** " + Metadata.TITLE + " ***");
@@ -97,7 +113,7 @@ public final class Launcher extends Application {
     public static void stopApplication() {
         LOG.info("Stopping application.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
 
-        JFXUtilities.runInFX(() -> {
+        runInFX(() -> {
             if (Controllers.getStage() == null)
                 return;
             Controllers.getStage().close();
@@ -111,7 +127,7 @@ public final class Launcher extends Application {
     public static void stopWithoutPlatform() {
         LOG.info("Stopping application without JavaFX Toolkit.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
 
-        JFXUtilities.runInFX(() -> {
+        runInFX(() -> {
             if (Controllers.getStage() == null)
                 return;
             Controllers.getStage().close();
@@ -140,5 +156,5 @@ public final class Launcher extends Application {
             return result;
     }
 
-    public static final CrashReporter CRASH_REPORTER = new CrashReporter();
+    public static final CrashReporter CRASH_REPORTER = new CrashReporter(true);
 }

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

@@ -46,7 +46,7 @@ public final class Main {
         checkDirectoryPath();
 
         // This environment check will take ~300ms
-        thread(() -> checkDSTRootCAX3(), "CA Certificate Check", true);
+        thread(Main::checkDSTRootCAX3, "CA Certificate Check", true);
 
         Logging.start(Metadata.HMCL_DIRECTORY.resolve("logs"));
 

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

@@ -35,6 +35,7 @@ public final class Metadata {
     public static final String UPDATE_URL = System.getProperty("hmcl.update_source.override", "https://hmcl.huangyuhui.net/api/update_link");
     public static final String CONTACT_URL = "https://hmcl.huangyuhui.net/contact";
     public static final String HELP_URL = "https://hmcl.huangyuhui.net/help";
+    public static final String CHANGELOG_URL = "https://hmcl.huangyuhui.net/changelog/";
     public static final String PUBLISH_URL = "http://www.mcbbs.net/thread-142335-1-1.html";
 
     public static final Path MINECRAFT_DIRECTORY = OperatingSystem.getWorkingDirectory("minecraft");

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

@@ -29,16 +29,16 @@ import java.util.Map;
  */
 public final class HMCLGameLauncher extends DefaultLauncher {
 
-    public HMCLGameLauncher(GameRepository repository, String versionId, AuthInfo authInfo, LaunchOptions options) {
-        this(repository, versionId, authInfo, options, null);
+    public HMCLGameLauncher(GameRepository repository, Version version, AuthInfo authInfo, LaunchOptions options) {
+        this(repository, version, authInfo, options, null);
     }
 
-    public HMCLGameLauncher(GameRepository repository, String versionId, AuthInfo authInfo, LaunchOptions options, ProcessListener listener) {
-        this(repository, versionId, authInfo, options, listener, true);
+    public HMCLGameLauncher(GameRepository repository, Version version, AuthInfo authInfo, LaunchOptions options, ProcessListener listener) {
+        this(repository, version, authInfo, options, listener, true);
     }
 
-    public HMCLGameLauncher(GameRepository repository, String versionId, AuthInfo authInfo, LaunchOptions options, ProcessListener listener, boolean daemon) {
-        super(repository, versionId, authInfo, options, listener, daemon);
+    public HMCLGameLauncher(GameRepository repository, Version version, AuthInfo authInfo, LaunchOptions options, ProcessListener listener, boolean daemon) {
+        super(repository, version, authInfo, options, listener, daemon);
     }
 
     @Override

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

@@ -31,6 +31,8 @@ import java.io.IOException;
 import java.util.*;
 import java.util.logging.Level;
 
+import static org.jackhuang.hmcl.ui.FXUtils.newImage;
+
 public class HMCLGameRepository extends DefaultGameRepository {
     private final Profile profile;
     private final Map<String, VersionSetting> versionSettings = new HashMap<>();
@@ -150,18 +152,20 @@ public class HMCLGameRepository extends DefaultGameRepository {
 
     public Image getVersionIconImage(String id) {
         if (id == null || !isLoaded())
-            return new Image("/assets/img/grass.png");
+            return newImage("/assets/img/grass.png");
 
         Version version = getVersion(id);
         File iconFile = getVersionIconFile(id);
         if (iconFile.exists())
             return new Image("file:" + iconFile.getAbsolutePath());
-        else if ("net.minecraft.launchwrapper.Launch".equals(version.getMainClass()))
-            return new Image("/assets/img/furnace.png");
-        else if ("cpw.mods.modlauncher.Launcher".equals(version.getMainClass()))
-            return new Image("/assets/img/furnace.png");
+        else if (!version.getPatches().isEmpty() ||
+                version.getMainClass() != null &&
+                ("net.minecraft.launchwrapper.Launch".equals(version.getMainClass())
+                        || version.getMainClass().startsWith("net.fabricmc")
+                        || "cpw.mods.modlauncher.Launcher".equals(version.getMainClass())))
+            return newImage("/assets/img/furnace.png");
         else
-            return new Image("/assets/img/grass.png");
+            return newImage("/assets/img/grass.png");
     }
 
     public boolean saveVersionSetting(String id) {

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

@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hmcl.game;
 
+import org.jackhuang.hmcl.mod.ModAdviser;
 import org.jackhuang.hmcl.mod.Modpack;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.util.Logging;
@@ -24,6 +25,7 @@ import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.Zipper;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -55,7 +57,7 @@ public class HMCLModpackExportTask extends Task<Void> {
 
     @Override
     public void execute() throws Exception {
-        ArrayList<String> blackList = new ArrayList<>(HMCLModpackManager.MODPACK_BLACK_LIST);
+        ArrayList<String> blackList = new ArrayList<>(ModAdviser.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");
@@ -72,9 +74,9 @@ public class HMCLModpackExportTask extends Task<Void> {
                 return false;
             });
 
-            Version mv = repository.getResolvedVersion(version);
+            Version mv = repository.getResolvedPreservingPatchesVersion(version);
             String gameVersion = GameVersion.minecraftVersion(repository.getVersionJar(version))
-                    .orElseThrow(() ->  new IllegalStateException("Cannot parse the version of " + version));
+                    .orElseThrow(() ->  new IOException("Cannot parse the version of " + version));
             zip.putTextFile(JsonUtils.GSON.toJson(mv.setJar(gameVersion)), "minecraft/pack.json"); // Making "jar" to gameVersion is to be compatible with old HMCL.
             zip.putTextFile(JsonUtils.GSON.toJson(modpack.setGameVersion(gameVersion)), "modpack.json"); // Newer HMCL only reads 'gameVersion' field.
         }

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

@@ -19,8 +19,8 @@ package org.jackhuang.hmcl.game;
 
 import com.google.gson.JsonParseException;
 import com.google.gson.reflect.TypeToken;
-import org.jackhuang.hmcl.download.DependencyManager;
-import org.jackhuang.hmcl.download.game.VersionJsonSaveTask;
+import org.jackhuang.hmcl.download.DefaultDependencyManager;
+import org.jackhuang.hmcl.download.LibraryAnalyzer;
 import org.jackhuang.hmcl.mod.MinecraftInstanceTask;
 import org.jackhuang.hmcl.mod.Modpack;
 import org.jackhuang.hmcl.mod.ModpackConfiguration;
@@ -40,12 +40,13 @@ public final class HMCLModpackInstallTask extends Task<Void> {
     private final File zipFile;
     private final String name;
     private final HMCLGameRepository repository;
+    private final DefaultDependencyManager dependency;
     private final Modpack modpack;
     private final List<Task<?>> dependencies = new LinkedList<>();
     private final List<Task<?>> dependents = new LinkedList<>();
 
     public HMCLModpackInstallTask(Profile profile, File zipFile, Modpack modpack, String name) {
-        DependencyManager dependency = profile.getDependency();
+        dependency = profile.getDependency();
         repository = profile.getRepository();
         this.zipFile = zipFile;
         this.name = name;
@@ -89,8 +90,18 @@ public final class HMCLModpackInstallTask extends Task<Void> {
     @Override
     public void execute() throws Exception {
         String json = CompressingUtils.readTextZipEntry(zipFile, "minecraft/pack.json");
-        Version version = JsonUtils.GSON.fromJson(json, Version.class).setId(name).setJar(null);
-        dependencies.add(new VersionJsonSaveTask(repository, version));
+        Version originalVersion = JsonUtils.GSON.fromJson(json, Version.class).setId(name).setJar(null);
+        LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(originalVersion);
+        Task<Version> libraryTask = Task.supplyAsync(() -> originalVersion);
+        // reinstall libraries
+        // libraries of Forge and OptiFine should be obtained by installation.
+        for (LibraryAnalyzer.LibraryMark mark : analyzer) {
+            if (LibraryAnalyzer.LibraryType.MINECRAFT.getPatchId().equals(mark.getLibraryId()))
+                continue;
+            libraryTask = libraryTask.thenComposeAsync(version -> dependency.installLibraryAsync(modpack.getGameVersion(), version, mark.getLibraryId(), mark.getLibraryVersion()));
+        }
+
+        dependencies.add(libraryTask.thenComposeAsync(repository::save));
         dependencies.add(new MinecraftInstanceTask<>(zipFile, modpack.getEncoding(), "/minecraft", modpack, MODPACK_TYPE, repository.getModpackConfiguration(name)));
     }
 

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

@@ -19,7 +19,6 @@ package org.jackhuang.hmcl.game;
 
 import com.google.gson.JsonParseException;
 import org.jackhuang.hmcl.mod.Modpack;
-import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.CompressingUtils;
@@ -27,51 +26,12 @@ import org.jackhuang.hmcl.util.io.CompressingUtils;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.file.Path;
-import java.util.List;
 
 /**
  * @author huangyuhui
  */
 public final class HMCLModpackManager {
 
-    public static final List<String> MODPACK_BLACK_LIST = Lang.immutableListOf(
-            "usernamecache.json", "usercache.json", // Minecraft
-            "launcher_profiles.json", "launcher.pack.lzma", // Minecraft Launcher
-            "pack.json", "launcher.jar", "hmclmc.log", "cache", // HMCL
-            "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
-            "downloads", // Curse
-            "asm", "backups", "TCNodeTracker", "CustomDISkins", "data" // Mods
-    );
-    public static final List<String> MODPACK_SUGGESTED_BLACK_LIST = Lang.immutableListOf(
-            "fonts", // BetterFonts
-            "saves", "servers.dat", "options.txt", // Minecraft
-            "blueprints" /* BuildCraft */,
-            "optionsof.txt" /* OptiFine */,
-            "journeymap" /* JourneyMap */,
-            "optionsshaders.txt",
-            "mods/VoxelMods");
-
-    public static ModAdviser.ModSuggestion suggestMod(String fileName, boolean isDirectory) {
-        if (match(MODPACK_BLACK_LIST, fileName, isDirectory))
-            return ModAdviser.ModSuggestion.HIDDEN;
-        if (match(MODPACK_SUGGESTED_BLACK_LIST, fileName, isDirectory))
-            return ModAdviser.ModSuggestion.NORMAL;
-        else
-            return ModAdviser.ModSuggestion.SUGGESTED;
-    }
-
-    private static boolean match(List<String> l, String fileName, boolean isDirectory) {
-        for (String s : l)
-            if (isDirectory) {
-                if (fileName.startsWith(s + "/"))
-                    return true;
-            } else if (fileName.equals(s))
-                return true;
-        return false;
-    }
-
     /**
      * Read the manifest in a HMCL modpack.
      *

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

@@ -18,6 +18,7 @@
 package org.jackhuang.hmcl.game;
 
 import javafx.application.Platform;
+import javafx.stage.Stage;
 import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.AuthInfo;
@@ -26,14 +27,20 @@ import org.jackhuang.hmcl.auth.CredentialExpiredException;
 import org.jackhuang.hmcl.download.DefaultDependencyManager;
 import org.jackhuang.hmcl.download.MaintainTask;
 import org.jackhuang.hmcl.download.game.LibraryDownloadException;
-import org.jackhuang.hmcl.launch.*;
-import org.jackhuang.hmcl.mod.CurseCompletionException;
-import org.jackhuang.hmcl.mod.CurseCompletionTask;
+import org.jackhuang.hmcl.launch.NotDecompressingNativesException;
+import org.jackhuang.hmcl.launch.PermissionException;
+import org.jackhuang.hmcl.launch.ProcessCreationException;
+import org.jackhuang.hmcl.launch.ProcessListener;
+import org.jackhuang.hmcl.mod.curse.CurseCompletionException;
+import org.jackhuang.hmcl.mod.curse.CurseCompletionTask;
 import org.jackhuang.hmcl.mod.ModpackConfiguration;
 import org.jackhuang.hmcl.setting.LauncherVisibility;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.VersionSetting;
-import org.jackhuang.hmcl.task.*;
+import org.jackhuang.hmcl.task.Schedulers;
+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.DialogController;
 import org.jackhuang.hmcl.ui.LogWindow;
@@ -55,7 +62,13 @@ import org.jackhuang.hmcl.util.versioning.VersionNumber;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.util.*;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -118,18 +131,18 @@ public final class LauncherHelper {
     private void launch0() {
         HMCLGameRepository repository = profile.getRepository();
         DefaultDependencyManager dependencyManager = profile.getDependency();
-        Version version = MaintainTask.maintain(repository.getResolvedVersion(selectedVersion));
+        Version version = MaintainTask.maintain(repository, repository.getResolvedVersion(selectedVersion));
         Optional<String> gameVersion = GameVersion.minecraftVersion(repository.getVersionJar(version));
 
         TaskExecutor executor = Task.runAsync(Schedulers.javafx(), () -> emitStatus(LoadingState.DEPENDENCIES))
-                .thenCompose(() -> {
+                .thenComposeAsync(() -> {
                     if (setting.isNotCheckGame())
                         return null;
                     else
                         return dependencyManager.checkGameCompletionAsync(version);
                 })
-                .thenRun(Schedulers.javafx(), () -> emitStatus(LoadingState.MODS))
-                .thenCompose(() -> {
+                .thenRunAsync(Schedulers.javafx(), () -> emitStatus(LoadingState.MODS))
+                .thenComposeAsync(() -> {
                     try {
                         ModpackConfiguration<?> configuration = ModpackHelper.readModpackConfiguration(repository.getModpackConfiguration(selectedVersion));
                         if ("Curse".equals(configuration.getType()))
@@ -140,8 +153,8 @@ public final class LauncherHelper {
                         return null;
                     }
                 })
-                .thenRun(Schedulers.javafx(), () -> emitStatus(LoadingState.LOGGING_IN))
-                .thenSupply(i18n("account.methods"), () -> {
+                .thenRunAsync(Schedulers.javafx(), () -> emitStatus(LoadingState.LOGGING_IN))
+                .thenSupplyAsync(i18n("account.methods"), () -> {
                     try {
                         return account.logIn();
                     } catch (CredentialExpiredException e) {
@@ -152,20 +165,20 @@ public final class LauncherHelper {
                         return account.playOffline().orElseThrow(() -> e);
                     }
                 })
-                .thenApply(Schedulers.javafx(), authInfo -> {
+                .thenApplyAsync(Schedulers.javafx(), authInfo -> {
                     emitStatus(LoadingState.LAUNCHING);
                     return authInfo;
                 })
-                .thenApply(authInfo -> new HMCLGameLauncher(
+                .thenApplyAsync(authInfo -> new HMCLGameLauncher(
                         repository,
-                        selectedVersion,
+                        version.getPatches().isEmpty() ? repository.getResolvedVersion(selectedVersion) : version,
                         authInfo,
                         setting.toLaunchOptions(profile.getGameDir()),
                         launcherVisibility == LauncherVisibility.CLOSE
                                 ? null // Unnecessary to start listening to game process output when close launcher immediately after game launched.
                                 : new HMCLProcessListener(authInfo, gameVersion.isPresent())
                 ))
-                .thenCompose(launcher -> { // launcher is prev task's result
+                .thenComposeAsync(launcher -> { // launcher is prev task's result
                     if (scriptFile == null) {
                         return new LaunchTask<>(launcher::launch).setName(i18n("version.launch"));
                     } else {
@@ -175,7 +188,7 @@ public final class LauncherHelper {
                         }).setName(i18n("version.launch_script"));
                     }
                 })
-                .thenAccept(process -> { // process is LaunchTask's result
+                .thenAcceptAsync(process -> { // process is LaunchTask's result
                     if (scriptFile == null) {
                         PROCESSES.add(process);
                         if (launcherVisibility == LauncherVisibility.CLOSE)
@@ -290,7 +303,7 @@ public final class LauncherHelper {
         }
 
         // LaunchWrapper 1.12 will crash because of assuming the system class loader is an instance of URLClassLoader.
-        if (!flag && java.getParsedVersion() >= JavaVersion.JAVA_9
+        if (!flag && java.getParsedVersion() >= JavaVersion.JAVA_9_AND_LATER
                 && version.getMainClass().contains("launchwrapper")
                 && version.getLibraries().stream()
                 .filter(library -> "launchwrapper".equals(library.getArtifactId()))
@@ -398,7 +411,10 @@ public final class LauncherHelper {
     private void checkExit() {
         switch (launcherVisibility) {
             case HIDE_AND_REOPEN:
-                Platform.runLater(Controllers.getStage()::show);
+                Platform.runLater(() -> {
+                    Optional.ofNullable(Controllers.getStage())
+                            .ifPresent(Stage::show);
+                });
                 break;
             case KEEP:
                 // No operations here

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

@@ -20,6 +20,11 @@ package org.jackhuang.hmcl.game;
 import com.google.gson.JsonParseException;
 import com.google.gson.reflect.TypeToken;
 import org.jackhuang.hmcl.mod.*;
+import org.jackhuang.hmcl.mod.curse.CurseCompletionException;
+import org.jackhuang.hmcl.mod.curse.CurseInstallTask;
+import org.jackhuang.hmcl.mod.curse.CurseManifest;
+import org.jackhuang.hmcl.mod.multimc.MultiMCInstanceConfiguration;
+import org.jackhuang.hmcl.mod.multimc.MultiMCModpackInstallTask;
 import org.jackhuang.hmcl.setting.EnumGameDirectory;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.VersionSetting;
@@ -102,9 +107,6 @@ public final class ModpackHelper {
             if (ex instanceof CurseCompletionException && !(ex.getCause() instanceof FileNotFoundException)) {
                 success.run();
                 // This is tolerable and we will not delete the game
-            } else {
-                HMCLGameRepository repository = profile.getRepository();
-                repository.removeVersionFromDisk(name);
             }
         };
 
@@ -117,8 +119,8 @@ public final class ModpackHelper {
         else if (modpack.getManifest() instanceof MultiMCInstanceConfiguration)
             return new MultiMCModpackInstallTask(profile.getDependency(), zipFile, modpack, ((MultiMCInstanceConfiguration) modpack.getManifest()), name)
                     .whenComplete(Schedulers.defaultScheduler(), success, failure)
-                    .thenCompose(new MultiMCInstallVersionSettingTask(profile, ((MultiMCInstanceConfiguration) modpack.getManifest()), name));
-        else throw new IllegalStateException("Unrecognized modpack: " + modpack);
+                    .thenComposeAsync(new MultiMCInstallVersionSettingTask(profile, ((MultiMCInstanceConfiguration) modpack.getManifest()), name));
+        else throw new IllegalArgumentException("Unrecognized modpack: " + modpack);
     }
 
     public static Task<Void> getUpdateTask(Profile profile, File zipFile, Charset charset, String name, ModpackConfiguration<?> configuration) throws UnsupportedModpackException, MismatchedModpackTypeException {

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

@@ -17,7 +17,7 @@
  */
 package org.jackhuang.hmcl.game;
 
-import org.jackhuang.hmcl.mod.MultiMCInstanceConfiguration;
+import org.jackhuang.hmcl.mod.multimc.MultiMCInstanceConfiguration;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.VersionSetting;
 import org.jackhuang.hmcl.task.Schedulers;

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

@@ -17,13 +17,21 @@
  */
 package org.jackhuang.hmcl.game;
 
-import static java.util.Collections.emptyMap;
-import static java.util.Collections.singletonMap;
-import static java.util.Objects.requireNonNull;
-import static org.jackhuang.hmcl.util.Lang.threadPool;
-import static org.jackhuang.hmcl.util.Logging.LOG;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.ObjectBinding;
+import javafx.embed.swing.SwingFXUtils;
+import javafx.scene.image.Image;
+import org.jackhuang.hmcl.Metadata;
+import org.jackhuang.hmcl.auth.Account;
+import org.jackhuang.hmcl.auth.ServerResponseMalformedException;
+import org.jackhuang.hmcl.auth.yggdrasil.*;
+import org.jackhuang.hmcl.task.FileDownloadTask;
+import org.jackhuang.hmcl.util.ResourceNotFoundError;
+import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.javafx.BindingMapping;
 
-import java.awt.Graphics2D;
+import javax.imageio.ImageIO;
+import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
@@ -40,24 +48,11 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 
-import javax.imageio.ImageIO;
-
-import org.jackhuang.hmcl.Metadata;
-import org.jackhuang.hmcl.auth.Account;
-import org.jackhuang.hmcl.auth.ServerResponseMalformedException;
-import org.jackhuang.hmcl.auth.yggdrasil.Texture;
-import org.jackhuang.hmcl.auth.yggdrasil.TextureModel;
-import org.jackhuang.hmcl.auth.yggdrasil.TextureType;
-import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
-import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilService;
-import org.jackhuang.hmcl.task.FileDownloadTask;
-import org.jackhuang.hmcl.util.StringUtils;
-import org.jackhuang.hmcl.util.javafx.BindingMapping;
-
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.ObjectBinding;
-import javafx.embed.swing.SwingFXUtils;
-import javafx.scene.image.Image;
+import static java.util.Collections.emptyMap;
+import static java.util.Collections.singletonMap;
+import static java.util.Objects.requireNonNull;
+import static org.jackhuang.hmcl.util.Lang.threadPool;
+import static org.jackhuang.hmcl.util.Logging.LOG;
 
 /**
  * @author yushijinhun
@@ -126,6 +121,9 @@ public final class TexturesLoader {
         try (InputStream in = Files.newInputStream(file)) {
             img = ImageIO.read(in);
         }
+        if (img == null)
+            throw new IOException("Texture is malformed");
+
         Map<String, String> metadata = texture.getMetadata();
         if (metadata == null) {
             metadata = emptyMap();
@@ -140,8 +138,9 @@ public final class TexturesLoader {
         loadDefaultSkin("/assets/img/steve.png", TextureModel.STEVE);
         loadDefaultSkin("/assets/img/alex.png", TextureModel.ALEX);
     }
+
     private static void loadDefaultSkin(String path, TextureModel model) {
-        try (InputStream in = TexturesLoader.class.getResourceAsStream(path)) {
+        try (InputStream in = ResourceNotFoundError.getResourceAsStream(path)) {
             DEFAULT_SKINS.put(model, new LoadedTexture(ImageIO.read(in), singletonMap("model", model.modelName)));
         } catch (IOException e) {
             throw new UncheckedIOException(e);

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

@@ -0,0 +1,78 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.setting;
+
+import com.google.gson.JsonParseException;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
+import org.jackhuang.hmcl.util.gson.Validation;
+import org.jackhuang.hmcl.util.io.FileUtils;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Level;
+
+import static org.jackhuang.hmcl.util.Logging.LOG;
+
+public class AuthlibInjectorServers implements Validation {
+
+    public static final String CONFIG_FILENAME = "authlib-injectors.json";
+
+    private final List<String> urls;
+
+    public AuthlibInjectorServers(List<String> urls) {
+        this.urls = urls;
+    }
+
+    public List<String> getUrls() {
+        return urls;
+    }
+
+    @Override
+    public void validate() throws JsonParseException {
+        if (urls == null)
+            throw new JsonParseException("authlib-injectors.json -> urls cannot be null");
+    }
+
+    private static final Path configLocation = Paths.get(CONFIG_FILENAME);
+    private static AuthlibInjectorServers configInstance;
+
+    public synchronized static void init() {
+        if (configInstance != null) {
+            throw new IllegalStateException("AuthlibInjectorServers is already loaded");
+        }
+
+        configInstance = new AuthlibInjectorServers(Collections.emptyList());
+
+        if (Files.exists(configLocation)) {
+            try {
+                String content = FileUtils.readText(configLocation);
+                configInstance = JsonUtils.GSON.fromJson(content, AuthlibInjectorServers.class);
+            } catch (IOException | JsonParseException e) {
+                LOG.log(Level.WARNING, "Malformed authlib-injectors.json", e);
+            }
+        }
+    }
+
+    public static AuthlibInjectorServers getConfigInstance() {
+        return configInstance;
+    }
+}

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

@@ -52,6 +52,10 @@ public final class ConfigHolder {
         return configInstance;
     }
 
+    public static boolean isNewlyCreated() {
+        return newlyCreated;
+    }
+
     public synchronized static void init() throws IOException {
         if (configInstance != null) {
             throw new IllegalStateException("Configuration is already loaded");

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

@@ -19,7 +19,6 @@ package org.jackhuang.hmcl.setting;
 
 import com.google.gson.*;
 import com.google.gson.annotations.JsonAdapter;
-import com.jfoenix.utils.JFXUtilities;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
@@ -32,7 +31,7 @@ import org.jackhuang.hmcl.game.HMCLCacheRepository;
 import org.jackhuang.hmcl.game.HMCLGameRepository;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.ui.WeakListenerHolder;
-import org.jackhuang.hmcl.util.*;
+import org.jackhuang.hmcl.util.ToStringBuilder;
 import org.jackhuang.hmcl.util.javafx.ObservableHelper;
 
 import java.io.File;
@@ -40,6 +39,7 @@ import java.lang.reflect.Type;
 import java.util.Optional;
 
 import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
+import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 
 /**
  *
@@ -144,7 +144,7 @@ public final class Profile implements Observable {
     }
 
     private void checkSelectedVersion() {
-        JFXUtilities.runInFX(() -> {
+        runInFX(() -> {
             if (!repository.isLoaded()) return;
             String newValue = selectedVersion.get();
             if (!repository.hasVersion(newValue)) {
@@ -226,7 +226,7 @@ public final class Profile implements Observable {
 
         @Override
         public Profile deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-            if (json == null || json == JsonNull.INSTANCE || !(json instanceof JsonObject)) return null;
+            if (json == JsonNull.INSTANCE || !(json instanceof JsonObject)) return null;
             JsonObject obj = (JsonObject) json;
             String gameDir = Optional.ofNullable(obj.get("gameDir")).map(JsonElement::getAsString).orElse("");
 

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

@@ -17,7 +17,6 @@
  */
 package org.jackhuang.hmcl.setting;
 
-import com.jfoenix.utils.JFXUtilities;
 import javafx.application.Platform;
 import javafx.beans.Observable;
 import javafx.beans.property.*;
@@ -36,6 +35,7 @@ import java.util.stream.Collectors;
 import static javafx.collections.FXCollections.observableArrayList;
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
+import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class Profiles {
@@ -162,7 +162,7 @@ public final class Profiles {
         });
 
         EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).registerWeak(event -> {
-            JFXUtilities.runInFX(() -> {
+            runInFX(() -> {
                 Profile profile = selectedProfile.get();
                 if (profile != null && profile.getRepository() == event.getSource()) {
                     selectedVersion.bind(profile.selectedVersionProperty());

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

@@ -25,6 +25,7 @@ import javafx.beans.binding.ObjectBinding;
 import javafx.scene.paint.Color;
 
 import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.ResourceNotFoundError;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.io.IOUtils;
 import org.jackhuang.hmcl.util.javafx.BindingMapping;
@@ -81,7 +82,7 @@ public class Theme {
         String css;
         try {
             File temp = File.createTempFile("hmcl", ".css");
-            FileUtils.writeText(temp, IOUtils.readFullyAsString(Theme.class.getResourceAsStream("/assets/css/custom.css"))
+            FileUtils.writeText(temp, IOUtils.readFullyAsString(ResourceNotFoundError.getResourceAsStream("/assets/css/custom.css"))
                     .replace("%base-color%", color)
                     .replace("%font-color%", getColorDisplayName(getForegroundColor())));
             css = temp.toURI().toString();

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

@@ -39,6 +39,7 @@ import org.jackhuang.hmcl.util.platform.OperatingSystem;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Type;
+import java.nio.file.InvalidPathException;
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Optional;
@@ -482,7 +483,7 @@ public final class VersionSetting {
         else if (isUsesCustomJavaDir()) {
             try {
                 return JavaVersion.fromExecutable(Paths.get(getJavaDir()));
-            } catch (IOException e) {
+            } catch (IOException | InvalidPathException e) {
                 return null; // Custom Java Directory not found,
             }
         } else if (StringUtils.isNotBlank(getJava())) {
@@ -537,6 +538,7 @@ public final class VersionSetting {
                 .setGameDir(gameDir)
                 .setJava(javaVersion)
                 .setVersionName(Metadata.TITLE)
+                .setVersionType(Metadata.TITLE)
                 .setProfileName(Metadata.TITLE)
                 .setMinecraftArgs(getMinecraftArgs())
                 .setJavaArgs(getJavaArgs())
@@ -595,7 +597,7 @@ public final class VersionSetting {
 
         @Override
         public VersionSetting deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-            if (json == null || json == JsonNull.INSTANCE || !(json instanceof JsonObject))
+            if (json == JsonNull.INSTANCE || !(json instanceof JsonObject))
                 return null;
             JsonObject obj = (JsonObject) json;
 

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

@@ -17,10 +17,8 @@
  */
 package org.jackhuang.hmcl.ui;
 
-import com.jfoenix.utils.JFXUtilities;
 import javafx.scene.Node;
 import javafx.scene.Scene;
-import javafx.scene.image.Image;
 import javafx.scene.layout.Region;
 import javafx.stage.Stage;
 import org.jackhuang.hmcl.Launcher;
@@ -34,8 +32,11 @@ import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.ui.account.AccountList;
 import org.jackhuang.hmcl.ui.account.AuthlibInjectorServersPage;
-import org.jackhuang.hmcl.ui.construct.*;
+import org.jackhuang.hmcl.ui.construct.InputDialogPane;
+import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
+import org.jackhuang.hmcl.ui.construct.PopupMenu;
+import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane;
 import org.jackhuang.hmcl.ui.decorator.DecoratorController;
 import org.jackhuang.hmcl.ui.download.ModpackInstallWizardProvider;
 import org.jackhuang.hmcl.ui.profile.ProfileList;
@@ -58,6 +59,8 @@ import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.ui.FXUtils.newImage;
+import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class Controllers {
@@ -174,7 +177,7 @@ public final class Controllers {
                             return node;
                         })
                         .collect(Collectors.toList());
-                JFXUtilities.runInFX(() -> {
+                runInFX(() -> {
                     if (profile == Profiles.getSelectedProfile())
                         mainPage.getVersions().setAll(children);
                 });
@@ -210,7 +213,7 @@ public final class Controllers {
         scene = new Scene(decorator.getDecorator(), 800, 519);
         scene.getStylesheets().setAll(config().getTheme().getStylesheets());
 
-        stage.getIcons().add(new Image("/assets/img/icon.png"));
+        stage.getIcons().add(newImage("/assets/img/icon.png"));
         stage.setTitle(Metadata.TITLE);
     }
 

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

@@ -22,7 +22,6 @@ import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextArea;
-import javafx.scene.image.Image;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
@@ -30,6 +29,7 @@ import javafx.stage.Stage;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.upgrade.UpdateChecker;
 
+import static org.jackhuang.hmcl.ui.FXUtils.newImage;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 /**
@@ -67,7 +67,7 @@ public class CrashWindow extends Stage {
 
         Scene scene = new Scene(pane, 800, 480);
         setScene(scene);
-        getIcons().add(new Image("/assets/img/icon.png"));
+        getIcons().add(newImage("/assets/img/icon.png"));
         setTitle(i18n("message.error"));
 
         setOnCloseRequest(e -> System.exit(1));

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

@@ -17,7 +17,6 @@
  */
 package org.jackhuang.hmcl.ui;
 
-import com.jfoenix.utils.JFXUtilities;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.AuthInfo;
 import org.jackhuang.hmcl.auth.AuthenticationException;
@@ -29,13 +28,15 @@ import java.util.concurrent.CancellationException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
 
+import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
+
 public final class DialogController {
 
     public static AuthInfo logIn(Account account) throws CancellationException, AuthenticationException, InterruptedException {
         if (account instanceof YggdrasilAccount) {
             CountDownLatch latch = new CountDownLatch(1);
             AtomicReference<AuthInfo> res = new AtomicReference<>(null);
-            JFXUtilities.runInFX(() -> {
+            runInFX(() -> {
                 AccountLoginPane pane = new AccountLoginPane(account, it -> {
                         res.set(it);
                         latch.countDown();

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

@@ -17,7 +17,6 @@
  */
 package org.jackhuang.hmcl.ui;
 
-import com.jfoenix.utils.JFXUtilities;
 import com.jfoenix.controls.*;
 import javafx.animation.Animation;
 import javafx.animation.Interpolator;
@@ -31,9 +30,11 @@ import javafx.beans.value.ObservableValue;
 import javafx.beans.value.WeakChangeListener;
 import javafx.event.EventHandler;
 import javafx.fxml.FXMLLoader;
+import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.*;
+import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.input.ScrollEvent;
@@ -44,7 +45,8 @@ import javafx.scene.shape.Rectangle;
 import javafx.util.Callback;
 import javafx.util.Duration;
 import javafx.util.StringConverter;
-import org.jackhuang.hmcl.util.*;
+import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.ResourceNotFoundError;
 import org.jackhuang.hmcl.util.i18n.I18n;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.javafx.ExtendedProperties;
@@ -75,6 +77,14 @@ public final class FXUtils {
     private FXUtils() {
     }
 
+    public static void runInFX(Runnable runnable) {
+        if (Platform.isFxApplicationThread()) {
+            runnable.run();
+        } else {
+            Platform.runLater(runnable);
+        }
+    }
+
     public static void checkFxUserThread() {
         if (!Platform.isFxApplicationThread()) {
             throw new IllegalStateException("Not on FX application thread; currentThread = "
@@ -154,6 +164,20 @@ public final class FXUtils {
                 });
     }
 
+    public static <K, T> void setupCellValueFactory(JFXTreeTableColumn<K, T> column, Function<K, ObservableValue<T>> mapper) {
+        column.setCellValueFactory(param -> {
+            if (column.validateValue(param))
+                return mapper.apply(param.getValue().getValue());
+            else
+                return column.getComputedValue(param);
+        });
+    }
+
+    public static Node wrapMargin(Node node, Insets insets) {
+        StackPane.setMargin(node, insets);
+        return new StackPane(node);
+    }
+
     public static void setValidateWhileTextChanged(Node field, boolean validate) {
         if (field instanceof JFXTextField) {
             if (validate) {
@@ -252,7 +276,7 @@ public final class FXUtils {
     }
 
     public static void installTooltip(Node node, double openDelay, double visibleDelay, double closeDelay, Tooltip tooltip) {
-        JFXUtilities.runInFX(() -> {
+        runInFX(() -> {
             try {
                 // Java 8
                 Class<?> behaviorClass = Class.forName("javafx.scene.control.Tooltip$TooltipBehavior");
@@ -462,6 +486,21 @@ public final class FXUtils {
         }
     }
 
+    /**
+     * Suppress IllegalArgumentException since the url is supposed to be correct definitely.
+     * @param url the url of image. The image resource should be a file within the jar.
+     * @return the image resource within the jar.
+     * @see org.jackhuang.hmcl.util.CrashReporter
+     * @see ResourceNotFoundError
+     */
+    public static Image newImage(String url) {
+        try {
+            return new Image(url);
+        } catch (IllegalArgumentException e) {
+            throw new ResourceNotFoundError("Cannot access image: " + url, e);
+        }
+    }
+
     public static void applyDragListener(Node node, FileFilter filter, Consumer<List<File>> callback) {
         applyDragListener(node, filter, callback, null);
     }

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

@@ -17,10 +17,15 @@
  */
 package org.jackhuang.hmcl.ui;
 
+import com.jfoenix.controls.JFXButton;
 import com.jfoenix.effects.JFXDepthManager;
-import javafx.fxml.FXML;
+import javafx.geometry.Pos;
 import javafx.scene.control.Label;
 import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
+import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.function.Consumer;
 
@@ -30,26 +35,47 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
  * @author huangyuhui
  */
 public class InstallerItem extends BorderPane {
-    private final Consumer<InstallerItem> deleteCallback;
-
-    @FXML
-    private Label lblInstallerArtifact;
-
-    @FXML
-    private Label lblInstallerVersion;
-
-    public InstallerItem(String artifact, String version, Consumer<InstallerItem> deleteCallback) {
-        this.deleteCallback = deleteCallback;
-        FXUtils.loadFXML(this, "/assets/fxml/version/installer-item.fxml");
 
+    public InstallerItem(String artifact, String version, @Nullable Runnable upgrade, @Nullable Consumer<InstallerItem> deleteCallback) {
+        getStyleClass().add("two-line-list-item");
         setStyle("-fx-background-radius: 2; -fx-background-color: white; -fx-padding: 8;");
         JFXDepthManager.setDepth(this, 1);
-        lblInstallerArtifact.setText(artifact);
-        lblInstallerVersion.setText(i18n("archive.version") + ": " + version);
+
+        if (version != null) {
+            TwoLineListItem item = new TwoLineListItem();
+            item.setTitle(artifact);
+            item.setSubtitle(i18n("archive.version") + ": " + version);
+            setCenter(item);
+        } else {
+            Label label = new Label(artifact);
+            label.setStyle("-fx-font-size: 15px;");
+            BorderPane.setAlignment(label, Pos.CENTER_LEFT);
+            setCenter(label);
+        }
+
+        {
+            HBox hBox = new HBox();
+
+            if (upgrade != null) {
+                JFXButton upgradeButton = new JFXButton();
+                upgradeButton.setGraphic(SVG.update(Theme.blackFillBinding(), -1, -1));
+                upgradeButton.getStyleClass().add("toggle-icon4");
+                FXUtils.installFastTooltip(upgradeButton, i18n("install.change_version"));
+                upgradeButton.setOnMouseClicked(e -> upgrade.run());
+                hBox.getChildren().add(upgradeButton);
+            }
+
+            if (deleteCallback != null) {
+                JFXButton deleteButton = new JFXButton();
+                deleteButton.setGraphic(SVG.close(Theme.blackFillBinding(), -1, -1));
+                deleteButton.getStyleClass().add("toggle-icon4");
+                deleteButton.setOnMouseClicked(e -> deleteCallback.accept(this));
+                hBox.getChildren().add(deleteButton);
+            }
+
+            hBox.setAlignment(Pos.CENTER_RIGHT);
+            setRight(hBox);
+        }
     }
 
-    @FXML
-    private void onDelete() {
-        deleteCallback.accept(this);
-    }
 }

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

@@ -17,10 +17,7 @@
  */
 package org.jackhuang.hmcl.ui;
 
-import com.jfoenix.utils.JFXUtilities;
 import javafx.application.Platform;
-import javafx.scene.image.Image;
-import javafx.scene.layout.Region;
 import org.jackhuang.hmcl.event.EventBus;
 import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
 import org.jackhuang.hmcl.game.HMCLGameRepository;
@@ -30,7 +27,6 @@ import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.ui.account.AccountAdvancedListItem;
 import org.jackhuang.hmcl.ui.account.AddAccountPane;
 import org.jackhuang.hmcl.ui.construct.AdvancedListBox;
@@ -41,8 +37,9 @@ import org.jackhuang.hmcl.ui.versions.Versions;
 import org.jackhuang.hmcl.util.io.CompressingUtils;
 
 import java.io.File;
-import java.util.concurrent.atomic.AtomicReference;
 
+import static org.jackhuang.hmcl.ui.FXUtils.newImage;
+import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class LeftPaneController extends AdvancedListBox {
@@ -70,12 +67,12 @@ public final class LeftPaneController extends AdvancedListBox {
         profileListItem.profileProperty().bind(Profiles.selectedProfileProperty());
 
         AdvancedListItem gameItem = new AdvancedListItem();
-        gameItem.setImage(new Image("/assets/img/bookshelf.png"));
+        gameItem.setImage(newImage("/assets/img/bookshelf.png"));
         gameItem.setTitle(i18n("version.manage"));
         gameItem.setOnAction(e -> Controllers.navigate(Controllers.getGameListPage()));
 
         AdvancedListItem launcherSettingsItem = new AdvancedListItem();
-        launcherSettingsItem.setImage(new Image("/assets/img/command.png"));
+        launcherSettingsItem.setImage(newImage("/assets/img/command.png"));
         launcherSettingsItem.setTitle(i18n("settings.launcher"));
         launcherSettingsItem.setOnAction(e -> Controllers.navigate(Controllers.getSettingsPage()));
 
@@ -111,7 +108,7 @@ public final class LeftPaneController extends AdvancedListBox {
     private boolean checkedModpack = false;
 
     private void onRefreshedVersions(HMCLGameRepository repository) {
-        JFXUtilities.runInFX(() -> {
+        runInFX(() -> {
             if (!checkedModpack) {
                 checkedModpack = true;
 
@@ -119,12 +116,11 @@ public final class LeftPaneController extends AdvancedListBox {
                     File modpackFile = new File("modpack.zip").getAbsoluteFile();
                     if (modpackFile.exists()) {
                         Task.supplyAsync(() -> CompressingUtils.findSuitableEncoding(modpackFile.toPath()))
-                                .thenApply(encoding -> ModpackHelper.readModpackManifest(modpackFile.toPath(), encoding))
-                                .thenAccept(modpack -> {
-                                    AtomicReference<Region> region = new AtomicReference<>();
-                                    TaskExecutor executor = ModpackHelper.getInstallTask(repository.getProfile(), modpackFile, modpack.getName(), modpack)
-                                            .withRun(Schedulers.javafx(), this::checkAccount).executor();
-                                    region.set(Controllers.taskDialog(executor, i18n("modpack.installing")));
+                                .thenApplyAsync(encoding -> ModpackHelper.readModpackManifest(modpackFile.toPath(), encoding))
+                                .thenApplyAsync(modpack -> ModpackHelper.getInstallTask(repository.getProfile(), modpackFile, modpack.getName(), modpack)
+                                            .withRunAsync(Schedulers.javafx(), this::checkAccount).executor())
+                                .thenAcceptAsync(Schedulers.javafx(), executor -> {
+                                    Controllers.taskDialog(executor, i18n("modpack.installing"));
                                     executor.start();
                                 }).start();
                     }

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

@@ -18,18 +18,11 @@
 package org.jackhuang.hmcl.ui;
 
 import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleListProperty;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
 import javafx.scene.Node;
-import javafx.scene.control.Control;
 import javafx.scene.control.Skin;
 
-public abstract class ListPage<T extends Node> extends Control {
-    private final ListProperty<T> items = new SimpleListProperty<>(this, "items", FXCollections.observableArrayList());
-    private final BooleanProperty loading = new SimpleBooleanProperty(this, "loading", false);
+public abstract class ListPage<T extends Node> extends ListPageBase<T> {
     private final BooleanProperty refreshable = new SimpleBooleanProperty(this, "refreshable", false);
 
     public abstract void add();
@@ -42,30 +35,6 @@ public abstract class ListPage<T extends Node> extends Control {
         return new ListPageSkin(this);
     }
 
-    public ObservableList<T> getItems() {
-        return items.get();
-    }
-
-    public void setItems(ObservableList<T> items) {
-        this.items.set(items);
-    }
-
-    public ListProperty<T> itemsProperty() {
-        return items;
-    }
-
-    public boolean isLoading() {
-        return loading.get();
-    }
-
-    public void setLoading(boolean loading) {
-        this.loading.set(loading);
-    }
-
-    public BooleanProperty loadingProperty() {
-        return loading;
-    }
-
     public boolean isRefreshable() {
         return refreshable.get();
     }

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

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

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

@@ -39,6 +39,7 @@ public class ListPageSkin extends SkinBase<ListPage<?>> {
         SpinnerPane spinnerPane = new SpinnerPane();
         spinnerPane.getStyleClass().add("large-spinner-pane");
         Pane placeholder = new Pane();
+        VBox list = new VBox();
 
         StackPane contentPane = new StackPane();
         {
@@ -46,10 +47,8 @@ public class ListPageSkin extends SkinBase<ListPage<?>> {
             {
                 scrollPane.setFitToWidth(true);
 
-                VBox list = new VBox();
                 list.maxWidthProperty().bind(scrollPane.widthProperty());
                 list.setSpacing(10);
-                list.setPadding(new Insets(10));
 
                 VBox content = new VBox();
                 content.getChildren().setAll(list, placeholder);
@@ -87,8 +86,13 @@ public class ListPageSkin extends SkinBase<ListPage<?>> {
 
                 FXUtils.onChangeAndOperate(skinnable.refreshableProperty(),
                         refreshable -> {
-                            if (refreshable) vBox.getChildren().setAll(btnRefresh, btnAdd);
-                            else vBox.getChildren().setAll(btnAdd);
+                            if (refreshable) {
+                                list.setPadding(new Insets(10, 10, 15 + 40 + 15 + 40 + 15, 10));
+                                vBox.getChildren().setAll(btnRefresh, btnAdd);
+                            } else {
+                                list.setPadding(new Insets(10, 10, 15 + 40 + 15, 10));
+                                vBox.getChildren().setAll(btnAdd);
+                            }
                         });
             }
 

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

@@ -25,7 +25,6 @@ import javafx.fxml.FXML;
 import javafx.scene.Scene;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.ToggleButton;
-import javafx.scene.image.Image;
 import javafx.scene.layout.StackPane;
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebView;
@@ -35,6 +34,7 @@ import org.jackhuang.hmcl.event.EventManager;
 import org.jackhuang.hmcl.game.LauncherHelper;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.Log4jLevel;
+import org.jackhuang.hmcl.util.ResourceNotFoundError;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.io.IOUtils;
 import org.w3c.dom.Document;
@@ -44,6 +44,7 @@ import org.w3c.dom.Node;
 import java.util.concurrent.CountDownLatch;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.ui.FXUtils.newImage;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 /**
@@ -65,7 +66,7 @@ public final class LogWindow extends Stage {
         setScene(new Scene(impl, 800, 480));
         getScene().getStylesheets().addAll(config().getTheme().getStylesheets());
         setTitle(i18n("logwindow.title"));
-        getIcons().add(new Image("/assets/img/icon.png"));
+        getIcons().add(newImage("/assets/img/icon.png"));
     }
 
     public LogWindow(String text) {
@@ -174,7 +175,7 @@ public final class LogWindow extends Stage {
             FXUtils.loadFXML(this, "/assets/fxml/log.fxml");
 
             engine = webView.getEngine();
-            engine.loadContent(Lang.ignoringException(() -> IOUtils.readFullyAsString(getClass().getResourceAsStream("/assets/log-window-content.html")))
+            engine.loadContent(Lang.ignoringException(() -> IOUtils.readFullyAsString(ResourceNotFoundError.getResourceAsStream("/assets/log-window-content.html")))
                     .replace("${FONT}", config().getFontSize() + "px \"" + config().getFontFamily() + "\""));
             engine.getLoadWorker().stateProperty().addListener((a, b, newValue) -> {
                 if (newValue == Worker.State.SUCCEEDED) {

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

@@ -23,7 +23,12 @@ import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
 import javafx.animation.Timeline;
 import javafx.beans.binding.Bindings;
-import javafx.beans.property.*;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ReadOnlyStringProperty;
+import javafx.beans.property.ReadOnlyStringWrapper;
+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.Insets;
@@ -113,7 +118,8 @@ public final class MainPage extends StackPane implements DecoratorPage {
             launchButton.setPrefHeight(55);
             launchButton.setButtonType(JFXButton.ButtonType.RAISED);
             launchButton.getStyleClass().add("jfx-button-raised");
-            launchButton.setOnMouseClicked(e -> launch());
+            launchButton.setOnAction(e -> launch());
+            launchButton.setDefaultButton(true);
             launchButton.setClip(new Rectangle(-100, -100, 310, 200));
             {
                 VBox graphic = new VBox();

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

@@ -29,6 +29,10 @@ public final class SVG {
     private SVG() {
     }
 
+    public interface SVGIcon {
+        Node createIcon(ObjectBinding<? extends Paint> fill, double width, double height);
+    }
+
     private static Node createSVGPath(String d, ObjectBinding<? extends Paint> fill, double width, double height) {
         SVGPath path = new SVGPath();
         path.getStyleClass().add("svg");

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

@@ -50,7 +50,6 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Optional;
 import java.util.logging.Level;
@@ -118,7 +117,7 @@ public final class SettingsPage extends SettingsView implements DecoratorPage {
         selectedItemPropertyFor(proxyConfigurationGroup, Proxy.Type.class).bindBidirectional(config().proxyTypeProperty());
         // ====
 
-        fileCommonLocation.loadChildren(Arrays.asList(
+        fileCommonLocation.loadChildren(Collections.singletonList(
                 fileCommonLocation.createChildren(i18n("launcher.cache_directory.default"), EnumCommonDirectory.DEFAULT)
         ), EnumCommonDirectory.CUSTOM);
         fileCommonLocation.selectedDataProperty().bindBidirectional(config().commonDirTypeProperty());

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

@@ -19,6 +19,7 @@ package org.jackhuang.hmcl.ui;
 
 import com.jfoenix.controls.*;
 import javafx.geometry.HPos;
+import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.geometry.VPos;
 import javafx.scene.Cursor;
@@ -72,7 +73,7 @@ public abstract class SettingsView extends StackPane {
 
         {
             VBox rootPane = new VBox();
-            rootPane.setStyle("-fx-padding: 18;");
+            rootPane.setPadding(new Insets(36, 18, 36, 18));
             {
                 ComponentList settingsPane = new ComponentList();
                 {
@@ -80,12 +81,31 @@ public abstract class SettingsView extends StackPane {
                         StackPane sponsorPane = new StackPane();
                         sponsorPane.setCursor(Cursor.HAND);
                         sponsorPane.setOnMouseClicked(e -> onSponsor());
+
+                        GridPane gridPane = new GridPane();
+
+                        ColumnConstraints col = new ColumnConstraints();
+                        col.setHgrow(Priority.SOMETIMES);
+                        col.setMaxWidth(Double.POSITIVE_INFINITY);
+
+                        gridPane.getColumnConstraints().setAll(col);
+
+                        RowConstraints row = new RowConstraints();
+                        row.setMinHeight(Double.NEGATIVE_INFINITY);
+                        row.setValignment(VPos.TOP);
+                        row.setVgrow(Priority.SOMETIMES);
+                        gridPane.getRowConstraints().setAll(row);
+
                         {
                             Label label = new Label(i18n("sponsor.hmcl"));
                             label.setWrapText(true);
-                            label.prefWidthProperty().bind(sponsorPane.widthProperty());
-                            sponsorPane.getChildren().add(label);
+                            label.setTextAlignment(TextAlignment.JUSTIFY);
+                            GridPane.setRowIndex(label, 0);
+                            GridPane.setColumnIndex(label, 0);
+                            gridPane.getChildren().add(label);
                         }
+
+                        sponsorPane.getChildren().setAll(gridPane);
                         settingsPane.getContent().add(sponsorPane);
                     }
 

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

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

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

@@ -0,0 +1,82 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui;
+
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXDialogLayout;
+import javafx.scene.control.Label;
+import javafx.scene.web.WebEngine;
+import javafx.scene.web.WebView;
+import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
+
+import static org.jackhuang.hmcl.Metadata.CHANGELOG_URL;
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+public class UpgradeDialog extends JFXDialogLayout {
+    private final WebView webView = new WebView();
+
+    public UpgradeDialog(Runnable updateRunnable) {
+        {
+            setHeading(new Label(i18n("update.changelog")));
+        }
+
+        {
+            WebView webView = new WebView();
+            WebEngine engine = webView.getEngine();
+            engine.load(CHANGELOG_URL + config().getUpdateChannel().channelName);
+            engine.getLoadWorker().stateProperty().addListener((observable, oldValue, newValue) -> {
+                String url = engine.getLoadWorker().getMessage().trim();
+                if (!url.startsWith(CHANGELOG_URL)) {
+                    engine.getLoadWorker().cancel();
+                    FXUtils.openLink(url);
+                }
+            });
+            setBody(webView);
+        }
+
+        {
+            JFXButton updateButton = new JFXButton(i18n("update.accept"));
+            updateButton.getStyleClass().add("dialog-accept");
+            updateButton.setOnMouseClicked(e -> updateRunnable.run());
+
+            JFXButton cancelButton = new JFXButton(i18n("button.cancel"));
+            cancelButton.getStyleClass().add("dialog-cancel");
+            cancelButton.setOnMouseClicked(e -> fireEvent(new DialogCloseEvent()));
+
+            setActions(updateButton, cancelButton);
+        }
+    }
+}

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

@@ -18,11 +18,11 @@
 package org.jackhuang.hmcl.ui;
 
 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 static org.jackhuang.hmcl.ui.FXUtils.newImage;
 
 public class WebStage extends Stage {
     private final WebView webView = new WebView();
@@ -30,7 +30,7 @@ public class WebStage extends Stage {
     public WebStage() {
         setScene(new Scene(webView, 800, 480));
         getScene().getStylesheets().addAll(config().getTheme().getStylesheets());
-        getIcons().add(new Image("/assets/img/icon.png"));
+        getIcons().add(newImage("/assets/img/icon.png"));
     }
 
     public WebView getWebView() {

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

@@ -20,7 +20,6 @@ package org.jackhuang.hmcl.ui.account;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import javafx.scene.image.Image;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.offline.OfflineAccount;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
@@ -29,6 +28,7 @@ import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.construct.AdvancedListItem;
 
+import static org.jackhuang.hmcl.ui.FXUtils.newImage;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public class AccountAdvancedListItem extends AdvancedListItem {
@@ -42,7 +42,7 @@ public class AccountAdvancedListItem extends AdvancedListItem {
                 setTitle(i18n("account.missing"));
                 setSubtitle(i18n("account.missing.add"));
                 imageProperty().unbind();
-                setImage(new Image("/assets/img/craft_table.png"));
+                setImage(newImage("/assets/img/craft_table.png"));
             } else {
                 titleProperty().bind(Bindings.createStringBinding(account::getCharacter, account));
                 setSubtitle(accountSubtitle(account));

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

@@ -17,11 +17,9 @@
  */
 package org.jackhuang.hmcl.ui.account;
 
-import com.jfoenix.utils.JFXUtilities;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXRadioButton;
 import com.jfoenix.effects.JFXDepthManager;
-
 import javafx.geometry.Pos;
 import javafx.scene.control.Label;
 import javafx.scene.control.SkinBase;
@@ -30,17 +28,16 @@ import javafx.scene.image.ImageView;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
-
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.util.javafx.BindingMapping;
 
+import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
-
 public class AccountListItemSkin extends SkinBase<AccountListItem> {
 
     public AccountListItemSkin(AccountListItem skinnable) {
@@ -91,7 +88,7 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {
         btnRefresh.setOnMouseClicked(e -> skinnable.refresh());
         btnRefresh.getStyleClass().add("toggle-icon4");
         btnRefresh.setGraphic(SVG.refresh(Theme.blackFillBinding(), -1, -1));
-        JFXUtilities.runInFX(() -> FXUtils.installFastTooltip(btnRefresh, i18n("button.refresh")));
+        runInFX(() -> FXUtils.installFastTooltip(btnRefresh, i18n("button.refresh")));
         right.getChildren().add(btnRefresh);
 
         JFXButton btnRemove = new JFXButton();
@@ -99,11 +96,11 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {
         btnRemove.getStyleClass().add("toggle-icon4");
         BorderPane.setAlignment(btnRemove, Pos.CENTER);
         btnRemove.setGraphic(SVG.delete(Theme.blackFillBinding(), -1, -1));
-        JFXUtilities.runInFX(() -> FXUtils.installFastTooltip(btnRemove, i18n("button.delete")));
+        runInFX(() -> FXUtils.installFastTooltip(btnRemove, i18n("button.delete")));
         right.getChildren().add(btnRemove);
         root.setRight(right);
 
-        root.setStyle("-fx-background-color: white; -fx-padding: 8 8 8 12;");
+        root.setStyle("-fx-background-color: white; -fx-padding: 8 8 8 0;");
         JFXDepthManager.setDepth(root, 1);
 
         getChildren().setAll(root);

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

@@ -17,9 +17,10 @@
  */
 package org.jackhuang.hmcl.ui.account;
 
-import com.jfoenix.utils.JFXUtilities;
-import com.jfoenix.controls.*;
-
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXComboBox;
+import com.jfoenix.controls.JFXPasswordField;
+import com.jfoenix.controls.JFXTextField;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.ListProperty;
@@ -53,6 +54,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
+
 import static java.util.Collections.emptyList;
 import static java.util.Collections.unmodifiableList;
 import static java.util.Objects.requireNonNull;
@@ -75,7 +77,7 @@ public class AddAccountPane extends StackPane {
     @FXML private SpinnerPane acceptPane;
     @FXML private HBox linksContainer;
 
-    private ListProperty<Hyperlink> links = new SimpleListProperty<>();;
+    private ListProperty<Hyperlink> links = new SimpleListProperty<>();
 
     public AddAccountPane() {
         FXUtils.loadFXML(this, "/assets/fxml/account-add.fxml");
@@ -293,7 +295,7 @@ public class AddAccountPane extends StackPane {
             } catch (InterruptedException ignore) {
                 throw new NoSelectedCharacterException();
             } finally {
-                JFXUtilities.runInFX(() -> Selector.this.fireEvent(new DialogCloseEvent()));
+                runInFX(() -> Selector.this.fireEvent(new DialogCloseEvent()));
             }
         }
     }

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

@@ -21,35 +21,23 @@ import javafx.beans.binding.Bindings;
 import javafx.beans.property.ReadOnlyStringProperty;
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.collections.ObservableList;
-import javafx.fxml.FXML;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.ListPage;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
 import org.jackhuang.hmcl.util.javafx.MappedObservableList;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
-import static org.jackhuang.hmcl.ui.FXUtils.loadFXML;
-import static org.jackhuang.hmcl.ui.FXUtils.smoothScrolling;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
-public class AuthlibInjectorServersPage extends StackPane implements DecoratorPage {
+public class AuthlibInjectorServersPage extends ListPage<AuthlibInjectorServerItem> implements DecoratorPage {
     private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper(this, "title", i18n("account.injector.manage.title"));
 
-    @FXML private ScrollPane scrollPane;
-    @FXML private VBox listPane;
-    @FXML private StackPane contentPane;
-
-    private ObservableList<AuthlibInjectorServerItem> serverItems;
+    private final ObservableList<AuthlibInjectorServerItem> serverItems;
 
     public AuthlibInjectorServersPage() {
-        loadFXML(this, "/assets/fxml/authlib-injector-servers.fxml");
-        smoothScrolling(scrollPane);
-
         serverItems = MappedObservableList.create(config().getAuthlibInjectorServers(), this::createServerItem);
-        Bindings.bindContent(listPane.getChildren(), serverItems);
+        Bindings.bindContent(itemsProperty(), serverItems);
     }
 
     private AuthlibInjectorServerItem createServerItem(AuthlibInjectorServer server) {
@@ -57,8 +45,8 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
                 item -> config().getAuthlibInjectorServers().remove(item.getServer()));
     }
 
-    @FXML
-    private void onAdd() {
+    @Override
+    public void add() {
         Controllers.dialog(new AddAuthlibInjectorServerPane());
     }
 

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

@@ -26,11 +26,12 @@ import javafx.beans.value.ObservableValue;
 import javafx.geometry.Pos;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.TreeTableCell;
+import javafx.scene.layout.StackPane;
 import javafx.util.Callback;
 import javafx.util.StringConverter;
 
 public class JFXCheckBoxTreeTableCell<S,T> extends TreeTableCell<S,T> {
-
+    private final StackPane pane;
     private final CheckBox checkBox;
     private boolean showLabel;
     private ObservableValue<Boolean> booleanProperty;
@@ -49,6 +50,8 @@ public class JFXCheckBoxTreeTableCell<S,T> extends TreeTableCell<S,T> {
             final StringConverter<T> converter) {
         this.getStyleClass().add("check-box-tree-table-cell");
         this.checkBox = new JFXCheckBox();
+        this.pane = new StackPane(checkBox);
+        this.pane.setAlignment(Pos.CENTER);
         setGraphic(null);
         setSelectedStateCallback(getSelectedProperty);
         setConverter(converter);
@@ -72,9 +75,7 @@ public class JFXCheckBoxTreeTableCell<S,T> extends TreeTableCell<S,T> {
     }
 
     private ObjectProperty<Callback<Integer, ObservableValue<Boolean>>>
-            selectedStateCallback =
-            new SimpleObjectProperty<Callback<Integer, ObservableValue<Boolean>>>(
-                    this, "selectedStateCallback");
+            selectedStateCallback = new SimpleObjectProperty<>(this, "selectedStateCallback");
 
     public final ObjectProperty<Callback<Integer, ObservableValue<Boolean>>> selectedStateCallbackProperty() {
         return selectedStateCallback;
@@ -101,7 +102,8 @@ public class JFXCheckBoxTreeTableCell<S,T> extends TreeTableCell<S,T> {
             if (showLabel) {
                 setText(c.toString(item));
             }
-            setGraphic(checkBox);
+
+            setGraphic(pane);
 
             if (booleanProperty instanceof BooleanProperty) {
                 checkBox.selectedProperty().unbindBidirectional((BooleanProperty)booleanProperty);

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

@@ -32,7 +32,7 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class MessageDialogPane extends StackPane {
 
-    public static enum MessageType {
+    public enum MessageType {
         ERROR,
         INFORMATION,
         WARNING,

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

@@ -71,16 +71,17 @@ public class RipplerContainer extends StackPane {
         setContainer(container);
 
         getStyleClass().add(DEFAULT_STYLE_CLASS);
+        buttonRippler.setPosition(JFXRippler.RipplerPos.BACK);
         buttonContainer.getChildren().add(buttonRippler);
         focusedProperty().addListener((a, b, newValue) -> {
             if (newValue) {
                 if (!isPressed())
-                    buttonRippler.setOverlayVisible(true);
+                    buttonRippler.showOverlay();
             } else {
-                buttonRippler.setOverlayVisible(false);
+                buttonRippler.hideOverlay();
             }
         });
-        pressedProperty().addListener(o -> buttonRippler.setOverlayVisible(false));
+        pressedProperty().addListener(o -> buttonRippler.hideOverlay());
         setPickOnBounds(false);
 
         buttonContainer.setPickOnBounds(false);

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

@@ -17,7 +17,6 @@
  */
 package org.jackhuang.hmcl.ui.construct;
 
-import com.jfoenix.utils.JFXUtilities;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXProgressBar;
 import javafx.application.Platform;
@@ -34,6 +33,8 @@ import org.jackhuang.hmcl.ui.FXUtils;
 import java.util.Optional;
 import java.util.function.Consumer;
 
+import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
+
 public class TaskExecutorDialogPane extends StackPane {
     private TaskExecutor executor;
     private Consumer<Region> onCancel;
@@ -121,6 +122,6 @@ public class TaskExecutorDialogPane extends StackPane {
     public void setCancel(Consumer<Region> onCancel) {
         this.onCancel = onCancel;
 
-        JFXUtilities.runInFX(() -> btnCancel.setDisable(onCancel == null));
+        runInFX(() -> btnCancel.setDisable(onCancel == null));
     }
 }

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

@@ -26,11 +26,17 @@ import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.download.forge.ForgeInstallTask;
 import org.jackhuang.hmcl.download.game.GameAssetDownloadTask;
+import org.jackhuang.hmcl.download.game.GameInstallTask;
 import org.jackhuang.hmcl.download.liteloader.LiteLoaderInstallTask;
 import org.jackhuang.hmcl.download.optifine.OptiFineInstallTask;
 import org.jackhuang.hmcl.game.HMCLModpackExportTask;
 import org.jackhuang.hmcl.game.HMCLModpackInstallTask;
-import org.jackhuang.hmcl.mod.*;
+import org.jackhuang.hmcl.mod.MinecraftInstanceTask;
+import org.jackhuang.hmcl.mod.ModpackInstallTask;
+import org.jackhuang.hmcl.mod.ModpackUpdateTask;
+import org.jackhuang.hmcl.mod.curse.CurseCompletionTask;
+import org.jackhuang.hmcl.mod.curse.CurseInstallTask;
+import org.jackhuang.hmcl.mod.multimc.MultiMCModpackInstallTask;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.task.TaskListener;
@@ -83,6 +89,8 @@ public final class TaskListPane extends StackPane {
 
                 if (task instanceof GameAssetDownloadTask) {
                     task.setName(i18n("assets.download_all"));
+                } else if (task instanceof GameInstallTask) {
+                    task.setName(i18n("install.installer.install", i18n("install.installer.game")));
                 } else if (task instanceof ForgeInstallTask) {
                     task.setName(i18n("install.installer.install", i18n("install.installer.forge")));
                 } else if (task instanceof LiteLoaderInstallTask) {

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

@@ -45,7 +45,10 @@ import org.jackhuang.hmcl.setting.EnumBackgroundImage;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.account.AddAuthlibInjectorServerPane;
-import org.jackhuang.hmcl.ui.construct.*;
+import org.jackhuang.hmcl.ui.construct.DialogAware;
+import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
+import org.jackhuang.hmcl.ui.construct.Navigator;
+import org.jackhuang.hmcl.ui.construct.StackContainerPane;
 import org.jackhuang.hmcl.ui.wizard.Refreshable;
 import org.jackhuang.hmcl.ui.wizard.WizardProvider;
 
@@ -61,6 +64,7 @@ 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.ui.FXUtils.newImage;
 import static org.jackhuang.hmcl.util.Logging.LOG;
 
 public class DecoratorController {
@@ -92,7 +96,7 @@ public class DecoratorController {
         decorator.onRefreshNavButtonActionProperty().set(e -> refresh());
 
         welcomeView = new ImageView();
-        welcomeView.setImage(new Image("/assets/img/welcome.png"));
+        welcomeView.setImage(newImage("/assets/img/welcome.png"));
         welcomeView.setCursor(Cursor.HAND);
         FXUtils.limitSize(welcomeView, 796, 517);
         welcomeView.setOnMouseClicked(e -> {
@@ -152,7 +156,7 @@ public class DecoratorController {
                         config().backgroundImageProperty()));
     }
 
-    private Image defaultBackground = new Image("/assets/img/background.jpg");
+    private Image defaultBackground = newImage("/assets/img/background.jpg");
 
     /**
      * Load background image from bg/, background.png, background.jpg

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

@@ -123,16 +123,13 @@ public class DecoratorSkin extends SkinBase<Decorator> {
         {
             StackPane container = new StackPane();
             Bindings.bindContent(container.getChildren(), skinnable.containerProperty());
-            ListChangeListener<Node> listener = new ListChangeListener<Node>() {
-                @Override
-                public void onChanged(Change<? extends Node> c) {
-                    if (skinnable.getContainer().isEmpty()) {
-                        container.setMouseTransparent(true);
-                        container.setVisible(false);
-                    } else {
-                        container.setMouseTransparent(false);
-                        container.setVisible(true);
-                    }
+            ListChangeListener<Node> listener = c -> {
+                if (skinnable.getContainer().isEmpty()) {
+                    container.setMouseTransparent(true);
+                    container.setVisible(false);
+                } else {
+                    container.setMouseTransparent(false);
+                    container.setVisible(true);
                 }
             };
             skinnable.containerProperty().addListener(listener);

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

@@ -23,6 +23,7 @@ import javafx.scene.control.Label;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import org.jackhuang.hmcl.download.DownloadProvider;
+import org.jackhuang.hmcl.download.LibraryAnalyzer;
 import org.jackhuang.hmcl.download.RemoteVersion;
 import org.jackhuang.hmcl.game.GameRepository;
 import org.jackhuang.hmcl.ui.FXUtils;
@@ -33,6 +34,7 @@ import org.jackhuang.hmcl.util.Lang;
 import java.util.Map;
 import java.util.Optional;
 
+import static org.jackhuang.hmcl.download.LibraryAnalyzer.LibraryType.*;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 class AdditionalInstallersPage extends StackPane implements WizardPage {
@@ -42,6 +44,8 @@ class AdditionalInstallersPage extends StackPane implements WizardPage {
     @FXML
     private VBox list;
     @FXML
+    private JFXButton btnFabric;
+    @FXML
     private JFXButton btnForge;
     @FXML
     private JFXButton btnLiteLoader;
@@ -52,6 +56,8 @@ class AdditionalInstallersPage extends StackPane implements WizardPage {
     @FXML
     private Label lblVersionName;
     @FXML
+    private Label lblFabric;
+    @FXML
     private Label lblForge;
     @FXML
     private Label lblLiteLoader;
@@ -69,26 +75,17 @@ class AdditionalInstallersPage extends StackPane implements WizardPage {
         lblGameVersion.setText(provider.getGameVersion());
         lblVersionName.setText(provider.getVersion().getId());
 
-        btnForge.setOnMouseClicked(e -> {
-            controller.getSettings().put(INSTALLER_TYPE, 0);
-            controller.onNext(new VersionsPage(controller, i18n("install.installer.choose", i18n("install.installer.forge")), provider.getGameVersion(), downloadProvider, "forge", () -> {
-                controller.onPrev(false);
-            }));
-        });
+        JFXButton[] buttons = new JFXButton[]{btnFabric, btnForge, btnLiteLoader, btnOptiFine};
+        String[] libraryIds = new String[]{"fabric", "forge", "liteloader", "optifine"};
 
-        btnLiteLoader.setOnMouseClicked(e -> {
-            controller.getSettings().put(INSTALLER_TYPE, 1);
-            controller.onNext(new VersionsPage(controller, i18n("install.installer.choose", i18n("install.installer.liteloader")), provider.getGameVersion(), 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")), provider.getGameVersion(), downloadProvider, "optifine", () -> {
-                controller.onPrev(false);
-            }));
-        });
+        for (int i = 0; i < libraryIds.length; ++i) {
+            String libraryId = libraryIds[i];
+            buttons[i].setOnMouseClicked(e -> {
+                controller.onNext(new VersionsPage(controller, i18n("install.installer.choose", i18n("install.installer." + libraryId)), provider.getGameVersion(), downloadProvider, libraryId, () -> {
+                    controller.onPrev(false);
+                }));
+            });
+        }
 
         btnInstall.setOnMouseClicked(e -> onInstall());
     }
@@ -109,30 +106,27 @@ class AdditionalInstallersPage extends StackPane implements WizardPage {
     @Override
     public void onNavigate(Map<String, Object> settings) {
         lblGameVersion.setText(i18n("install.new_game.current_game_version") + ": " + provider.getGameVersion());
-        btnForge.setDisable(provider.getForge() != null);
-        if (provider.getForge() != null || controller.getSettings().containsKey("forge"))
-            lblForge.setText(i18n("install.installer.version", i18n("install.installer.forge")) + ": " + Lang.nonNull(provider.getForge(), getVersion("forge")));
-        else
-            lblForge.setText(i18n("install.installer.not_installed", i18n("install.installer.forge")));
 
-        btnLiteLoader.setDisable(provider.getLiteLoader() != null);
-        if (provider.getLiteLoader() != null || controller.getSettings().containsKey("liteloader"))
-            lblLiteLoader.setText(i18n("install.installer.version", i18n("install.installer.liteloader")) + ": " + Lang.nonNull(provider.getLiteLoader(), getVersion("liteloader")));
-        else
-            lblLiteLoader.setText(i18n("install.installer.not_installed", i18n("install.installer.liteloader")));
+        LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(provider.getVersion().resolvePreservingPatches(provider.getProfile().getRepository()));
+        String fabric = analyzer.getVersion(FABRIC).orElse(null);
+        String forge = analyzer.getVersion(FORGE).orElse(null);
+        String liteLoader = analyzer.getVersion(LITELOADER).orElse(null);
+        String optiFine = analyzer.getVersion(OPTIFINE).orElse(null);
 
-        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")));
-        else
-            lblOptiFine.setText(i18n("install.installer.not_installed", i18n("install.installer.optifine")));
+        Label[] labels = new Label[]{lblFabric, lblForge, lblLiteLoader, lblOptiFine};
+        String[] libraryIds = new String[]{"fabric", "forge", "liteloader", "optifine"};
+        String[] versions = new String[]{fabric, forge, liteLoader, optiFine};
 
+        for (int i = 0; i < libraryIds.length; ++i) {
+            String libraryId = libraryIds[i];
+            if (versions[i] != null || controller.getSettings().containsKey(libraryId))
+                labels[i].setText(i18n("install.installer.version", i18n("install.installer." + libraryId)) + ": " + Lang.nonNull(getVersion(libraryId), versions[i]));
+            else
+                labels[i].setText(i18n("install.installer.not_installed", i18n("install.installer." + libraryId)));
+        }
     }
 
     @Override
     public void cleanup(Map<String, Object> settings) {
-        settings.remove(INSTALLER_TYPE);
     }
-
-    public static final String INSTALLER_TYPE = "INSTALLER_TYPE";
 }

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

@@ -18,11 +18,13 @@
 package org.jackhuang.hmcl.ui.download;
 
 import javafx.scene.Node;
+import org.jackhuang.hmcl.download.DefaultDependencyManager;
 import org.jackhuang.hmcl.download.DownloadProvider;
-import org.jackhuang.hmcl.download.LibraryAnalyzer;
 import org.jackhuang.hmcl.download.RemoteVersion;
+import org.jackhuang.hmcl.download.VersionMismatchException;
+import org.jackhuang.hmcl.download.fabric.FabricInstallTask;
 import org.jackhuang.hmcl.download.game.LibraryDownloadException;
-import org.jackhuang.hmcl.game.Library;
+import org.jackhuang.hmcl.download.optifine.OptiFineInstallTask;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.task.DownloadException;
@@ -32,7 +34,10 @@ import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardProvider;
 import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.i18n.I18n;
+import org.jackhuang.hmcl.util.io.ResponseCodeException;
 
+import java.net.SocketTimeoutException;
 import java.util.Map;
 
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
@@ -41,19 +46,11 @@ public final class InstallerWizardProvider implements WizardProvider {
     private final Profile profile;
     private final String gameVersion;
     private final Version version;
-    private final String forge;
-    private final String liteLoader;
-    private final String optiFine;
 
     public InstallerWizardProvider(Profile profile, String gameVersion, Version version) {
         this.profile = profile;
         this.gameVersion = gameVersion;
         this.version = version;
-
-        LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(version);
-        forge = analyzer.getForge().map(Library::getVersion).orElse(null);
-        liteLoader = analyzer.getLiteLoader().map(Library::getVersion).orElse(null);
-        optiFine = analyzer.getOptiFine().map(Library::getVersion).orElse(null);
     }
 
     public Profile getProfile() {
@@ -68,18 +65,6 @@ public final class InstallerWizardProvider implements WizardProvider {
         return version;
     }
 
-    public String getForge() {
-        return forge;
-    }
-
-    public String getLiteLoader() {
-        return liteLoader;
-    }
-
-    public String getOptiFine() {
-        return optiFine;
-    }
-
     @Override
     public void start(Map<String, Object> settings) {
     }
@@ -91,16 +76,12 @@ public final class InstallerWizardProvider implements WizardProvider {
 
         Task<Version> ret = Task.supplyAsync(() -> version);
 
-        if (settings.containsKey("forge"))
-            ret = ret.thenCompose(profile.getDependency().installLibraryAsync((RemoteVersion) settings.get("forge")));
+        for (Object value : settings.values()) {
+            if (value instanceof RemoteVersion)
+                ret = ret.thenComposeAsync(profile.getDependency().installLibraryAsync((RemoteVersion) value));
+        }
 
-        if (settings.containsKey("liteloader"))
-            ret = ret.thenCompose(profile.getDependency().installLibraryAsync((RemoteVersion) settings.get("liteloader")));
-
-        if (settings.containsKey("optifine"))
-            ret = ret.thenCompose(profile.getDependency().installLibraryAsync((RemoteVersion) settings.get("optifine")));
-
-        return ret.thenCompose(profile.getRepository().refreshVersionsAsync());
+        return ret.thenComposeAsync(profile.getRepository().refreshVersionsAsync());
     }
 
     @Override
@@ -123,7 +104,26 @@ public final class InstallerWizardProvider implements WizardProvider {
         if (exception instanceof LibraryDownloadException) {
             Controllers.dialog(i18n("launch.failed.download_library", ((LibraryDownloadException) exception).getLibrary().getName()) + "\n" + StringUtils.getStackTrace(exception.getCause()), i18n("install.failed.downloading"), MessageType.ERROR, next);
         } else if (exception instanceof DownloadException) {
-            Controllers.dialog(i18n("install.failed.downloading.detail", ((DownloadException) exception).getUrl()) + "\n" + StringUtils.getStackTrace(exception.getCause()), i18n("install.failed.downloading"), MessageType.ERROR, next);
+            if (exception.getCause() instanceof SocketTimeoutException) {
+                Controllers.dialog(i18n("install.failed.downloading.timeout", ((DownloadException) exception).getUrl()), i18n("install.failed.downloading"), MessageType.ERROR, next);
+            } else if (exception.getCause() instanceof ResponseCodeException) {
+                ResponseCodeException responseCodeException = (ResponseCodeException) exception.getCause();
+                if (I18n.hasKey("download.code." + responseCodeException.getResponseCode())) {
+                    Controllers.dialog(i18n("download.code." + responseCodeException.getResponseCode()) + ", " + ((DownloadException) exception).getUrl() + "\n" + StringUtils.getStackTrace(exception.getCause()), i18n("install.failed.downloading"), MessageType.ERROR, next);
+                } else {
+                    Controllers.dialog(i18n("install.failed.downloading.detail", ((DownloadException) exception).getUrl()) + "\n" + StringUtils.getStackTrace(exception.getCause()), i18n("install.failed.downloading"), MessageType.ERROR, next);
+                }
+            } else {
+                Controllers.dialog(i18n("install.failed.downloading.detail", ((DownloadException) exception).getUrl()) + "\n" + StringUtils.getStackTrace(exception.getCause()), i18n("install.failed.downloading"), MessageType.ERROR, next);
+            }
+        } else if (exception instanceof OptiFineInstallTask.UnsupportedOptiFineInstallationException ||
+                exception instanceof FabricInstallTask.UnsupportedFabricInstallationException) {
+            Controllers.dialog(i18n("install.failed.optifine_conflict"), i18n("install.failed"), MessageType.ERROR, next);
+        } else if (exception instanceof DefaultDependencyManager.UnsupportedLibraryInstallerException) {
+            Controllers.dialog(i18n("install.failed.install_online"), i18n("install.failed"), MessageType.ERROR, next);
+        } else if (exception instanceof VersionMismatchException) {
+            VersionMismatchException e = ((VersionMismatchException) exception);
+            Controllers.dialog(i18n("install.failed.version_mismatch", e.getExpect(), e.getActual()), i18n("install.failed"), MessageType.ERROR, next);
         } else {
             Controllers.dialog(StringUtils.getStackTrace(exception), i18n("install.failed"), MessageType.ERROR, next);
         }

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

@@ -30,8 +30,11 @@ import org.jackhuang.hmcl.ui.FXUtils;
 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.Lang;
 import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;
 
+import java.nio.file.Paths;
 import java.util.Map;
 
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
@@ -42,6 +45,9 @@ public class InstallersPage extends StackPane implements WizardPage {
     @FXML
     private VBox list;
 
+    @FXML
+    private JFXButton btnFabric;
+
     @FXML
     private JFXButton btnForge;
 
@@ -54,6 +60,9 @@ public class InstallersPage extends StackPane implements WizardPage {
     @FXML
     private Label lblGameVersion;
 
+    @FXML
+    private Label lblFabric;
+
     @FXML
     private Label lblForge;
 
@@ -77,24 +86,20 @@ public class InstallersPage extends StackPane implements WizardPage {
         String gameVersion = ((RemoteVersion) controller.getSettings().get("game")).getGameVersion();
         Validator hasVersion = new Validator(s -> !repository.hasVersion(s) && StringUtils.isNotBlank(s));
         hasVersion.setMessage(i18n("install.new_game.already_exists"));
-        txtName.getValidators().add(hasVersion);
+        Validator nameValidator = new Validator(OperatingSystem::isNameValid);
+        nameValidator.setMessage(i18n("install.new_game.malformed"));
+        txtName.getValidators().addAll(hasVersion, nameValidator);
         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)));
-        });
+        JFXButton[] buttons = new JFXButton[]{btnFabric, btnForge, btnLiteLoader, btnOptiFine};
+        String[] libraryIds = new String[]{"fabric", "forge", "liteloader", "optifine"};
 
-        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)));
-        });
-
-        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)));
-        });
+        for (int i = 0; i < libraryIds.length; ++i) {
+            String libraryId = libraryIds[i];
+            buttons[i].setOnMouseClicked(e ->
+                    controller.onNext(new VersionsPage(controller, i18n("install.installer.choose", i18n("install.installer." + libraryId)), gameVersion, downloadProvider, libraryId, () -> controller.onPrev(false))));
+        }
     }
 
     @Override
@@ -109,25 +114,21 @@ public class InstallersPage extends StackPane implements WizardPage {
     @Override
     public void onNavigate(Map<String, Object> settings) {
         lblGameVersion.setText(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"));
-        else
-            lblForge.setText(i18n("install.installer.not_installed", i18n("install.installer.forge")));
 
-        if (controller.getSettings().containsKey("liteloader"))
-            lblLiteLoader.setText(i18n("install.installer.version", i18n("install.installer.liteloader")) + ": " + getVersion("liteloader"));
-        else
-            lblLiteLoader.setText(i18n("install.installer.not_installed", i18n("install.installer.liteloader")));
+        Label[] labels = new Label[]{lblFabric, lblForge, lblLiteLoader, lblOptiFine};
+        String[] libraryIds = new String[]{"fabric", "forge", "liteloader", "optifine"};
 
-        if (controller.getSettings().containsKey("optifine"))
-            lblOptiFine.setText(i18n("install.installer.version", i18n("install.installer.optifine")) + ": " + getVersion("optifine"));
-        else
-            lblOptiFine.setText(i18n("install.installer.not_installed", i18n("install.installer.optifine")));
+        for (int i = 0; i < libraryIds.length; ++i) {
+            String libraryId = libraryIds[i];
+            if (controller.getSettings().containsKey(libraryId))
+                labels[i].setText(i18n("install.installer.version", i18n("install.installer." + libraryId)) + ": " + getVersion(libraryId));
+            else
+                labels[i].setText(i18n("install.installer.not_installed", i18n("install.installer." + libraryId)));
+        }
     }
 
     @Override
     public void cleanup(Map<String, Object> settings) {
-        settings.remove(INSTALLER_TYPE);
     }
 
     @FXML
@@ -135,6 +136,4 @@ public class InstallersPage extends StackPane implements WizardPage {
         controller.getSettings().put("name", txtName.getText());
         controller.onFinish();
     }
-
-    public static final String INSTALLER_TYPE = "INSTALLER_TYPE";
 }

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

@@ -19,7 +19,7 @@ package org.jackhuang.hmcl.ui.download;
 
 import javafx.scene.Node;
 import org.jackhuang.hmcl.game.ModpackHelper;
-import org.jackhuang.hmcl.mod.CurseCompletionException;
+import org.jackhuang.hmcl.mod.curse.CurseCompletionException;
 import org.jackhuang.hmcl.mod.MismatchedModpackTypeException;
 import org.jackhuang.hmcl.mod.Modpack;
 import org.jackhuang.hmcl.mod.UnsupportedModpackException;
@@ -93,7 +93,7 @@ public class ModpackInstallWizardProvider implements WizardProvider {
             return null;
         } else {
             return ModpackHelper.getInstallTask(profile, selected, name, modpack)
-                    .thenRun(Schedulers.javafx(), () -> profile.setSelectedVersion(name));
+                    .thenRunAsync(Schedulers.javafx(), () -> profile.setSelectedVersion(name));
         }
     }
 

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

@@ -110,7 +110,7 @@ public final class ModpackPage extends StackPane implements WizardPage {
 
         spinnerPane.showSpinner();
         Task.supplyAsync(() -> CompressingUtils.findSuitableEncoding(selectedFile.toPath()))
-                .thenApply(encoding -> manifest = ModpackHelper.readModpackManifest(selectedFile.toPath(), encoding))
+                .thenApplyAsync(encoding -> manifest = ModpackHelper.readModpackManifest(selectedFile.toPath(), encoding))
                 .whenComplete(Schedulers.javafx(), manifest -> {
                     spinnerPane.hideSpinner();
                     controller.getSettings().put(MODPACK_MANIFEST, manifest);

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

@@ -0,0 +1,90 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.download;
+
+import javafx.scene.Node;
+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.ui.Controllers;
+import org.jackhuang.hmcl.ui.wizard.WizardController;
+import org.jackhuang.hmcl.ui.wizard.WizardProvider;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Map;
+
+import static org.jackhuang.hmcl.ui.download.InstallerWizardProvider.alertFailureMessage;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+public final class UpdateInstallerWizardProvider implements WizardProvider {
+    private final Profile profile;
+    private final String gameVersion;
+    private final Version version;
+    private final String libraryId;
+    private final String oldLibraryVersion;
+
+    public UpdateInstallerWizardProvider(@NotNull Profile profile, @NotNull String gameVersion, @NotNull Version version, @NotNull String libraryId, @NotNull String oldLibraryVersion) {
+        this.profile = profile;
+        this.gameVersion = gameVersion;
+        this.version = version;
+        this.libraryId = libraryId;
+        this.oldLibraryVersion = oldLibraryVersion;
+    }
+
+    @Override
+    public void start(Map<String, Object> settings) {
+    }
+
+    @Override
+    public Object finish(Map<String, Object> settings) {
+        settings.put("success_message", i18n("install.success"));
+        settings.put("failure_callback", (FailureCallback) (settings1, exception, next) -> alertFailureMessage(exception, next));
+
+        // We remove library but not save it,
+        // so if installation failed will not break down current version.
+        return profile.getDependency().installLibraryAsync(version, (RemoteVersion) settings.get(libraryId))
+                .thenComposeAsync(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 VersionsPage(controller, i18n("install.installer.choose", i18n("install.installer." + libraryId)), gameVersion, provider, libraryId, () -> {
+                    Controllers.confirmDialog(i18n("install.change_version.confirm", i18n("install.installer." + libraryId), oldLibraryVersion, ((RemoteVersion) settings.get(libraryId)).getSelfVersion()),
+                            i18n("install.change_version"), controller::onFinish, controller::onCancel);
+                });
+            default:
+                throw new IllegalStateException();
+        }
+    }
+
+    @Override
+    public boolean cancel() {
+        return true;
+    }
+
+    @Override
+    public boolean cancelIfCannotGoBack() {
+        // VersionsPage will call wizardController.onPrev(cleanUp = true) when list is empty.
+        // So we cancel this wizard when VersionPage calls the method.
+        return true;
+    }
+}

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

@@ -50,17 +50,12 @@ public final class VanillaInstallWizardProvider implements WizardProvider {
         builder.name(name);
         builder.gameVersion(((RemoteVersion) settings.get("game")).getGameVersion());
 
-        if (settings.containsKey("forge"))
-            builder.version((RemoteVersion) settings.get("forge"));
-
-        if (settings.containsKey("liteloader"))
-            builder.version((RemoteVersion) settings.get("liteloader"));
-
-        if (settings.containsKey("optifine"))
-            builder.version((RemoteVersion) settings.get("optifine"));
+        for (Map.Entry<String, Object> entry : settings.entrySet())
+            if (!"game".equals(entry.getKey()) && entry.getValue() instanceof RemoteVersion)
+                builder.version((RemoteVersion) entry.getValue());
 
         return builder.buildAsync().whenComplete(any -> profile.getRepository().refreshVersions())
-                .thenRun(Schedulers.javafx(), () -> profile.setSelectedVersion(name));
+                .thenRunAsync(Schedulers.javafx(), () -> profile.setSelectedVersion(name));
     }
 
     @Override

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

@@ -20,14 +20,18 @@ package org.jackhuang.hmcl.ui.export;
 import javafx.scene.Node;
 import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.game.HMCLModpackExportTask;
-import org.jackhuang.hmcl.game.HMCLModpackManager;
+import org.jackhuang.hmcl.mod.ModAdviser;
 import org.jackhuang.hmcl.mod.Modpack;
+import org.jackhuang.hmcl.mod.multimc.MultiMCInstanceConfiguration;
+import org.jackhuang.hmcl.mod.multimc.MultiMCModpackExportTask;
 import org.jackhuang.hmcl.setting.Config;
 import org.jackhuang.hmcl.setting.ConfigHolder;
 import org.jackhuang.hmcl.setting.Profile;
+import org.jackhuang.hmcl.setting.VersionSetting;
 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 org.jackhuang.hmcl.util.io.Zipper;
 
 import java.io.File;
@@ -57,30 +61,40 @@ public final class ExportWizardProvider implements WizardProvider {
     public Object finish(Map<String, Object> settings) {
         @SuppressWarnings("unchecked")
         List<String> whitelist = (List<String>) settings.get(ModpackFileSelectionPage.MODPACK_FILE_SELECTION);
+        File modpackFile = (File) settings.get(ModpackInfoPage.MODPACK_FILE);
+        String modpackName = (String) settings.get(ModpackInfoPage.MODPACK_NAME);
+        String modpackAuthor = (String) settings.get(ModpackInfoPage.MODPACK_AUTHOR);
+        String modpackVersion = (String) settings.get(ModpackInfoPage.MODPACK_VERSION);
+        String modpackDescription = (String) settings.get(ModpackInfoPage.MODPACK_DESCRIPTION);
+        String modpackType = (String) settings.get(ModpackTypeSelectionPage.MODPACK_TYPE);
+        boolean includeLauncher = (Boolean) settings.get(ModpackInfoPage.MODPACK_INCLUDE_LAUNCHER);
+
+        switch (modpackType) {
+            case ModpackTypeSelectionPage.MODPACK_TYPE_HMCL:
+                return exportAsHMCL(whitelist, modpackFile, modpackName, modpackAuthor, modpackVersion, modpackDescription, includeLauncher);
+            case ModpackTypeSelectionPage.MODPACK_TYPE_MULTIMC:
+                return exportAsMultiMC(whitelist, modpackFile, modpackName, modpackAuthor, modpackVersion, modpackDescription);
+            default:
+                throw new IllegalStateException("Unrecognized modpack type " + modpackType);
+        }
+    }
+
+    private Task<?> exportAsHMCL(List<String> whitelist, File modpackFile, String modpackName, String modpackAuthor, String modpackVersion, String modpackDescription, boolean includeLauncherRaw) {
         List<File> launcherJar = Launcher.getCurrentJarFiles();
-        boolean includeLauncher = (Boolean) settings.get(ModpackInfoPage.MODPACK_INCLUDE_LAUNCHER) && launcherJar != null;
+        boolean includeLauncher = includeLauncherRaw && launcherJar != null;
 
         return new Task<Void>() {
             Task<?> dependency = null;
 
             @Override
             public void execute() throws Exception {
-                File modpackFile = (File) settings.get(ModpackInfoPage.MODPACK_FILE);
                 File tempModpack = includeLauncher ? Files.createTempFile("hmcl", ".zip").toFile() : modpackFile;
 
                 dependency = new HMCLModpackExportTask(profile.getRepository(), version, whitelist,
-                        new Modpack(
-                                (String) settings.get(ModpackInfoPage.MODPACK_NAME),
-                                (String) settings.get(ModpackInfoPage.MODPACK_AUTHOR),
-                                (String) settings.get(ModpackInfoPage.MODPACK_VERSION),
-                                null,
-                                (String) settings.get(ModpackInfoPage.MODPACK_DESCRIPTION),
-                                StandardCharsets.UTF_8,
-                                null
-                        ), tempModpack);
+                        new Modpack(modpackName, modpackAuthor, modpackVersion, null, modpackDescription, StandardCharsets.UTF_8, null), tempModpack);
 
                 if (includeLauncher) {
-                    dependency = dependency.thenRun(() -> {
+                    dependency = dependency.thenRunAsync(() -> {
                         try (Zipper zip = new Zipper(modpackFile.toPath())) {
                             Config exported = new Config();
 
@@ -120,11 +134,55 @@ public final class ExportWizardProvider implements WizardProvider {
         };
     }
 
+    private Task<?> exportAsMultiMC(List<String> whitelist, File modpackFile, String modpackName, String modpackAuthor, String modpackVersion, String modpackDescription) {
+        return new Task<Void>() {
+            Task<?> dependency;
+
+            @Override
+            public void execute() {
+                VersionSetting vs = profile.getVersionSetting(version);
+                dependency = new MultiMCModpackExportTask(profile.getRepository(), version, whitelist,
+                        new MultiMCInstanceConfiguration(
+                                "OneSix",
+                                modpackName + "-" + modpackVersion,
+                                null,
+                                Lang.toIntOrNull(vs.getPermSize()),
+                                vs.getWrapper(),
+                                vs.getPreLaunchCommand(),
+                                null,
+                                modpackDescription,
+                                null,
+                                vs.getJavaArgs(),
+                                vs.isFullscreen(),
+                                vs.getWidth(),
+                                vs.getHeight(),
+                                vs.getMaxMemory(),
+                                vs.getMinMemory(),
+                                vs.isShowLogs(),
+                                /* showConsoleOnError */ true,
+                                /* autoCloseConsole */ false,
+                                /* overrideMemory */ true,
+                                /* overrideJavaLocation */ false,
+                                /* overrideJavaArgs */ true,
+                                /* overrideConsole */ true,
+                                /* overrideCommands */ true,
+                                /* overrideWindow */ true
+                        ), modpackFile);
+            }
+
+            @Override
+            public Collection<Task<?>> getDependencies() {
+                return Collections.singleton(dependency);
+            }
+        };
+    }
+
     @Override
     public Node createPage(WizardController controller, int step, Map<String, Object> settings) {
         switch (step) {
             case 0: return new ModpackInfoPage(controller, version);
-            case 1: return new ModpackFileSelectionPage(controller, profile, version, HMCLModpackManager::suggestMod);
+            case 1: return new ModpackFileSelectionPage(controller, profile, version, ModAdviser::suggestMod);
+            case 2: return new ModpackTypeSelectionPage(controller);
             default: throw new IllegalArgumentException("step");
         }
     }

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.game.ModAdviser;
+import org.jackhuang.hmcl.mod.ModAdviser;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.construct.NoneMultipleSelectionModel;
@@ -73,9 +73,9 @@ public final class ModpackFileSelectionPage extends StackPane implements WizardP
         ModAdviser.ModSuggestion state = ModAdviser.ModSuggestion.SUGGESTED;
         if (basePath.length() > "minecraft/".length()) {
             state = adviser.advise(StringUtils.substringAfter(basePath, "minecraft/") + (file.isDirectory() ? "/" : ""), file.isDirectory());
-            if (file.isFile() && Objects.equals(FileUtils.getNameWithoutExtension(file), version))
+            if (file.isFile() && Objects.equals(FileUtils.getNameWithoutExtension(file), version)) // Ignore <version>.json, <version>.jar
                 state = ModAdviser.ModSuggestion.HIDDEN;
-            if (file.isDirectory() && Objects.equals(file.getName(), version + "-natives"))
+            if (file.isDirectory() && Objects.equals(file.getName(), version + "-natives")) // Ignore <version>-natives
                 state = ModAdviser.ModSuggestion.HIDDEN;
             if (state == ModAdviser.ModSuggestion.HIDDEN)
                 return null;
@@ -146,7 +146,7 @@ public final class ModpackFileSelectionPage extends StackPane implements WizardP
         LinkedList<String> list = new LinkedList<>();
         getFilesNeeded(rootNode, "minecraft", list);
         controller.getSettings().put(MODPACK_FILE_SELECTION, list);
-        controller.onFinish();
+        controller.onNext();
     }
 
     @Override

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

@@ -0,0 +1,66 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.export;
+
+import com.jfoenix.controls.JFXButton;
+import javafx.fxml.FXML;
+import javafx.scene.layout.StackPane;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.wizard.WizardController;
+import org.jackhuang.hmcl.ui.wizard.WizardPage;
+
+import java.util.Map;
+
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+public final class ModpackTypeSelectionPage extends StackPane implements WizardPage {
+    private final WizardController controller;
+    @FXML
+    private JFXButton btnHMCL;
+    @FXML
+    private JFXButton btnMultiMC;
+
+    public ModpackTypeSelectionPage(WizardController controller) {
+        this.controller = controller;
+        FXUtils.loadFXML(this, "/assets/fxml/modpack/type.fxml");
+
+        JFXButton[] buttons = new JFXButton[]{btnHMCL, btnMultiMC};
+        String[] types = new String[]{MODPACK_TYPE_HMCL, MODPACK_TYPE_MULTIMC};
+        for (int i = 0; i < types.length; ++i) {
+            String type = types[i];
+            buttons[i].setOnMouseClicked(e -> {
+                controller.getSettings().put(MODPACK_TYPE, type);
+                controller.onFinish();
+            });
+        }
+    }
+
+    @Override
+    public void cleanup(Map<String, Object> settings) {
+    }
+
+    @Override
+    public String getTitle() {
+        return i18n("modpack.wizard.step.3.title");
+    }
+
+    public static final String MODPACK_TYPE = "modpack.type";
+
+    public static final String MODPACK_TYPE_MULTIMC = "multimc";
+    public static final String MODPACK_TYPE_HMCL = "hmcl";
+}

HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfileAdvancedListItem.java

@@ -19,13 +19,14 @@ package org.jackhuang.hmcl.ui.profile;
 
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import javafx.scene.image.Image;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.construct.AdvancedListItem;
 
+import static org.jackhuang.hmcl.ui.FXUtils.newImage;
+
 public class ProfileAdvancedListItem extends AdvancedListItem {
     private ObjectProperty<Profile> profile = new SimpleObjectProperty<Profile>() {
 
@@ -41,7 +42,7 @@ public class ProfileAdvancedListItem extends AdvancedListItem {
     };
 
     public ProfileAdvancedListItem() {
-        setImage(new Image("/assets/img/craft_table.png"));
+        setImage(newImage("/assets/img/craft_table.png"));
         setRightGraphic(SVG.viewList(Theme.blackFillBinding(), -1, -1));
     }
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfileListItemSkin.java

@@ -22,7 +22,6 @@ import com.jfoenix.controls.JFXRadioButton;
 import com.jfoenix.effects.JFXDepthManager;
 import javafx.geometry.Pos;
 import javafx.scene.control.SkinBase;
-import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
@@ -31,6 +30,8 @@ import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
 
+import static org.jackhuang.hmcl.ui.FXUtils.newImage;
+
 public class ProfileListItemSkin extends SkinBase<ProfileListItem> {
 
     public ProfileListItemSkin(ProfileListItem skinnable) {
@@ -54,7 +55,7 @@ public class ProfileListItemSkin extends SkinBase<ProfileListItem> {
 
         ImageView imageView = new ImageView();
         FXUtils.limitSize(imageView, 32, 32);
-        imageView.imageProperty().set(new Image("/assets/img/craft_table.png"));
+        imageView.imageProperty().set(newImage("/assets/img/craft_table.png"));
 
         TwoLineListItem item = new TwoLineListItem();
         BorderPane.setAlignment(item, Pos.CENTER);
@@ -72,7 +73,7 @@ public class ProfileListItemSkin extends SkinBase<ProfileListItem> {
         right.getChildren().add(btnRemove);
         root.setRight(right);
 
-        root.setStyle("-fx-background-color: white; -fx-padding: 8 8 8 12;");
+        root.setStyle("-fx-background-color: white; -fx-padding: 8 8 8 0;");
         JFXDepthManager.setDepth(root, 1);
         item.titleProperty().bind(skinnable.titleProperty());
         item.subtitleProperty().bind(skinnable.subtitleProperty());

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DatapackListItem.java

@@ -1,60 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.ui.versions;
-
-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.mod.Datapack;
-import org.jackhuang.hmcl.setting.Theme;
-import org.jackhuang.hmcl.ui.FXUtils;
-import org.jackhuang.hmcl.ui.SVG;
-import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
-
-import java.util.function.Consumer;
-
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
-public class DatapackListItem extends BorderPane {
-
-    public DatapackListItem(Datapack.Pack info, Consumer<DatapackListItem> deleteCallback) {
-        JFXCheckBox chkEnabled = new JFXCheckBox();
-        BorderPane.setAlignment(chkEnabled, Pos.CENTER);
-        setLeft(chkEnabled);
-
-        TwoLineListItem modItem = new TwoLineListItem();
-        BorderPane.setAlignment(modItem, Pos.CENTER);
-        setCenter(modItem);
-
-        JFXButton btnRemove = new JFXButton();
-        FXUtils.installFastTooltip(btnRemove, i18n("datapack.remove"));
-        btnRemove.setOnMouseClicked(e -> deleteCallback.accept(this));
-        btnRemove.getStyleClass().add("toggle-icon4");
-        BorderPane.setAlignment(btnRemove, Pos.CENTER);
-        btnRemove.setGraphic(SVG.close(Theme.blackFillBinding(), 15, 15));
-        setRight(btnRemove);
-
-        setStyle("-fx-background-radius: 2; -fx-background-color: white; -fx-padding: 8;");
-        JFXDepthManager.setDepth(this, 1);
-        modItem.setTitle(info.getId());
-        modItem.setSubtitle(info.getDescription());
-        chkEnabled.selectedProperty().bindBidirectional(info.activeProperty());
-    }
-}

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DatapackListPage.java

@@ -19,11 +19,16 @@ package org.jackhuang.hmcl.ui.versions;
 
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
+import javafx.collections.ObservableList;
+import javafx.scene.control.Skin;
+import javafx.scene.control.TreeItem;
 import javafx.stage.FileChooser;
 import org.jackhuang.hmcl.mod.Datapack;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
-import org.jackhuang.hmcl.ui.ListPage;
+import org.jackhuang.hmcl.ui.ListPageBase;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
 import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.io.FileUtils;
@@ -32,16 +37,19 @@ import org.jackhuang.hmcl.util.javafx.MappedObservableList;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
-import java.util.*;
+import java.util.List;
+import java.util.Objects;
 import java.util.logging.Level;
 
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
-public class DatapackListPage extends ListPage<DatapackListItem> implements DecoratorPage {
+public class DatapackListPage extends ListPageBase<DatapackListPageSkin.DatapackInfoObject> implements DecoratorPage {
     private final StringProperty title = new SimpleStringProperty();
     private final Path worldDir;
     private final Datapack datapack;
 
+    private final ObservableList<DatapackListPageSkin.DatapackInfoObject> items;
+
     public DatapackListPage(String worldName, Path worldDir) {
         this.worldDir = worldDir;
 
@@ -50,26 +58,32 @@ public class DatapackListPage extends ListPage<DatapackListItem> implements Deco
         datapack = new Datapack(worldDir.resolve("datapacks"));
         datapack.loadFromDir();
 
-        setItems(MappedObservableList.create(datapack.getInfo(),
-                pack -> new DatapackListItem(pack, item -> {
-                    try {
-                        datapack.deletePack(pack);
-                    } catch (IOException e) {
-                        Logging.LOG.warning("Failed to delete datapack");
-                    }
-                })));
+        setItems(items = MappedObservableList.create(datapack.getInfo(), DatapackListPageSkin.DatapackInfoObject::new));
 
-        FXUtils.applyDragListener(this, it -> Objects.equals("zip", FileUtils.getExtension(it)), mods -> {
-            mods.forEach(it -> {
-                try {
-                    Datapack zip = new Datapack(it.toPath());
-                    zip.loadFromZip();
-                    zip.installTo(worldDir);
-                } catch (IOException | IllegalArgumentException e) {
-                    Logging.LOG.log(Level.WARNING, "Unable to parse datapack file " + it, e);
-                }
-            });
-        }, datapack::loadFromDir);
+        FXUtils.applyDragListener(this, it -> Objects.equals("zip", FileUtils.getExtension(it)),
+                mods -> mods.forEach(this::installSingleDatapack), this::refresh);
+    }
+
+    private void installSingleDatapack(File datapack) {
+        try {
+            Datapack zip = new Datapack(datapack.toPath());
+            zip.loadFromZip();
+            zip.installTo(worldDir);
+        } catch (IOException | IllegalArgumentException e) {
+            Logging.LOG.log(Level.WARNING, "Unable to parse datapack file " + datapack, e);
+        }
+    }
+
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new DatapackListPageSkin(this);
+    }
+
+    public void refresh() {
+        setLoading(true);
+        Task.runAsync(datapack::loadFromDir)
+                .withRunAsync(Schedulers.javafx(), () -> setLoading(false))
+                .start();
     }
 
     @Override
@@ -77,7 +91,6 @@ public class DatapackListPage extends ListPage<DatapackListItem> implements Deco
         return title;
     }
 
-    @Override
     public void add() {
         FileChooser chooser = new FileChooser();
         chooser.setTitle(i18n("datapack.choose_datapack"));
@@ -85,16 +98,36 @@ public class DatapackListPage extends ListPage<DatapackListItem> implements Deco
         List<File> res = chooser.showOpenMultipleDialog(Controllers.getStage());
 
         if (res != null)
-            res.forEach(it -> {
-                try {
-                    Datapack zip = new Datapack(it.toPath());
-                    zip.loadFromZip();
-                    zip.installTo(worldDir);
-                } catch (IOException | IllegalArgumentException e) {
-                    Logging.LOG.log(Level.WARNING, "Unable to parse datapack file " + it, e);
-                }
-            });
+            res.forEach(this::installSingleDatapack);
 
         datapack.loadFromDir();
     }
+
+    void removeSelected(ObservableList<TreeItem<DatapackListPageSkin.DatapackInfoObject>> selectedItems) {
+        selectedItems.stream()
+                .map(TreeItem::getValue)
+                .map(DatapackListPageSkin.DatapackInfoObject::getPackInfo)
+                .forEach(pack -> {
+                    try {
+                        datapack.deletePack(pack);
+                    } catch (IOException e) {
+                        // Fail to remove mods if the game is running or the datapack is absent.
+                        Logging.LOG.warning("Failed to delete datapack " + pack);
+                    }
+                });
+    }
+
+    void enableSelected(ObservableList<TreeItem<DatapackListPageSkin.DatapackInfoObject>> selectedItems) {
+        selectedItems.stream()
+                .map(TreeItem::getValue)
+                .map(DatapackListPageSkin.DatapackInfoObject::getPackInfo)
+                .forEach(info -> info.setActive(true));
+    }
+
+    void disableSelected(ObservableList<TreeItem<DatapackListPageSkin.DatapackInfoObject>> selectedItems) {
+        selectedItems.stream()
+                .map(TreeItem::getValue)
+                .map(DatapackListPageSkin.DatapackInfoObject::getPackInfo)
+                .forEach(info -> info.setActive(false));
+    }
 }

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DatapackListPageSkin.java

@@ -0,0 +1,126 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.versions;
+
+import com.jfoenix.controls.JFXTreeTableColumn;
+import com.jfoenix.controls.JFXTreeTableView;
+import com.jfoenix.controls.RecursiveTreeItem;
+import com.jfoenix.controls.datamodels.treetable.RecursiveTreeObject;
+import com.jfoenix.effects.JFXDepthManager;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.geometry.Insets;
+import javafx.scene.Node;
+import javafx.scene.control.SelectionMode;
+import javafx.scene.control.SkinBase;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
+import org.jackhuang.hmcl.mod.Datapack;
+import org.jackhuang.hmcl.ui.SVG;
+import org.jackhuang.hmcl.ui.construct.JFXCheckBoxTreeTableCell;
+import org.jackhuang.hmcl.ui.construct.SpinnerPane;
+import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
+import org.jackhuang.hmcl.util.StringUtils;
+
+import static org.jackhuang.hmcl.ui.FXUtils.setupCellValueFactory;
+import static org.jackhuang.hmcl.ui.FXUtils.wrapMargin;
+import static org.jackhuang.hmcl.ui.ToolbarListPageSkin.createToolbarButton;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+class DatapackListPageSkin extends SkinBase<DatapackListPage> {
+
+    DatapackListPageSkin(DatapackListPage skinnable) {
+        super(skinnable);
+
+        BorderPane root = new BorderPane();
+        JFXTreeTableView<DatapackInfoObject> tableView = new JFXTreeTableView<>();
+
+        {
+            HBox toolbar = new HBox();
+            toolbar.getStyleClass().add("jfx-tool-bar-second");
+            JFXDepthManager.setDepth(toolbar, 1);
+            toolbar.setPickOnBounds(false);
+
+            toolbar.getChildren().add(createToolbarButton(i18n("button.refresh"), SVG::refresh, skinnable::refresh));
+            toolbar.getChildren().add(createToolbarButton(i18n("datapack.add"), SVG::plus, skinnable::add));
+            toolbar.getChildren().add(createToolbarButton(i18n("mods.remove"), SVG::delete, () ->
+                    skinnable.removeSelected(tableView.getSelectionModel().getSelectedItems())));
+            toolbar.getChildren().add(createToolbarButton(i18n("mods.enable"), SVG::check, () ->
+                    skinnable.enableSelected(tableView.getSelectionModel().getSelectedItems())));
+            toolbar.getChildren().add(createToolbarButton(i18n("mods.disable"), SVG::close, () ->
+                    skinnable.disableSelected(tableView.getSelectionModel().getSelectedItems())));
+            root.setTop(toolbar);
+        }
+
+        {
+            SpinnerPane center = new SpinnerPane();
+            center.getStyleClass().add("large-spinner-pane");
+            center.loadingProperty().bind(skinnable.loadingProperty());
+
+            tableView.getStyleClass().addAll("no-header");
+            tableView.setShowRoot(false);
+            tableView.setEditable(true);
+            tableView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
+            tableView.setRoot(new RecursiveTreeItem<>(skinnable.getItems(), RecursiveTreeObject::getChildren));
+
+            JFXTreeTableColumn<DatapackInfoObject, Boolean> activeColumn = new JFXTreeTableColumn<>();
+            setupCellValueFactory(activeColumn, DatapackInfoObject::activeProperty);
+            activeColumn.setCellFactory(c -> new JFXCheckBoxTreeTableCell<>());
+            activeColumn.setEditable(true);
+            activeColumn.setMaxWidth(40);
+            activeColumn.setMinWidth(40);
+
+            JFXTreeTableColumn<DatapackInfoObject, Node> detailColumn = new JFXTreeTableColumn<>();
+            setupCellValueFactory(detailColumn, DatapackInfoObject::nodeProperty);
+
+            tableView.getColumns().setAll(activeColumn, detailColumn);
+
+            tableView.setColumnResizePolicy(JFXTreeTableView.CONSTRAINED_RESIZE_POLICY);
+            center.setContent(tableView);
+            root.setCenter(center);
+        }
+
+        getChildren().setAll(root);
+    }
+
+    static class DatapackInfoObject extends RecursiveTreeObject<DatapackInfoObject> {
+        private final BooleanProperty active;
+        private final Datapack.Pack packInfo;
+        private final ObjectProperty<Node> node;
+
+        DatapackInfoObject(Datapack.Pack packInfo) {
+            this.packInfo = packInfo;
+            this.active = packInfo.activeProperty();
+            this.node = new SimpleObjectProperty<>(wrapMargin(new TwoLineListItem(packInfo.getId(), StringUtils.parseColorEscapes(packInfo.getDescription())),
+                    new Insets(8, 0, 8, 0)));
+        }
+
+        BooleanProperty activeProperty() {
+            return active;
+        }
+
+        ObjectProperty<Node> nodeProperty() {
+            return node;
+        }
+
+        Datapack.Pack getPackInfo() {
+            return packInfo;
+        }
+    }
+}

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameAdvancedListItem.java

@@ -17,13 +17,13 @@
  */
 package org.jackhuang.hmcl.ui.versions;
 
-import javafx.scene.image.Image;
 import org.jackhuang.hmcl.setting.Profiles;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.construct.AdvancedListItem;
 
+import static org.jackhuang.hmcl.ui.FXUtils.newImage;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public class GameAdvancedListItem extends AdvancedListItem {
@@ -38,7 +38,7 @@ public class GameAdvancedListItem extends AdvancedListItem {
             } else {
                 setTitle(i18n("version.empty"));
                 setSubtitle(i18n("version.empty.add"));
-                setImage(new Image("/assets/img/grass.png"));
+                setImage(newImage("/assets/img/grass.png"));
             }
         });
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameItem.java

@@ -18,24 +18,29 @@
 package org.jackhuang.hmcl.ui.versions;
 
 import javafx.application.Platform;
-import javafx.beans.property.*;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
 import javafx.scene.control.Control;
 import javafx.scene.control.Skin;
 import javafx.scene.image.Image;
 import org.jackhuang.hmcl.download.LibraryAnalyzer;
 import org.jackhuang.hmcl.game.GameVersion;
 import org.jackhuang.hmcl.setting.Profile;
+import org.jackhuang.hmcl.util.i18n.I18n;
 
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+import static org.jackhuang.hmcl.download.LibraryAnalyzer.LibraryType.MINECRAFT;
 import static org.jackhuang.hmcl.util.Lang.handleUncaught;
 import static org.jackhuang.hmcl.util.Lang.threadPool;
 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;
 
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
 public class GameItem extends Control {
 
     private static final ThreadPoolExecutor POOL_VERSION_RESOLVE = threadPool("VersionResolve", true, 1, 1, TimeUnit.SECONDS);
@@ -51,13 +56,21 @@ public class GameItem extends Control {
         this.version = id;
 
         // GameVersion.minecraftVersion() is a time-costing job (up to ~200 ms)
-        CompletableFuture.supplyAsync(() -> GameVersion.minecraftVersion(profile.getRepository().getVersionJar(id)).orElse("Unknown"), POOL_VERSION_RESOLVE)
+        CompletableFuture.supplyAsync(() -> GameVersion.minecraftVersion(profile.getRepository().getVersionJar(id)).orElse(i18n("message.unknown")), POOL_VERSION_RESOLVE)
                 .thenAcceptAsync(game -> {
                     StringBuilder libraries = new StringBuilder(game);
-                    LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(profile.getRepository().getVersion(id));
-                    analyzer.getForge().ifPresent(library -> libraries.append(", ").append(i18n("install.installer.forge")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)forge", ""))));
-                    analyzer.getLiteLoader().ifPresent(library -> libraries.append(", ").append(i18n("install.installer.liteloader")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)liteloader", ""))));
-                    analyzer.getOptiFine().ifPresent(library -> libraries.append(", ").append(i18n("install.installer.optifine")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)optifine", ""))));
+                    LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(profile.getRepository().getResolvedPreservingPatchesVersion(id));
+                    for (LibraryAnalyzer.LibraryMark mark : analyzer) {
+                        String libraryId = mark.getLibraryId();
+                        String libraryVersion = mark.getLibraryVersion();
+                        if (libraryId.equals(MINECRAFT.getPatchId())) continue;
+                        if (I18n.hasKey("install.installer." + libraryId)) {
+                            libraries.append(", ").append(i18n("install.installer." + libraryId));
+                            if (libraryVersion != null)
+                                libraries.append(": ").append(modifyVersion("", libraryVersion.replaceAll("(?i)" + libraryId, "")));
+                        }
+                    }
+
                     subtitle.set(libraries.toString());
                 }, Platform::runLater)
                 .exceptionally(handleUncaught);

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameList.java

@@ -17,12 +17,10 @@
  */
 package org.jackhuang.hmcl.ui.versions;
 
-import com.jfoenix.utils.JFXUtilities;
 import javafx.application.Platform;
-import javafx.beans.property.*;
-import javafx.collections.FXCollections;
-import javafx.scene.control.Control;
-import javafx.scene.control.Skin;
+import javafx.beans.property.ReadOnlyStringProperty;
+import javafx.beans.property.ReadOnlyStringWrapper;
+import javafx.scene.Node;
 import javafx.scene.control.ToggleGroup;
 import org.jackhuang.hmcl.event.EventBus;
 import org.jackhuang.hmcl.event.RefreshingVersionsEvent;
@@ -30,32 +28,31 @@ import org.jackhuang.hmcl.game.HMCLGameRepository;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
-import org.jackhuang.hmcl.ui.Controllers;
-import org.jackhuang.hmcl.ui.WeakListenerHolder;
+import org.jackhuang.hmcl.ui.*;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
 import org.jackhuang.hmcl.ui.download.ModpackInstallWizardProvider;
 import org.jackhuang.hmcl.ui.download.VanillaInstallWizardProvider;
 import org.jackhuang.hmcl.util.i18n.I18n;
 import org.jackhuang.hmcl.util.versioning.VersionNumber;
 
+import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
-public class GameList extends Control implements DecoratorPage {
+public class GameList extends ListPageBase<GameListItem> implements DecoratorPage {
     private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper(I18n.i18n("version.manage"));
-    private final BooleanProperty loading = new SimpleBooleanProperty(true);
-    private final ListProperty<GameListItem> items = new SimpleListProperty<>(FXCollections.observableArrayList());
 
     private ToggleGroup toggleGroup;
 
     public GameList() {
         EventBus.EVENT_BUS.channel(RefreshingVersionsEvent.class).register(event -> {
             if (event.getSource() == Profiles.getSelectedProfile().getRepository())
-                JFXUtilities.runInFX(() -> loading.set(true));
+                runInFX(() -> setLoading(true));
         });
 
         Profiles.registerVersionsListener(this::loadVersions);
@@ -72,10 +69,10 @@ public class GameList extends Control implements DecoratorPage {
                         .thenComparing(a -> VersionNumber.asVersion(a.getId())))
                 .map(version -> new GameListItem(toggleGroup, profile, version.getId()))
                 .collect(Collectors.toList());
-        JFXUtilities.runInFX(() -> {
+        runInFX(() -> {
             if (profile == Profiles.getSelectedProfile()) {
-                loading.set(false);
-                items.setAll(children);
+                setLoading(false);
+                itemsProperty().setAll(children);
                 children.forEach(GameListItem::checkSelection);
 
                 profile.selectedVersionProperty().addListener(listenerHolder.weak((a, b, newValue) -> {
@@ -97,8 +94,8 @@ public class GameList extends Control implements DecoratorPage {
     }
 
     @Override
-    protected Skin<?> createDefaultSkin() {
-        return new GameListSkin(this);
+    protected GameListSkin createDefaultSkin() {
+        return new GameListSkin();
     }
 
     void addNewGame() {
@@ -128,11 +125,20 @@ public class GameList extends Control implements DecoratorPage {
         return title.getReadOnlyProperty();
     }
 
-    public BooleanProperty loadingProperty() {
-        return loading;
-    }
+    private class GameListSkin extends ToolbarListPageSkin<GameList> {
 
-    public ListProperty<GameListItem> itemsProperty() {
-        return items;
+        public GameListSkin() {
+            super(GameList.this);
+        }
+
+        @Override
+        protected List<Node> initializeToolbar(GameList skinnable) {
+            return Arrays.asList(
+                    createToolbarButton(i18n("install.new_game"), SVG::plus, skinnable::addNewGame),
+                    createToolbarButton(i18n("install.modpack"), SVG::importIcon, skinnable::importModpack),
+                    createToolbarButton(i18n("button.refresh"), SVG::refresh, skinnable::refresh),
+                    createToolbarButton(i18n("settings.type.global.manage"), SVG::gear, skinnable::modifyGlobalGameSettings)
+            );
+        }
     }
 }

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListItemSkin.java

@@ -17,13 +17,14 @@
  */
 package org.jackhuang.hmcl.ui.versions;
 
-import com.jfoenix.utils.JFXUtilities;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXPopup;
 import com.jfoenix.controls.JFXRadioButton;
 import com.jfoenix.effects.JFXDepthManager;
 import javafx.geometry.Pos;
+import javafx.scene.Cursor;
 import javafx.scene.control.SkinBase;
+import javafx.scene.input.MouseButton;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import org.jackhuang.hmcl.setting.Theme;
@@ -33,6 +34,7 @@ import org.jackhuang.hmcl.ui.construct.IconedMenuItem;
 import org.jackhuang.hmcl.ui.construct.MenuSeparator;
 import org.jackhuang.hmcl.ui.construct.PopupMenu;
 
+import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public class GameListItemSkin extends SkinBase<GameListItem> {
@@ -49,22 +51,24 @@ public class GameListItemSkin extends SkinBase<GameListItem> {
         chkSelected.setToggleGroup(skinnable.getToggleGroup());
         root.setLeft(chkSelected);
 
-        root.setCenter(new GameItem(skinnable.getProfile(), skinnable.getVersion()));
+        GameItem gameItem = new GameItem(skinnable.getProfile(), skinnable.getVersion());
+        gameItem.setMouseTransparent(true);
+        root.setCenter(gameItem);
 
         PopupMenu menu = new PopupMenu();
         JFXPopup popup = new JFXPopup(menu);
 
         menu.getContent().setAll(
+                new IconedMenuItem(FXUtils.limitingSize(SVG.launch(Theme.blackFillBinding(), 14, 14), 14, 14), i18n("version.launch.test"), FXUtils.withJFXPopupClosing(skinnable::launch, popup)),
+                new IconedMenuItem(FXUtils.limitingSize(SVG.script(Theme.blackFillBinding(), 14, 14), 14, 14), i18n("version.launch_script"), FXUtils.withJFXPopupClosing(skinnable::generateLaunchScript, popup)),
+                new MenuSeparator(),
                 new IconedMenuItem(FXUtils.limitingSize(SVG.gear(Theme.blackFillBinding(), 14, 14), 14, 14), i18n("version.manage.manage"), FXUtils.withJFXPopupClosing(skinnable::modifyGameSettings, popup)),
                 new MenuSeparator(),
                 new IconedMenuItem(FXUtils.limitingSize(SVG.pencil(Theme.blackFillBinding(), 14, 14), 14, 14), i18n("version.manage.rename"), FXUtils.withJFXPopupClosing(skinnable::rename, popup)),
                 new IconedMenuItem(FXUtils.limitingSize(SVG.delete(Theme.blackFillBinding(), 14, 14), 14, 14), i18n("version.manage.remove"), FXUtils.withJFXPopupClosing(skinnable::remove, popup)),
                 new IconedMenuItem(FXUtils.limitingSize(SVG.export(Theme.blackFillBinding(), 14, 14), 14, 14), i18n("modpack.export"), FXUtils.withJFXPopupClosing(skinnable::export, popup)),
                 new MenuSeparator(),
-                new IconedMenuItem(FXUtils.limitingSize(SVG.folderOpen(Theme.blackFillBinding(), 14, 14), 14, 14), i18n("folder.game"), FXUtils.withJFXPopupClosing(skinnable::browse, popup)),
-                new MenuSeparator(),
-                new IconedMenuItem(FXUtils.limitingSize(SVG.launch(Theme.blackFillBinding(), 14, 14), 14, 14), i18n("version.launch.test"), FXUtils.withJFXPopupClosing(skinnable::launch, popup)),
-                new IconedMenuItem(FXUtils.limitingSize(SVG.script(Theme.blackFillBinding(), 14, 14), 14, 14), i18n("version.launch_script"), FXUtils.withJFXPopupClosing(skinnable::generateLaunchScript, popup)));
+                new IconedMenuItem(FXUtils.limitingSize(SVG.folderOpen(Theme.blackFillBinding(), 14, 14), 14, 14), i18n("folder.game"), FXUtils.withJFXPopupClosing(skinnable::browse, popup)));
 
         HBox right = new HBox();
         right.setAlignment(Pos.CENTER_RIGHT);
@@ -73,7 +77,7 @@ public class GameListItemSkin extends SkinBase<GameListItem> {
             btnUpgrade.setOnMouseClicked(e -> skinnable.update());
             btnUpgrade.getStyleClass().add("toggle-icon4");
             btnUpgrade.setGraphic(SVG.update(Theme.blackFillBinding(), -1, -1));
-            JFXUtilities.runInFX(() -> FXUtils.installFastTooltip(btnUpgrade, i18n("version.update")));
+            runInFX(() -> FXUtils.installFastTooltip(btnUpgrade, i18n("version.update")));
             right.getChildren().add(btnUpgrade);
         }
 
@@ -87,9 +91,20 @@ public class GameListItemSkin extends SkinBase<GameListItem> {
         right.getChildren().add(btnManage);
         root.setRight(right);
 
-        root.setStyle("-fx-background-color: white; -fx-padding: 8 8 8 12;");
+        root.setStyle("-fx-background-color: white; -fx-padding: 8 8 8 0;");
         JFXDepthManager.setDepth(root, 1);
 
         getChildren().setAll(root);
+
+        root.setCursor(Cursor.HAND);
+        root.setOnMouseClicked(e -> {
+            if (e.getButton() == MouseButton.PRIMARY) {
+                if (e.getClickCount() == 1) {
+                    skinnable.modifyGameSettings();
+                }
+            } else if (e.getButton() == MouseButton.SECONDARY) {
+                popup.show(root, JFXPopup.PopupVPosition.TOP, JFXPopup.PopupHPosition.LEFT, e.getX(), e.getY());
+            }
+        });
     }
 }

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListSkin.java

@@ -1,116 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.ui.versions;
-
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXScrollPane;
-import com.jfoenix.effects.JFXDepthManager;
-import javafx.beans.binding.Bindings;
-import javafx.geometry.Insets;
-import javafx.scene.Node;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.control.SkinBase;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.setting.Theme;
-import org.jackhuang.hmcl.ui.SVG;
-import org.jackhuang.hmcl.ui.construct.SpinnerPane;
-import org.jackhuang.hmcl.util.i18n.I18n;
-
-public class GameListSkin extends SkinBase<GameList> {
-
-    private static Node wrap(Node node) {
-        StackPane stackPane = new StackPane();
-        stackPane.setPadding(new Insets(0, 5, 0, 2));
-        stackPane.getChildren().setAll(node);
-        return stackPane;
-    }
-
-    public GameListSkin(GameList skinnable) {
-        super(skinnable);
-
-        BorderPane root = new BorderPane();
-
-        {
-            HBox toolbar = new HBox();
-            toolbar.getStyleClass().add("jfx-tool-bar-second");
-            JFXDepthManager.setDepth(toolbar, 1);
-            toolbar.setPickOnBounds(false);
-
-            JFXButton btnAddNewGame = new JFXButton();
-            btnAddNewGame.getStyleClass().add("jfx-tool-bar-button");
-            btnAddNewGame.textFillProperty().bind(Theme.foregroundFillBinding());
-            btnAddNewGame.setGraphic(wrap(SVG.plus(Theme.foregroundFillBinding(), -1, -1)));
-            btnAddNewGame.setText(I18n.i18n("install.new_game"));
-            btnAddNewGame.setOnMouseClicked(e -> skinnable.addNewGame());
-            toolbar.getChildren().add(btnAddNewGame);
-
-            JFXButton btnImportModpack = new JFXButton();
-            btnImportModpack.getStyleClass().add("jfx-tool-bar-button");
-            btnImportModpack.textFillProperty().bind(Theme.foregroundFillBinding());
-            btnImportModpack.setGraphic(wrap(SVG.importIcon(Theme.foregroundFillBinding(), -1, -1)));
-            btnImportModpack.setText(I18n.i18n("install.modpack"));
-            btnImportModpack.setOnMouseClicked(e -> skinnable.importModpack());
-            toolbar.getChildren().add(btnImportModpack);
-
-            JFXButton btnRefresh = new JFXButton();
-            btnRefresh.getStyleClass().add("jfx-tool-bar-button");
-            btnRefresh.textFillProperty().bind(Theme.foregroundFillBinding());
-            btnRefresh.setGraphic(wrap(SVG.refresh(Theme.foregroundFillBinding(), -1, -1)));
-            btnRefresh.setText(I18n.i18n("button.refresh"));
-            btnRefresh.setOnMouseClicked(e -> skinnable.refresh());
-            toolbar.getChildren().add(btnRefresh);
-
-            JFXButton btnModify = new JFXButton();
-            btnModify.getStyleClass().add("jfx-tool-bar-button");
-            btnModify.textFillProperty().bind(Theme.foregroundFillBinding());
-            btnModify.setGraphic(wrap(SVG.gear(Theme.foregroundFillBinding(), -1, -1)));
-            btnModify.setText(I18n.i18n("settings.type.global.manage"));
-            btnModify.setOnMouseClicked(e -> skinnable.modifyGlobalGameSettings());
-            toolbar.getChildren().add(btnModify);
-
-            root.setTop(toolbar);
-        }
-
-        {
-            SpinnerPane center = new SpinnerPane();
-            center.loadingProperty().bind(skinnable.loadingProperty());
-            center.getStyleClass().add("large-spinner-pane");
-
-            ScrollPane scrollPane = new ScrollPane();
-            scrollPane.setFitToWidth(true);
-
-            VBox gameList = new VBox();
-            gameList.maxWidthProperty().bind(scrollPane.widthProperty());
-            gameList.setSpacing(10);
-            gameList.setStyle("-fx-padding: 10 10 10 10;");
-
-            Bindings.bindContent(gameList.getChildren(), skinnable.itemsProperty());
-
-            scrollPane.setContent(gameList);
-            JFXScrollPane.smoothScrolling(scrollPane);
-
-            center.setContent(scrollPane);
-            root.setCenter(center);
-        }
-
-        getChildren().setAll(root);
-    }
-}

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/InstallerListPage.java

@@ -17,61 +17,140 @@
  */
 package org.jackhuang.hmcl.ui.versions;
 
+import javafx.scene.Node;
+import javafx.scene.control.Skin;
+import javafx.stage.FileChooser;
 import org.jackhuang.hmcl.download.LibraryAnalyzer;
-import org.jackhuang.hmcl.download.MaintainTask;
-import org.jackhuang.hmcl.download.game.VersionJsonSaveTask;
 import org.jackhuang.hmcl.game.GameVersion;
-import org.jackhuang.hmcl.game.Library;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.task.TaskExecutor;
+import org.jackhuang.hmcl.task.TaskListener;
 import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.InstallerItem;
-import org.jackhuang.hmcl.ui.ListPage;
+import org.jackhuang.hmcl.ui.ListPageBase;
+import org.jackhuang.hmcl.ui.SVG;
+import org.jackhuang.hmcl.ui.ToolbarListPageSkin;
 import org.jackhuang.hmcl.ui.download.InstallerWizardProvider;
+import org.jackhuang.hmcl.ui.download.UpdateInstallerWizardProvider;
+import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.i18n.I18n;
+import org.jackhuang.hmcl.util.io.FileUtils;
 
-import java.util.LinkedList;
-import java.util.Optional;
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
+import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
-public class InstallerListPage extends ListPage<InstallerItem> {
+public class InstallerListPage extends ListPageBase<InstallerItem> {
     private Profile profile;
     private String versionId;
     private Version version;
+    private String gameVersion;
+
+    {
+        FXUtils.applyDragListener(this, it -> Arrays.asList("jar", "exe").contains(FileUtils.getExtension(it)), mods -> {
+            if (!mods.isEmpty())
+                doInstallOffline(mods.get(0));
+        });
+    }
+
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new InstallerListPageSkin();
+    }
 
     public void loadVersion(Profile profile, String versionId) {
         this.profile = profile;
         this.versionId = versionId;
-        this.version = profile.getRepository().getResolvedVersion(versionId);
+        this.version = profile.getRepository().getVersion(versionId);
+        this.gameVersion = null;
 
-        LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(version);
+        Task.supplyAsync(() -> {
+            gameVersion = GameVersion.minecraftVersion(profile.getRepository().getVersionJar(version)).orElse(null);
 
-        Function<Library, Consumer<InstallerItem>> removeAction = library -> x -> {
-            LinkedList<Library> newList = new LinkedList<>(version.getLibraries());
-            newList.remove(library);
-            new MaintainTask(version.setLibraries(newList))
-                    .thenCompose(maintainedVersion -> new VersionJsonSaveTask(profile.getRepository(), maintainedVersion))
-                    .withCompose(profile.getRepository().refreshVersionsAsync())
-                    .withRun(Schedulers.javafx(), () -> loadVersion(this.profile, this.versionId))
-                    .start();
-        };
+            return LibraryAnalyzer.analyze(profile.getRepository().getResolvedPreservingPatchesVersion(versionId));
+        }).thenAcceptAsync(Schedulers.javafx(), analyzer -> {
+            Function<String, Consumer<InstallerItem>> removeAction = libraryId -> x -> {
+                profile.getDependency().removeLibraryAsync(version, libraryId)
+                        .thenComposeAsync(profile.getRepository()::save)
+                        .withComposeAsync(profile.getRepository().refreshVersionsAsync())
+                        .withRunAsync(Schedulers.javafx(), () -> loadVersion(this.profile, this.versionId))
+                        .start();
+            };
 
-        itemsProperty().clear();
-        analyzer.getForge().ifPresent(library -> itemsProperty().add(new InstallerItem("Forge", library.getVersion(), removeAction.apply(library))));
-        analyzer.getLiteLoader().ifPresent(library -> itemsProperty().add(new InstallerItem("LiteLoader", library.getVersion(), removeAction.apply(library))));
-        analyzer.getOptiFine().ifPresent(library -> itemsProperty().add(new InstallerItem("OptiFine", library.getVersion(), removeAction.apply(library))));
+            itemsProperty().clear();
+            for (LibraryAnalyzer.LibraryMark mark : analyzer) {
+                String libraryId = mark.getLibraryId();
+                String libraryVersion = mark.getLibraryVersion();
+                String title = I18n.hasKey("install.installer." + libraryId) ? i18n("install.installer." + libraryId) : libraryId;
+                Consumer<InstallerItem> action = "game".equals(libraryId) ? null : removeAction.apply(libraryId);
+                if (libraryVersion != null && Lang.test(() -> profile.getDependency().getVersionList(libraryId)))
+                    itemsProperty().add(
+                            new InstallerItem(title, libraryVersion, () -> {
+                                Controllers.getDecorator().startWizard(new UpdateInstallerWizardProvider(profile, gameVersion, version, libraryId, libraryVersion));
+                            }, action));
+                else
+                    itemsProperty().add(new InstallerItem(title, libraryVersion, null, action));
+            }
+        }).start();
     }
 
-    @Override
-    public void add() {
-        Optional<String> gameVersion = GameVersion.minecraftVersion(profile.getRepository().getVersionJar(version));
-
-        if (!gameVersion.isPresent())
+    public void installOnline() {
+        if (gameVersion == null)
             Controllers.dialog(i18n("version.cannot_read"));
         else
-            Controllers.getDecorator().startWizard(new InstallerWizardProvider(profile, gameVersion.get(), version));
+            Controllers.getDecorator().startWizard(new InstallerWizardProvider(profile, gameVersion, version));
+    }
+
+    public void installOffline() {
+        FileChooser chooser = new FileChooser();
+        chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("install.installer.install_offline.extension"), "*.jar", "*.exe"));
+        File file = chooser.showOpenDialog(Controllers.getStage());
+        if (file != null) doInstallOffline(file);
+    }
+
+    private void doInstallOffline(File file) {
+        Task<?> task = profile.getDependency().installLibraryAsync(version, file.toPath())
+                .thenComposeAsync(profile.getRepository().refreshVersionsAsync());
+        task.setName(i18n("install.installer.install_offline"));
+        TaskExecutor executor = task.executor(new TaskListener() {
+            @Override
+            public void onStop(boolean success, TaskExecutor executor) {
+                runInFX(() -> {
+                    if (success) {
+                        loadVersion(profile, versionId);
+                        Controllers.dialog(i18n("install.success"));
+                    } else {
+                        if (executor.getException() == null)
+                            return;
+                        InstallerWizardProvider.alertFailureMessage(executor.getException(), null);
+                    }
+                });
+            }
+        });
+        Controllers.taskDialog(executor, i18n("install.installer.install_offline"));
+        executor.start();
+    }
+
+    private class InstallerListPageSkin extends ToolbarListPageSkin<InstallerListPage> {
+
+        InstallerListPageSkin() {
+            super(InstallerListPage.this);
+        }
+
+        @Override
+        protected List<Node> initializeToolbar(InstallerListPage skinnable) {
+            return Arrays.asList(
+                    createToolbarButton(i18n("install.installer.install_online"), SVG::plus, skinnable::installOnline),
+                    createToolbarButton(i18n("install.installer.install_offline"), SVG::plus, skinnable::installOffline));
+        }
     }
 }

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java

@@ -17,18 +17,14 @@
  */
 package org.jackhuang.hmcl.ui.versions;
 
-import com.jfoenix.utils.JFXUtilities;
 import com.jfoenix.controls.JFXTabPane;
 import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleListProperty;
-import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import javafx.scene.control.Control;
 import javafx.scene.control.Skin;
 import javafx.scene.control.TreeItem;
 import javafx.stage.FileChooser;
+import org.jackhuang.hmcl.download.LibraryAnalyzer;
 import org.jackhuang.hmcl.mod.ModInfo;
 import org.jackhuang.hmcl.mod.ModManager;
 import org.jackhuang.hmcl.setting.Profile;
@@ -36,6 +32,7 @@ import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.ListPageBase;
 import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.io.FileUtils;
 
@@ -44,17 +41,19 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
+import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
-public final class ModListPage extends Control {
-    private final ListProperty<ModListPageSkin.ModInfoObject> items = new SimpleListProperty<>(this, "items", FXCollections.observableArrayList());
-    private final BooleanProperty loading = new SimpleBooleanProperty(this, "loading", false);
+public final class ModListPage extends ListPageBase<ModListPageSkin.ModInfoObject> {
+    private final BooleanProperty modded = new SimpleBooleanProperty(this, "modded", false);
 
     private JFXTabPane parentTab;
     private ModManager modManager;
+    private LibraryAnalyzer libraryAnalyzer;
 
     public ModListPage() {
 
@@ -80,14 +79,16 @@ public final class ModListPage extends Control {
     }
 
     public void loadVersion(Profile profile, String id) {
+        libraryAnalyzer = LibraryAnalyzer.analyze(profile.getRepository().getResolvedPreservingPatchesVersion(id));
+        modded.set(libraryAnalyzer.hasModLoader());
         loadMods(profile.getRepository().getModManager(id));
     }
 
-    public void loadMods(ModManager modManager) {
+    private void loadMods(ModManager modManager) {
         this.modManager = modManager;
         Task.supplyAsync(() -> {
             synchronized (ModListPage.this) {
-                JFXUtilities.runInFX(() -> loadingProperty().set(true));
+                runInFX(() -> loadingProperty().set(true));
                 modManager.refreshMods();
                 return new LinkedList<>(modManager.getMods());
             }
@@ -123,7 +124,7 @@ public final class ModListPage extends Control {
                     // Actually addMod will not throw exceptions because FileChooser has already filtered files.
                 }
             }
-        }).withRun(Schedulers.javafx(), () -> {
+        }).withRunAsync(Schedulers.javafx(), () -> {
             List<String> prompt = new LinkedList<>();
             if (!succeeded.isEmpty())
                 prompt.add(i18n("mods.add.success", String.join(", ", succeeded)));
@@ -138,10 +139,12 @@ public final class ModListPage extends Control {
         this.parentTab = parentTab;
     }
 
-    public void removeSelectedMods(ObservableList<TreeItem<ModListPageSkin.ModInfoObject>> selectedItems) {
+    public void removeSelected(ObservableList<TreeItem<ModListPageSkin.ModInfoObject>> selectedItems) {
         try {
             modManager.removeMods(selectedItems.stream()
+                    .filter(Objects::nonNull)
                     .map(TreeItem::getValue)
+                    .filter(Objects::nonNull)
                     .map(ModListPageSkin.ModInfoObject::getModInfo)
                     .toArray(ModInfo[]::new));
             loadMods(modManager);
@@ -150,41 +153,29 @@ public final class ModListPage extends Control {
         }
     }
 
-    public void enableSelectedMods(ObservableList<TreeItem<ModListPageSkin.ModInfoObject>> selectedItems) {
+    public void enableSelected(ObservableList<TreeItem<ModListPageSkin.ModInfoObject>> selectedItems) {
         selectedItems.stream()
                 .map(TreeItem::getValue)
                 .map(ModListPageSkin.ModInfoObject::getModInfo)
                 .forEach(info -> info.setActive(true));
     }
 
-    public void disableSelectedMods(ObservableList<TreeItem<ModListPageSkin.ModInfoObject>> selectedItems) {
+    public void disableSelected(ObservableList<TreeItem<ModListPageSkin.ModInfoObject>> selectedItems) {
         selectedItems.stream()
                 .map(TreeItem::getValue)
                 .map(ModListPageSkin.ModInfoObject::getModInfo)
                 .forEach(info -> info.setActive(false));
     }
 
-    public ObservableList<ModListPageSkin.ModInfoObject> getItems() {
-        return items.get();
+    public boolean isModded() {
+        return modded.get();
     }
 
-    public void setItems(ObservableList<ModListPageSkin.ModInfoObject> items) {
-        this.items.set(items);
+    public BooleanProperty moddedProperty() {
+        return modded;
     }
 
-    public ListProperty<ModListPageSkin.ModInfoObject> itemsProperty() {
-        return items;
-    }
-
-    public boolean isLoading() {
-        return loading.get();
-    }
-
-    public void setLoading(boolean loading) {
-        this.loading.set(loading);
-    }
-
-    public BooleanProperty loadingProperty() {
-        return loading;
+    public void setModded(boolean modded) {
+        this.modded.set(modded);
     }
 }

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java

@@ -17,42 +17,43 @@
  */
 package org.jackhuang.hmcl.ui.versions;
 
-import com.jfoenix.controls.*;
+import com.jfoenix.controls.JFXTreeTableColumn;
+import com.jfoenix.controls.JFXTreeTableView;
+import com.jfoenix.controls.RecursiveTreeItem;
 import com.jfoenix.controls.datamodels.treetable.RecursiveTreeObject;
 import com.jfoenix.effects.JFXDepthManager;
 import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.beans.value.ObservableValue;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.geometry.Insets;
 import javafx.scene.Node;
-import javafx.scene.control.*;
+import javafx.scene.control.Label;
+import javafx.scene.control.SelectionMode;
+import javafx.scene.control.SkinBase;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
-import javafx.util.Callback;
 import org.jackhuang.hmcl.mod.ModInfo;
-import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.construct.JFXCheckBoxTreeTableCell;
 import org.jackhuang.hmcl.ui.construct.SpinnerPane;
+import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
 
-import java.util.function.Function;
-
+import static org.jackhuang.hmcl.ui.FXUtils.setupCellValueFactory;
+import static org.jackhuang.hmcl.ui.FXUtils.wrapMargin;
+import static org.jackhuang.hmcl.ui.ToolbarListPageSkin.createToolbarButton;
+import static org.jackhuang.hmcl.util.StringUtils.isNotBlank;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
-public class ModListPageSkin extends SkinBase<ModListPage> {
+class ModListPageSkin extends SkinBase<ModListPage> {
 
-    private static Node wrap(Node node) {
-        StackPane stackPane = new StackPane();
-        stackPane.setPadding(new Insets(0, 5, 0, 2));
-        stackPane.getChildren().setAll(node);
-        return stackPane;
-    }
-
-    public ModListPageSkin(ModListPage skinnable) {
+    ModListPageSkin(ModListPage skinnable) {
         super(skinnable);
 
+        StackPane pane = new StackPane();
+        pane.getStyleClass().addAll("notice-pane", "white-background");
+
         BorderPane root = new BorderPane();
         JFXTreeTableView<ModInfoObject> tableView = new JFXTreeTableView<>();
 
@@ -62,46 +63,14 @@ public class ModListPageSkin extends SkinBase<ModListPage> {
             JFXDepthManager.setDepth(toolbar, 1);
             toolbar.setPickOnBounds(false);
 
-            JFXButton btnRefresh = new JFXButton();
-            btnRefresh.getStyleClass().add("jfx-tool-bar-button");
-            btnRefresh.textFillProperty().bind(Theme.foregroundFillBinding());
-            btnRefresh.setGraphic(wrap(SVG.refresh(Theme.foregroundFillBinding(), -1, -1)));
-            btnRefresh.setText(i18n("button.refresh"));
-            btnRefresh.setOnMouseClicked(e -> skinnable.refresh());
-            toolbar.getChildren().add(btnRefresh);
-
-            JFXButton btnAddMod = new JFXButton();
-            btnAddMod.getStyleClass().add("jfx-tool-bar-button");
-            btnAddMod.textFillProperty().bind(Theme.foregroundFillBinding());
-            btnAddMod.setGraphic(wrap(SVG.plus(Theme.foregroundFillBinding(), -1, -1)));
-            btnAddMod.setText(i18n("mods.add"));
-            btnAddMod.setOnMouseClicked(e -> skinnable.add());
-            toolbar.getChildren().add(btnAddMod);
-
-            JFXButton btnRemove = new JFXButton();
-            btnRemove.getStyleClass().add("jfx-tool-bar-button");
-            btnRemove.textFillProperty().bind(Theme.foregroundFillBinding());
-            btnRemove.setGraphic(wrap(SVG.delete(Theme.foregroundFillBinding(), -1, -1)));
-            btnRemove.setText(i18n("mods.remove"));
-            btnRemove.setOnMouseClicked(e -> skinnable.removeSelectedMods(tableView.getSelectionModel().getSelectedItems()));
-            toolbar.getChildren().add(btnRemove);
-
-            JFXButton btnEnable = new JFXButton();
-            btnEnable.getStyleClass().add("jfx-tool-bar-button");
-            btnEnable.textFillProperty().bind(Theme.foregroundFillBinding());
-            btnEnable.setGraphic(wrap(SVG.check(Theme.foregroundFillBinding(), -1, -1)));
-            btnEnable.setText(i18n("mods.enable"));
-            btnEnable.setOnMouseClicked(e -> skinnable.enableSelectedMods(tableView.getSelectionModel().getSelectedItems()));
-            toolbar.getChildren().add(btnEnable);
-
-            JFXButton btnDisable = new JFXButton();
-            btnDisable.getStyleClass().add("jfx-tool-bar-button");
-            btnDisable.textFillProperty().bind(Theme.foregroundFillBinding());
-            btnDisable.setGraphic(wrap(SVG.close(Theme.foregroundFillBinding(), -1, -1)));
-            btnDisable.setText(i18n("mods.disable"));
-            btnDisable.setOnMouseClicked(e -> skinnable.disableSelectedMods(tableView.getSelectionModel().getSelectedItems()));
-            toolbar.getChildren().add(btnDisable);
-
+            toolbar.getChildren().add(createToolbarButton(i18n("button.refresh"), SVG::refresh, skinnable::refresh));
+            toolbar.getChildren().add(createToolbarButton(i18n("mods.add"), SVG::plus, skinnable::add));
+            toolbar.getChildren().add(createToolbarButton(i18n("mods.remove"), SVG::delete, () ->
+                    skinnable.removeSelected(tableView.getSelectionModel().getSelectedItems())));
+            toolbar.getChildren().add(createToolbarButton(i18n("mods.enable"), SVG::check, () ->
+                    skinnable.enableSelected(tableView.getSelectionModel().getSelectedItems())));
+            toolbar.getChildren().add(createToolbarButton(i18n("mods.disable"), SVG::close, () ->
+                    skinnable.disableSelected(tableView.getSelectionModel().getSelectedItems())));
             root.setTop(toolbar);
         }
 
@@ -110,6 +79,7 @@ public class ModListPageSkin extends SkinBase<ModListPage> {
             center.getStyleClass().add("large-spinner-pane");
             center.loadingProperty().bind(skinnable.loadingProperty());
 
+            tableView.getStyleClass().add("no-header");
             tableView.setShowRoot(false);
             tableView.setEditable(true);
             tableView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
@@ -122,65 +92,54 @@ public class ModListPageSkin extends SkinBase<ModListPage> {
             activeColumn.setMaxWidth(40);
             activeColumn.setMinWidth(40);
 
-            JFXTreeTableColumn<ModInfoObject, String> fileNameColumn = new JFXTreeTableColumn<>();
-            fileNameColumn.setText(i18n("archive.name"));
-            setupCellValueFactory(fileNameColumn, ModInfoObject::fileNameProperty);
-            fileNameColumn.prefWidthProperty().bind(tableView.widthProperty().subtract(40).multiply(0.8));
+            JFXTreeTableColumn<ModInfoObject, Node> detailColumn = new JFXTreeTableColumn<>();
+            setupCellValueFactory(detailColumn, ModInfoObject::nodeProperty);
 
-            JFXTreeTableColumn<ModInfoObject, String> versionColumn = new JFXTreeTableColumn<>();
-            versionColumn.setText(i18n("archive.version"));
-            versionColumn.setPrefWidth(100);
-            setupCellValueFactory(versionColumn, ModInfoObject::versionProperty);
-            versionColumn.prefWidthProperty().bind(tableView.widthProperty().subtract(40).multiply(0.2));
-
-            tableView.getColumns().setAll(activeColumn, fileNameColumn, versionColumn);
+            tableView.getColumns().setAll(activeColumn, detailColumn);
 
             tableView.setColumnResizePolicy(JFXTreeTableView.CONSTRAINED_RESIZE_POLICY);
             center.setContent(tableView);
             root.setCenter(center);
         }
 
-        getChildren().setAll(root);
-    }
+        Label label = new Label(i18n("mods.not_modded"));
+        label.prefWidthProperty().bind(pane.widthProperty().add(-100));
 
-    private <T> void setupCellValueFactory(JFXTreeTableColumn<ModInfoObject, T> column, Function<ModInfoObject, ObservableValue<T>> mapper) {
-        column.setCellValueFactory(new Callback<TreeTableColumn.CellDataFeatures<ModInfoObject, T>, ObservableValue<T>>() {
-            @Override
-            public ObservableValue<T> call(TreeTableColumn.CellDataFeatures<ModInfoObject, T> param) {
-                if (column.validateValue(param))
-                    return mapper.apply(param.getValue().getValue());
-                else
-                    return column.getComputedValue(param);
-            }
+        FXUtils.onChangeAndOperate(skinnable.moddedProperty(), modded -> {
+            if (modded) pane.getChildren().setAll(root);
+            else pane.getChildren().setAll(label);
         });
+
+        getChildren().setAll(pane);
     }
 
-    public static class ModInfoObject extends RecursiveTreeObject<ModInfoObject> {
+    static class ModInfoObject extends RecursiveTreeObject<ModInfoObject> {
         private final BooleanProperty active;
-        private final StringProperty fileName;
-        private final StringProperty version;
         private final ModInfo modInfo;
+        private final ObjectProperty<Node> node;
 
-        public ModInfoObject(ModInfo modInfo) {
+        ModInfoObject(ModInfo modInfo) {
             this.modInfo = modInfo;
             this.active = modInfo.activeProperty();
-            this.fileName = new SimpleStringProperty(modInfo.getFileName());
-            this.version = new SimpleStringProperty(modInfo.getVersion());
+            StringBuilder message = new StringBuilder(modInfo.getName());
+            if (isNotBlank(modInfo.getVersion()))
+                message.append(", ").append(i18n("archive.version")).append(": ").append(modInfo.getVersion());
+            if (isNotBlank(modInfo.getGameVersion()))
+                message.append(", ").append(i18n("archive.game_version")).append(": ").append(modInfo.getGameVersion());
+            if (isNotBlank(modInfo.getAuthors()))
+                message.append(", ").append(i18n("archive.author")).append(": ").append(modInfo.getAuthors());
+            this.node = new SimpleObjectProperty<>(wrapMargin(new TwoLineListItem(modInfo.getFileName(), message.toString()), new Insets(8, 0, 8, 0)));
         }
 
-        public BooleanProperty activeProperty() {
+        BooleanProperty activeProperty() {
             return active;
         }
 
-        public StringProperty fileNameProperty() {
-            return fileName;
+        ObjectProperty<Node> nodeProperty() {
+            return node;
         }
 
-        public StringProperty versionProperty() {
-            return version;
-        }
-
-        public ModInfo getModInfo() {
+        ModInfo getModInfo() {
             return modInfo;
         }
     }

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java

@@ -34,11 +34,7 @@ import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.stage.FileChooser;
-import org.jackhuang.hmcl.setting.EnumGameDirectory;
-import org.jackhuang.hmcl.setting.LauncherVisibility;
-import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.setting.Profiles;
-import org.jackhuang.hmcl.setting.VersionSetting;
+import org.jackhuang.hmcl.setting.*;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.Controllers;
@@ -61,6 +57,7 @@ import java.util.Optional;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
+import static org.jackhuang.hmcl.ui.FXUtils.newImage;
 import static org.jackhuang.hmcl.ui.FXUtils.stringConverter;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
@@ -118,7 +115,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
 
         FXUtils.smoothScrolling(scroll);
 
-        Task.supplyAsync(JavaVersion::getJavas).thenAccept(Schedulers.javafx(), list -> {
+        Task.supplyAsync(JavaVersion::getJavas).thenAcceptAsync(Schedulers.javafx(), list -> {
             javaItem.loadChildren(list.stream()
                     .map(javaVersion -> javaItem.createChildren(javaVersion.getVersion() + i18n("settings.game.java_directory.bit",
                             javaVersion.getPlatform().getBit()), javaVersion.getBinary().toString(), javaVersion))
@@ -274,7 +271,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
         if (versionSetting == null)
             return;
         Task.supplyAsync(versionSetting::getJavaVersion)
-                .thenAccept(Schedulers.javafx(), javaVersion -> javaItem.setSubtitle(Optional.ofNullable(javaVersion)
+                .thenAcceptAsync(Schedulers.javafx(), javaVersion -> javaItem.setSubtitle(Optional.ofNullable(javaVersion)
                         .map(JavaVersion::getBinary).map(Path::toString).orElse("Invalid Java Path")))
                 .start();
     }
@@ -316,7 +313,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
 
     private void loadIcon() {
         if (versionId == null) {
-            iconPickerItem.setImage(new Image("/assets/img/grass.png"));
+            iconPickerItem.setImage(newImage("/assets/img/grass.png"));
             return;
         }
 
@@ -324,7 +321,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
         if (iconFile.exists())
             iconPickerItem.setImage(new Image("file:" + iconFile.getAbsolutePath()));
         else
-            iconPickerItem.setImage(new Image("/assets/img/grass.png"));
+            iconPickerItem.setImage(newImage("/assets/img/grass.png"));
         FXUtils.limitSize(iconPickerItem.getImageView(), 32, 32);
     }
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/Versions.java

@@ -21,7 +21,6 @@ import javafx.stage.FileChooser;
 import org.jackhuang.hmcl.download.game.GameAssetDownloadTask;
 import org.jackhuang.hmcl.game.GameRepository;
 import org.jackhuang.hmcl.game.LauncherHelper;
-import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.setting.Accounts;
 import org.jackhuang.hmcl.setting.EnumGameDirectory;
 import org.jackhuang.hmcl.setting.Profile;
@@ -49,9 +48,7 @@ public class Versions {
                 isMovingToTrashSupported ? i18n("version.manage.remove.confirm.trash", version, version + "_removed") :
                         i18n("version.manage.remove.confirm", version);
         Controllers.confirmDialog(message, i18n("message.confirm"), () -> {
-            if (profile.getRepository().removeVersionFromDisk(version)) {
-                profile.getRepository().refreshVersionsAsync().start();
-            }
+            profile.getRepository().removeVersionFromDisk(version);
         }, null);
     }
 
@@ -79,8 +76,7 @@ public class Versions {
     }
 
     public static void updateGameAssets(Profile profile, String version) {
-        Version resolvedVersion = profile.getRepository().getResolvedVersion(version);
-        TaskExecutor executor = new GameAssetDownloadTask(profile.getDependency(), resolvedVersion, GameAssetDownloadTask.DOWNLOAD_INDEX_FORCIBLY)
+        TaskExecutor executor = new GameAssetDownloadTask(profile.getDependency(), profile.getRepository().getVersion(version), GameAssetDownloadTask.DOWNLOAD_INDEX_FORCIBLY)
                 .executor();
         Controllers.taskDialog(executor, i18n("version.manage.redownload_assets_index"));
         executor.start();

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListItem.java

@@ -35,6 +35,7 @@ import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import static org.jackhuang.hmcl.util.StringUtils.parseColorEscapes;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public class WorldListItem extends Control {
@@ -48,7 +49,7 @@ public class WorldListItem extends Control {
         this.world = world;
         this.simpleDateFormat = new SimpleDateFormat(i18n("world.time"));
 
-        title.set(world.getWorldName());
+        title.set(parseColorEscapes(world.getWorldName()));
         subtitle.set(i18n("world.description", world.getFileName(), simpleDateFormat.format(new Date(world.getLastPlayed())), world.getGameVersion() == null ? i18n("message.unknown") : world.getGameVersion()));
     }
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListPage.java

@@ -17,48 +17,85 @@
  */
 package org.jackhuang.hmcl.ui.versions;
 
+import com.jfoenix.controls.JFXCheckBox;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.scene.Node;
 import javafx.stage.FileChooser;
+import org.jackhuang.hmcl.game.GameVersion;
 import org.jackhuang.hmcl.game.World;
 import org.jackhuang.hmcl.setting.Profile;
+import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.ui.Controllers;
-import org.jackhuang.hmcl.ui.FXUtils;
-import org.jackhuang.hmcl.ui.ListPage;
+import org.jackhuang.hmcl.ui.*;
 import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.io.FileUtils;
 
 import java.io.File;
+import java.io.IOException;
 import java.nio.file.FileAlreadyExistsException;
+import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
-public class WorldListPage extends ListPage<WorldListItem> {
+public class WorldListPage extends ListPageBase<WorldListItem> {
+    private final BooleanProperty showAll = new SimpleBooleanProperty(this, "showAll", false);
+
     private Path savesDir;
+    private List<World> worlds;
+    private Profile profile;
+    private String id;
+    private String gameVersion;
 
     public WorldListPage() {
         FXUtils.applyDragListener(this, it -> "zip".equals(FileUtils.getExtension(it)), modpacks -> {
             installWorld(modpacks.get(0));
         });
-    }
 
-    public void loadVersion(Profile profile, String id) {
-        this.savesDir = profile.getRepository().getRunDirectory(id).toPath().resolve("saves");
-
-        setLoading(true);
-        Task.supplyAsync(() -> World.getWorlds(savesDir).parallel().collect(Collectors.toList()))
-                .whenComplete(Schedulers.javafx(), (result, exception) -> {
-                    setLoading(false);
-                    if (exception == null)
-                        itemsProperty().setAll(result.stream().map(WorldListItem::new).collect(Collectors.toList()));
-                }).start();
+        showAll.addListener(e -> {
+            if (worlds != null)
+                itemsProperty().setAll(worlds.stream()
+                        .filter(world -> isShowAll() || world.getGameVersion() == null || world.getGameVersion().equals(gameVersion))
+                        .map(WorldListItem::new).collect(Collectors.toList()));
+        });
     }
 
     @Override
+    protected ToolbarListPageSkin createDefaultSkin() {
+        return new WorldListPageSkin();
+    }
+
+    public void loadVersion(Profile profile, String id) {
+        this.profile = profile;
+        this.id = id;
+        this.savesDir = profile.getRepository().getRunDirectory(id).toPath().resolve("saves");
+        refresh();
+    }
+
+    public void refresh() {
+        if (profile == null || id == null)
+            return;
+
+        setLoading(true);
+        Task
+                .runAsync(() -> gameVersion = GameVersion.minecraftVersion(profile.getRepository().getVersionJar(id)).orElse(null))
+                .thenSupplyAsync(() -> World.getWorlds(savesDir).parallel().collect(Collectors.toList()))
+                .whenComplete(Schedulers.javafx(), (result, exception) -> {
+                    worlds = result;
+                    setLoading(false);
+                    if (exception == null)
+                        itemsProperty().setAll(result.stream()
+                                .filter(world -> isShowAll() || world.getGameVersion() == null || world.getGameVersion().equals(gameVersion))
+                                .map(WorldListItem::new).collect(Collectors.toList()));
+                }).start();
+    }
+
     public void add() {
         FileChooser chooser = new FileChooser();
         chooser.setTitle(i18n("world.import.choose"));
@@ -82,6 +119,8 @@ public class WorldListPage extends ListPage<WorldListItem> {
                                 }, e -> {
                                     if (e instanceof FileAlreadyExistsException)
                                         reject.accept(i18n("world.import.failed", i18n("world.import.already_exists")));
+                                    else if (e instanceof IOException && e.getCause() instanceof InvalidPathException)
+                                        reject.accept(i18n("world.import.failed", i18n("install.new_game.malformed")));
                                     else
                                         reject.accept(i18n("world.import.failed", e.getClass().getName() + ": " + e.getLocalizedMessage()));
                                 }).start();
@@ -91,4 +130,36 @@ public class WorldListPage extends ListPage<WorldListItem> {
                     Controllers.dialog(i18n("world.import.invalid"));
                 }).start();
     }
+
+    public boolean isShowAll() {
+        return showAll.get();
+    }
+
+    public BooleanProperty showAllProperty() {
+        return showAll;
+    }
+
+    public void setShowAll(boolean showAll) {
+        this.showAll.set(showAll);
+    }
+
+    private class WorldListPageSkin extends ToolbarListPageSkin<WorldListPage> {
+
+        WorldListPageSkin() {
+            super(WorldListPage.this);
+        }
+
+        @Override
+        protected List<Node> initializeToolbar(WorldListPage skinnable) {
+            JFXCheckBox chkShowAll = new JFXCheckBox();
+            chkShowAll.getStyleClass().add("jfx-tool-bar-checkbox");
+            chkShowAll.textFillProperty().bind(Theme.foregroundFillBinding());
+            chkShowAll.setText(i18n("world.show_all"));
+            chkShowAll.selectedProperty().bindBidirectional(skinnable.showAllProperty());
+
+            return Arrays.asList(chkShowAll,
+                    createToolbarButton(i18n("button.refresh"), SVG::refresh, skinnable::refresh),
+                    createToolbarButton(i18n("world.add"), SVG::plus, skinnable::add));
+        }
+    }
 }

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

@@ -33,7 +33,7 @@ public interface AbstractWizardDisplayer extends WizardDisplayer {
 
     @Override
     default void handleTask(Map<String, Object> settings, Task<?> task) {
-        TaskExecutor executor = task.withRun(Schedulers.javafx(), this::navigateToSuccess).executor();
+        TaskExecutor executor = task.withRunAsync(Schedulers.javafx(), this::navigateToSuccess).executor();
         TaskListPane pane = new TaskListPane();
         pane.setExecutor(executor);
         navigateTo(pane, Navigation.NavigationDirection.FINISH);

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

@@ -17,7 +17,6 @@
  */
 package org.jackhuang.hmcl.ui.wizard;
 
-import com.jfoenix.utils.JFXUtilities;
 import javafx.beans.property.StringProperty;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
@@ -30,6 +29,7 @@ import org.jackhuang.hmcl.util.StringUtils;
 
 import java.util.Map;
 
+import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public interface TaskExecutorDialogWizardDisplayer extends AbstractWizardDisplayer {
@@ -59,12 +59,11 @@ public interface TaskExecutorDialogWizardDisplayer extends AbstractWizardDisplay
                 pane.setSubtitle((String) subtitle);
         }
 
-        JFXUtilities.runInFX(() -> {
+        runInFX(() -> {
             TaskExecutor executor = task.executor(new TaskListener() {
                 @Override
                 public void onStop(boolean success, TaskExecutor executor) {
-                    JFXUtilities.runInFX(() -> {
-                        pane.fireEvent(new DialogCloseEvent());
+                    runInFX(() -> {
                         if (success) {
                             if (settings.containsKey("success_message") && settings.get("success_message") instanceof String)
                                 Controllers.dialog((String) settings.get("success_message"), null, MessageType.FINE, () -> onEnd());

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

@@ -83,7 +83,12 @@ 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);
+            if (provider.cancelIfCannotGoBack()) {
+                onCancel();
+                return;
+            } else {
+                throw new IllegalStateException("Cannot go backward since this is the back page. Pages: " + pages);
+            }
         }
 
         Node page = pages.pop();

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

@@ -26,6 +26,9 @@ public interface WizardProvider {
     Object finish(Map<String, Object> settings);
     Node createPage(WizardController controller, int step, Map<String, Object> settings);
     boolean cancel();
+    default boolean cancelIfCannotGoBack() {
+        return false;
+    }
 
     interface FailureCallback {
         void onFail(Map<String, Object> settings, Exception exception, Runnable next);

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

@@ -70,6 +70,10 @@ public final class IntegrityChecker {
             for (ZipEntry entry : zip.stream().toArray(ZipEntry[]::new)) {
                 String filename = entry.getName();
                 try (InputStream in = zip.getInputStream(entry)) {
+                    if (in == null) {
+                        throw new IOException("entry is null");
+                    }
+
                     if (SIGNATURE_FILE.equals(filename)) {
                         signature = IOUtils.readFullyAsByteArray(in);
                     } else {

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

@@ -26,6 +26,7 @@ import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.UpgradeDialog;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
@@ -37,10 +38,7 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -91,41 +89,42 @@ public final class UpdateHandler {
     public static void updateFrom(RemoteVersion version) {
         checkFxUserThread();
 
-        Path downloaded;
-        try {
-            downloaded = Files.createTempFile("hmcl-update-", ".jar");
-        } catch (IOException e) {
-            LOG.log(Level.WARNING, "Failed to create temp file", e);
-            return;
-        }
+        Controllers.dialog(new UpgradeDialog(() -> {
+            Path downloaded;
+            try {
+                downloaded = Files.createTempFile("hmcl-update-", ".jar");
+            } catch (IOException e) {
+                LOG.log(Level.WARNING, "Failed to create temp file", e);
+                return;
+            }
 
-        Task<?> task = new HMCLDownloadTask(version, downloaded);
+            Task<?> task = new HMCLDownloadTask(version, downloaded);
 
-        TaskExecutor executor = task.executor();
-        Controllers.taskDialog(executor, i18n("message.downloading"));
-        thread(() -> {
-            boolean success = executor.test();
+            TaskExecutor executor = task.executor();
+            Controllers.taskDialog(executor, i18n("message.downloading"));
+            thread(() -> {
+                boolean success = executor.test();
 
-            if (success) {
-                try {
-                    if (!IntegrityChecker.isSelfVerified()) {
-                        throw new IOException("Current JAR is not verified");
+                if (success) {
+                    try {
+                        if (!IntegrityChecker.isSelfVerified()) {
+                            throw new IOException("Current JAR is not verified");
+                        }
+
+                        requestUpdate(downloaded, getCurrentLocation());
+                        System.exit(0);
+                    } catch (IOException e) {
+                        LOG.log(Level.WARNING, "Failed to update to " + version, e);
+                        Platform.runLater(() -> Controllers.dialog(StringUtils.getStackTrace(e), i18n("update.failed"), MessageType.ERROR));
                     }
 
-                    requestUpdate(downloaded, getCurrentLocation());
-                    System.exit(0);
-                } catch (IOException e) {
+                } else {
+                    Exception e = executor.getException();
                     LOG.log(Level.WARNING, "Failed to update to " + version, e);
-                    Platform.runLater(() -> Controllers.dialog(StringUtils.getStackTrace(e), i18n("update.failed"), MessageType.ERROR));
-                    return;
+                    Platform.runLater(() -> Controllers.dialog(e.toString(), i18n("update.failed"), MessageType.ERROR));
                 }
-
-            } else {
-                Exception e = executor.getException();
-                LOG.log(Level.WARNING, "Failed to update to " + version, e);
-                Platform.runLater(() -> Controllers.dialog(e.toString(), i18n("update.failed"), MessageType.ERROR));
-            }
-        });
+            });
+        }));
     }
 
     private static void applyUpdate(Path target) throws IOException {
@@ -159,9 +158,7 @@ public final class UpdateHandler {
         commandline.add(JavaVersion.fromCurrentEnvironment().getBinary().toString());
         commandline.add("-jar");
         commandline.add(jar.toAbsolutePath().toString());
-        for (String arg : appArgs) {
-            commandline.add(arg);
-        }
+        commandline.addAll(Arrays.asList(appArgs));
         LOG.info("Starting process: " + commandline);
         new ProcessBuilder(commandline)
                 .directory(Paths.get("").toAbsolutePath().toFile())
@@ -204,11 +201,7 @@ public final class UpdateHandler {
             StackTraceElement element = stacktrace[i];
             if (Main.class.getName().equals(element.getClassName())) {
                 // we've reached the main method
-                if (i + 1 == stacktrace.length) {
-                    return false;
-                } else {
-                    return true;
-                }
+                return i + 1 != stacktrace.length;
             }
         }
         return false;

HMCL/src/main/java/org/jackhuang/hmcl/util/CrashReporter.java

@@ -20,7 +20,6 @@ package org.jackhuang.hmcl.util;
 import javafx.application.Platform;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
-
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.ui.CrashWindow;
 import org.jackhuang.hmcl.upgrade.IntegrityChecker;
@@ -52,9 +51,11 @@ public class CrashReporter implements Thread.UncaughtExceptionHandler {
             put("Location is not set", i18n("crash.NoClassDefFound"));
             put("UnsatisfiedLinkError", i18n("crash.user_fault"));
             put("java.lang.NoClassDefFoundError", i18n("crash.NoClassDefFound"));
+            put("org.jackhuang.hmcl.util.ResourceNotFoundError", i18n("crash.NoClassDefFound"));
             put("java.lang.VerifyError", i18n("crash.NoClassDefFound"));
             put("java.lang.NoSuchMethodError", i18n("crash.NoClassDefFound"));
             put("java.lang.NoSuchFieldError", i18n("crash.NoClassDefFound"));
+            put("javax.imageio.IIOException", i18n("crash.NoClassDefFound"));
             put("netscape.javascript.JSException", i18n("crash.NoClassDefFound"));
             put("java.lang.IncompatibleClassChangeError", i18n("crash.NoClassDefFound"));
             put("java.lang.ClassFormatError", i18n("crash.NoClassDefFound"));
@@ -86,6 +87,12 @@ public class CrashReporter implements Thread.UncaughtExceptionHandler {
 
     private static Set<String> CAUGHT_EXCEPTIONS = newSetFromMap(new ConcurrentHashMap<>());
 
+    private final boolean showCrashWindow;
+
+    public CrashReporter(boolean showCrashWindow) {
+        this.showCrashWindow = showCrashWindow;
+    }
+
     @Override
     public void uncaughtException(Thread t, Throwable e) {
         LOG.log(Level.SEVERE, "Uncaught exception in thread " + t.getName(), e);
@@ -116,7 +123,9 @@ public class CrashReporter implements Thread.UncaughtExceptionHandler {
             LOG.log(Level.SEVERE, text);
 
             if (checkThrowable(e)) {
-                Platform.runLater(() -> new CrashWindow(text).show());
+                if (showCrashWindow) {
+                    Platform.runLater(() -> new CrashWindow(text).show());
+                }
                 if (!UpdateChecker.isOutdated() && IntegrityChecker.isSelfVerified()) {
                     reportToServer(text);
                 }

HMCL/src/main/java/org/jackhuang/hmcl/util/ResourceNotFoundError.java

@@ -0,0 +1,41 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.util;
+
+import java.io.InputStream;
+
+/**
+ * Suppress the throwable when we make sure the resource cannot miss.
+ * @see CrashReporter
+ */
+public class ResourceNotFoundError extends Error {
+    public ResourceNotFoundError(String message) {
+        super(message);
+    }
+
+    public ResourceNotFoundError(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public static InputStream getResourceAsStream(String url) {
+        InputStream stream = ResourceNotFoundError.class.getResourceAsStream(url);
+        if (stream == null)
+            throw new ResourceNotFoundError("Resource not found: " + url);
+        return stream;
+    }
+}

HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/I18n.java

@@ -57,4 +57,12 @@ public final class I18n {
         }
     }
 
+    public static boolean hasKey(String key) {
+        try {
+            getResourceBundle().getString(key);
+            return true;
+        } catch (MissingResourceException e) {
+            return false;
+        }
+    }
 }

HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/Locales.java

@@ -47,16 +47,16 @@ public final class Locales {
     public static final SupportedLocale ZH_CN = new SupportedLocale(Locale.SIMPLIFIED_CHINESE);
 
     /**
-     * Vietnamese
+     * Spanish
      */
-    public static final SupportedLocale VI = new SupportedLocale(new Locale("vi"));
+    public static final SupportedLocale ES = new SupportedLocale(new Locale("es"));
 
     /**
      * Russian
      */
     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, ZH, ES, RU);
 
     public static SupportedLocale getLocaleByName(String name) {
         if (name == null) return DEFAULT;
@@ -64,7 +64,7 @@ public final class Locales {
             case "en": return EN;
             case "zh": return ZH;
             case "zh_cn": return ZH_CN;
-            case "vi": return VI;
+            case "es": return ES;
             case "ru": return RU;
             default: return DEFAULT;
         }
@@ -74,7 +74,7 @@ public final class Locales {
         if (locale == EN) return "en";
         else if (locale == ZH) return "zh";
         else if (locale == ZH_CN) return "zh_CN";
-        else if (locale == VI) return "vi";
+        else if (locale == ES) return "es";
         else if (locale == RU) return "ru";
         else if (locale == DEFAULT) return "def";
         else throw new IllegalArgumentException("Unknown locale: " + locale);

HMCL/src/main/resources/assets/css/root.css

@@ -57,8 +57,11 @@
     -fx-text-fill: -fx-base-text-fill;
 }
 
-.rippler-container= .label {
-    -fx-text-fill: white;
+.notice-pane > .label {
+    -fx-text-fill: #0079FF;
+    -fx-font-size: 20;
+    -fx-wrap-text: true;
+    -fx-text-alignment: CENTER;
 }
 
 .class-title {
@@ -379,6 +382,8 @@
     -fx-pref-height: 42;
     -fx-padding: 2 2 2 2;
     -fx-background-color: -fx-base-check-color;
+    -fx-alignment: CENTER-LEFT;
+    -fx-spacing: 8;
 }
 
 .jfx-tool-bar-second .jfx-rippler {
@@ -521,6 +526,12 @@
     -fx-background-color: -fx-base-color;
 }
 
+.jfx-button-raised .jfx-rippler {
+    -jfx-rippler-fill: white;
+    -jfx-mask-type: CIRCLE;
+    -fx-padding: 0.0;
+}
+
 .jfx-button-raised, .jfx-button-raised * {
     -fx-text-fill: -fx-base-text-fill;
     -fx-font-size: 14px;
@@ -992,7 +1003,8 @@
 }
 
 .jfx-decorator-title {
-    -fx-text-fill: -fx-base-text-fill; -fx-font-size: 15;
+    -fx-text-fill: -fx-base-text-fill;
+    -fx-font-size: 15;
 }
 
 .resize-border {
@@ -1010,7 +1022,7 @@
 }
 
 .white-background {
-    -fx-background-color: rgba(255, 255, 255);
+    -fx-background-color: rgb(255, 255, 255);
 }
 
 /*******************************************************************************
@@ -1019,6 +1031,12 @@
 *                                                                              *
 *******************************************************************************/
 
+.no-header .column-header-background {
+    -fx-max-height: 0;
+    -fx-pref-height: 0;
+    -fx-min-height: 0;
+}
+
 .tree-table-view {
     -fx-tree-table-color: rgba(82, 100, 174, 0.4);
     -fx-tree-table-rippler-color: rgba(82, 100, 174, 0.6);
@@ -1069,7 +1087,7 @@
 
 .tree-table-view .tree-table-cell {
     -fx-border-width: 0 0 0 0;
-    -fx-padding: 8 0 8 0;
+    -fx-padding: 0 0 0 0;
     /*-fx-alignment: top-center;*/
 }
 
@@ -1115,7 +1133,7 @@
 }
 
 .tree-table-row-group {
-    -fx-background-color: rgba(230, 230, 230);
+    -fx-background-color: rgb(230, 230, 230);
 }
 
 .tree-table-view .menu-item:focused {

HMCL/src/main/resources/assets/fxml/authlib-injector-server-add.fxml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.String?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import com.jfoenix.controls.*?>

HMCL/src/main/resources/assets/fxml/authlib-injector-servers.fxml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import com.jfoenix.controls.*?>
-
-<fx:root xmlns="http://javafx.com/javafx"
-         xmlns:fx="http://javafx.com/fxml"
-         type="StackPane">
-    <StackPane fx:id="contentPane">
-        <ScrollPane fx:id="scrollPane" fitToWidth="true" fitToHeight="true">
-            <VBox fx:id="listPane" spacing="10" style="-fx-padding: 20 20 70 20;">
-
-            </VBox>
-        </ScrollPane>
-        <VBox style="-fx-padding: 15;" spacing="15" pickOnBounds="false" alignment="BOTTOM_RIGHT">
-            <JFXButton prefWidth="40" prefHeight="40" buttonType="RAISED" onMouseClicked="#onAdd" styleClass="jfx-button-raised-round">
-                <graphic>
-                    <fx:include source="/assets/svg/plus.fxml"/>
-                </graphic>
-            </JFXButton>
-        </VBox>
-    </StackPane>
-</fx:root>

HMCL/src/main/resources/assets/fxml/download/additional-installers.fxml

@@ -15,11 +15,23 @@
         </top>
         <center>
             <VBox fx:id="list" styleClass="jfx-list-view" maxHeight="150" maxWidth="300">
+                <JFXButton fx:id="btnFabric" prefWidth="${list.width}">
+                    <graphic>
+                        <BorderPane mouseTransparent="true">
+                            <left>
+                                <Label fx:id="lblFabric"/>
+                            </left>
+                            <right>
+                                <fx:include source="/assets/svg/arrow-right.fxml"/>
+                            </right>
+                        </BorderPane>
+                    </graphic>
+                </JFXButton>
                 <JFXButton fx:id="btnForge" prefWidth="${list.width}">
                     <graphic>
                         <BorderPane mouseTransparent="true">
                             <left>
-                                <Label fx:id="lblForge">Install Forge</Label>
+                                <Label fx:id="lblForge"/>
                             </left>
                             <right>
                                 <fx:include source="/assets/svg/arrow-right.fxml"/>
@@ -31,7 +43,7 @@
                     <graphic>
                         <BorderPane mouseTransparent="true">
                             <left>
-                                <Label fx:id="lblLiteLoader">Install LiteLoader</Label>
+                                <Label fx:id="lblLiteLoader"/>
                             </left>
                             <right>
                                 <fx:include source="/assets/svg/arrow-right.fxml"/>
@@ -43,7 +55,7 @@
                     <graphic>
                         <BorderPane mouseTransparent="true">
                             <left>
-                                <Label fx:id="lblOptiFine">Install OptiFine</Label>
+                                <Label fx:id="lblOptiFine"/>
                             </left>
                             <right>
                                 <fx:include source="/assets/svg/arrow-right.fxml"/>

HMCL/src/main/resources/assets/fxml/download/installers.fxml

@@ -15,11 +15,23 @@
         </top>
         <center>
             <VBox fx:id="list" styleClass="jfx-list-view" maxHeight="150" maxWidth="300">
+                <JFXButton fx:id="btnFabric" prefWidth="${list.width}">
+                    <graphic>
+                        <BorderPane mouseTransparent="true">
+                            <left>
+                                <Label fx:id="lblFabric"/>
+                            </left>
+                            <right>
+                                <fx:include source="/assets/svg/arrow-right.fxml"/>
+                            </right>
+                        </BorderPane>
+                    </graphic>
+                </JFXButton>
                 <JFXButton fx:id="btnForge" prefWidth="${list.width}">
                     <graphic>
                         <BorderPane mouseTransparent="true">
                             <left>
-                                <Label fx:id="lblForge">Install Forge</Label>
+                                <Label fx:id="lblForge"/>
                             </left>
                             <right>
                                 <fx:include source="/assets/svg/arrow-right.fxml"/>
@@ -31,7 +43,7 @@
                     <graphic>
                         <BorderPane mouseTransparent="true">
                             <left>
-                                <Label fx:id="lblLiteLoader">Install LiteLoader</Label>
+                                <Label fx:id="lblLiteLoader"/>
                             </left>
                             <right>
                                 <fx:include source="/assets/svg/arrow-right.fxml"/>
@@ -43,7 +55,7 @@
                     <graphic>
                         <BorderPane mouseTransparent="true">
                             <left>
-                                <Label fx:id="lblOptiFine">Install OptiFine</Label>
+                                <Label fx:id="lblOptiFine"/>
                             </left>
                             <right>
                                 <fx:include source="/assets/svg/arrow-right.fxml"/>

HMCL/src/main/resources/assets/fxml/download/versions.fxml

@@ -24,11 +24,11 @@
                 <JFXListView fx:id="list" styleClass="jfx-list-view" VBox.vgrow="ALWAYS">
                 </JFXListView>
             </VBox>
-            <StackPane fx:id="failedPane">
-                <Label onMouseClicked="#onRefresh" style="-fx-text-fill: #0079FF; -fx-font-size: 20;" text="%download.failed.refresh" />
+            <StackPane fx:id="failedPane" styleClass="notice-pane">
+                <Label onMouseClicked="#onRefresh" text="%download.failed.refresh" />
             </StackPane>
-            <StackPane fx:id="emptyPane">
-                <Label onMouseClicked="#onBack" style="-fx-text-fill: #0079FF; -fx-font-size: 20;" text="%download.failed.empty" />
+            <StackPane fx:id="emptyPane" styleClass="notice-pane">
+                <Label onMouseClicked="#onBack" text="%download.failed.empty" />
             </StackPane>
         </StackPane>
     </center>

HMCL/src/main/resources/assets/fxml/modpack/selection.fxml

@@ -17,7 +17,7 @@
         <bottom>
             <HBox alignment="CENTER_RIGHT" style="-fx-padding: 16 16 16 0;">
                 <JFXButton fx:id="btnNext" onMouseClicked="#onNext" prefWidth="100" prefHeight="40" buttonType="RAISED"
-                           text="%wizard.finish" styleClass="jfx-button-raised"/>
+                           text="%wizard.next" styleClass="jfx-button-raised"/>
             </HBox>
         </bottom>
     </BorderPane>

HMCL/src/main/resources/assets/fxml/modpack/type.fxml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import com.jfoenix.controls.*?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import org.jackhuang.hmcl.ui.construct.TwoLineListItem?>
+<fx:root xmlns="http://javafx.com/javafx"
+         xmlns:fx="http://javafx.com/fxml"
+         type="StackPane">
+    <fx:define>
+        <Insets fx:id="insets" topRightBottomLeft="8" />
+    </fx:define>
+    <VBox fx:id="list" styleClass="jfx-list-view" maxHeight="150" maxWidth="300">
+        <Label padding="${insets}" text="%modpack.export.as" />
+        <JFXButton fx:id="btnHMCL" prefWidth="${list.width}">
+            <graphic>
+                <BorderPane mouseTransparent="true">
+                    <left>
+                        <TwoLineListItem title="%modpack.type.hmcl" subtitle="%modpack.type.hmcl.export" />
+                    </left>
+                    <right>
+                        <fx:include BorderPane.alignment="CENTER" source="/assets/svg/arrow-right.fxml"/>
+                    </right>
+                </BorderPane>
+            </graphic>
+        </JFXButton>
+        <JFXButton fx:id="btnMultiMC" prefWidth="${list.width}">
+            <graphic>
+                <BorderPane mouseTransparent="true">
+                    <left>
+                        <TwoLineListItem title="%modpack.type.multimc" subtitle="%modpack.type.multimc.export" />
+                    </left>
+                    <right>
+                        <fx:include BorderPane.alignment="CENTER" source="/assets/svg/arrow-right.fxml"/>
+                    </right>
+                </BorderPane>
+            </graphic>
+        </JFXButton>
+    </VBox>
+</fx:root>

HMCL/src/main/resources/assets/fxml/version/version-settings.fxml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import com.jfoenix.controls.*?>
-<?import javafx.collections.FXCollections?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.image.Image?>

HMCL/src/main/resources/assets/lang/I18N.properties

@@ -37,19 +37,19 @@ account.choose=Choose a character
 account.create=Create a new account
 account.email=Email
 account.failed.character_deleted=The character has been deleted.
-account.failed.connect_authentication_server=Cannot connect to the authentication server. Check your network.
+account.failed.connect_authentication_server=Cannot connect to the authentication server. Check your internet connection.
 account.failed.connect_injector_server=Cannot connect to the authentication server. Check your network and ensure the URL is correct.
-account.failed.injector_download_failure=Failed to download authlib-injector. Check your network and try switching to another download source.
+account.failed.injector_download_failure=Failed to download authlib-injector. Check your network and try switching to a different download source.
 account.failed.invalid_credentials=Incorrect password, or you are forbidden to login temporarily.
 account.failed.invalid_password=Invalid password
-account.failed.invalid_token=Please log out and re-input your password to login.
+account.failed.invalid_token=Please log out and re-enter your password to login.
 account.failed.no_character=No character in this account.
-account.failed.server_response_malformed=Invalid server response. The authentication server may have a failure.
+account.failed.server_response_malformed=Invalid server response. The authentication server may have an error.
 account.injector.add=Add an authentication server
-account.injector.empty=Empty (Click the plus button right to add)
+account.injector.empty=Empty (Click the plus button on the right to add)
 account.injector.manage=Manage authentication servers
 account.injector.manage.title=Authentication servers
-account.injector.http=Warning: This server is using HTTP, which will cause your password be transmitted in clear text.
+account.injector.http=Warning: This server uses HTTP so your password will be transmitted in clear text.
 account.injector.link.register=Register
 account.injector.server=Auth Server
 account.injector.server_url=Server URL
@@ -66,11 +66,11 @@ account.username=Name
 
 archive.author=Authors
 archive.game_version=Game
-archive.name=Name
+archive.name=Nickname
 archive.version=Version
 
-assets.download=Download assets
-assets.download_all=Check the integrity of assets
+assets.download=Downloading assets
+assets.download_all=Asset Integrity Check
 
 button.cancel=Cancel
 button.clear=Clear
@@ -87,15 +87,16 @@ button.yes=Yes
 color.recent=Recommended
 color.custom=Custom Color
 
-crash.NoClassDefFound=Please check "HMCL" software is complete.
-crash.user_fault=Your OS or Java environment may not be properly installed resulting in crashing of this software, please check your Java Environment or your computer!
+crash.NoClassDefFound=Please verify that the "Hello Minecraft! Launcher" software is not corrupted.
+crash.user_fault=Your OS or Java environment may not be properly installed which may result in a crash, please check your Java Runtime Environment or your computer!
 
 download=Download
+download.code.404=File not found on the remote server
 download.failed=Failed to download
 download.failed.empty=No candidates. Click here to return.
-download.failed.refresh=Unable to load version list. Click here to retry.
+download.failed.refresh=Unable to download version list. Click here to retry.
 download.provider.bmclapi=BMCLAPI (bangbang93, https://bmclapi2.bangbang93.com/)
-download.provider.mojang=Mojang
+download.provider.mojang=Mojang (Forge and OptiFine installation are downloaded from BMCLAPI)
 
 extension.bat=Windows Bat file
 extension.mod=Mod file
@@ -103,10 +104,10 @@ extension.png=Image file
 extension.sh=Bash shell
 
 fatal.missing_javafx=JavaFX is missing.\nIf you are using Java 11 or later, please downgrade to Java 8 or 10.\nIf you are using OpenJDK, please ensure OpenJFX is included.
-fatal.missing_dst_root_ca_x3=The DST Root CA X3 certificate is missing on the current Java platform.\nYou can still use HMCL, but HMCL will be unable to connect to some sites (such as sites that use certificates issued by Let's Encrypt), which may cause HMCL not to function properly.\nPlease upgrade your Java to 8u101 or later to resolve the problem.
-fatal.config_loading_failure=The configuration is not accessible.\nPlease ensure HMCL has read and write access to "%s" and the files in it.
-fatal.migration_requires_manual_reboot=The upgrade is about to be completed. Please reopen HMCL.
-fatal.apply_update_failure=We're sorry that HMCL couldn't finish the upgrade because something went wrong.\nBut you can still manually finish the upgrade by downloading HMCL from %s.\nPlease consider reporting this issue to us.
+fatal.missing_dst_root_ca_x3=The DST Root CA X3 certificate is missing on the current Java platform.\nYou can still use Hello Minecraft! Launcher, but it will be unable to connect to some sites (such as sites that use certificates issued by Let's Encrypt), which may cause the launcher not to function properly.\nPlease upgrade your Java Runtime to 8u101 or later to resolve the problem.
+fatal.config_loading_failure=The configuration is not accessible.\nPlease ensure Hello Minecraft! Launcher has read and write access to "%s" and the files in it.
+fatal.migration_requires_manual_reboot=The update is complete. Please reopen Hello Minecraft! Launcher.
+fatal.apply_update_failure=We're sorry, Hello Minecraft! Launcher couldn't finish the upgrade because something went wrong.\nBut you can still manually finish the upgrade by downloading Hello Minecraft! Launcher from %s.\nPlease consider reporting this issue to us.
 
 folder.config=Configs
 folder.game=Game Directory
@@ -116,71 +117,84 @@ folder.saves=Saves
 folder.screenshots=Screenshots
 
 help=Documentations
-help.detail=For datapacks, modpacks, etc. makers.
+help.detail=For manufacturers of datapacks, modpacks, etc.
 
-input.email=The username must be an e-mail.
+input.email=Username must be an email.
 input.number=Must be a number.
 input.not_empty=Required field
 input.url=Must be a valid URL.
 
 install=Install New Game
-install.failed=Failed to install
+install.change_version=Change version
+install.change_version.confirm=Are you sure you want to upgrade %s from verison %s to %s?
+install.failed=Version failed to install
 install.failed.downloading=Failed to install due to some files not downloaded successfully
 install.failed.downloading.detail=Failed to download file: %s
+install.failed.downloading.timeout=Timed out while downloading the file: %s
+install.failed.install_online=Unable to recognize the provided installer file
+install.failed.optifine_conflict=Fabric, OptiFine and Forge are installed simultaneously on Minecraft 1.13
+install.failed.version_mismatch=The library requires the game version %s, but the actual version is %s.
 install.installer.choose=Choose a %s version
+install.installer.fabric=Fabric
 install.installer.forge=Forge
 install.installer.game=Game
-install.installer.install=
+install.installer.install=Install %s
+install.installer.install_offline=Install/Upgrade from file
+install.installer.install_offline.extension=Forge/OptiFine installer
+install.installer.install_offline.tooltip=Supports import of Forge/OptiFine installation files
+install.installer.install_online=Install Online
+install.installer.install_online.tooltip=Support installation of Fabric, Forge, OptiFine, LiteLoader.
 install.installer.liteloader=LiteLoader
 install.installer.not_installed=%s not Installed
 install.installer.optifine=OptiFine
 install.installer.version=%s Version
 install.modpack=Install a modpack
 install.new_game=Install a New Game
-install.new_game.already_exists=This version has already been existing.
+install.new_game.already_exists=This version already exists.
 install.new_game.current_game_version=Current Game Version
+install.new_game.malformed=Invalid name
 install.select=Select an operation
-install.success=Installed successfully
+install.success=successfully installed 
 
 lang=English
 lang.default=Use system language
 
-launch.advice.corrected=We have already corrected JVM selection and game can be launched now. If you do want to keep your JVM choice, you can turn off the Java VM checker in game settings.
-launch.advice.uncorrected=If you are sure that game can be launched normally, you can turn off the Java VM checker in game settings.
+launch.advice.corrected=We have already fixed the JVM selection. If you want to keep your choice of Java version, you can disable the Java VM check in game settings.
+launch.advice.uncorrected=If you are sure that the game can be started normally, you can disable the Java VM check in game settings.
 launch.advice.different_platform=Your OS is 64-Bit but your Java is 32-Bit. The 64-Bit Java is recommended.
-launch.advice.forge2760_liteloader=Forge 2760 and above is not compatible with LiteLoader, please consider upgrade Forge to 2773 or later.
-launch.advice.java8_1_13=Minecraft 1.13 and later versions can only run on Java 8 or later.
-launch.advice.java8_51_1_13=Minecraft 1.13 may crash on Java 8 earlier than 1.8.0_51. You are supposed to install the latest version of Java 8.
-launch.advice.java9=You cannot launch Minecraft until game version is higher than 1.13 with Java 9 or later Java versions.
-launch.advice.newer_java=Java 8 is suggested, which can make game run more fluently. And many mods and Minecraft 1.12 and newer versions requires Java 8.
-launch.advice.not_enough_space=You have allocated too much memory, because the physical memory size is %dMB, your game probably crash. The launcher will try to launch it.
-launch.advice.too_large_memory_for_32bit=You have allocated too much memory, because of your 32-Bit Java Runtime Environment, your game probably crash. The maximum memory is 1024MB. The launcher will try to launch it.
+launch.advice.forge2760_liteloader=Forge 2760 and higher are not compatible with LiteLoader, please consider upgrading Forge to 2773 or later.
+launch.advice.java8_1_13=Minecraft 1.13 and later can only run on Java 8 or later.
+launch.advice.java8_51_1_13=Minecraft 1.13 may crash on Java 8 earlier than 1.8.0_51. Please install the latest version of Java 8.
+launch.advice.java9=You cannot launch Minecraft 1.12 oer earlier with Java 9 or later versions of Java.
+launch.advice.newer_java=Java 8 is recommended to make the game faster. For many Minecraft 1.12 of higher, and most mods, Java 8 is required.
+launch.advice.not_enough_space=You have allocated too much memory, because the physical memory size is %dMB, your game may crash. The launcher attempt to launch.
+launch.advice.too_large_memory_for_32bit=You have allocated too much memory, because of your 32-Bit Java Runtime Environment, your game may crash. The maximum memory capacity for 32 bit systems is is 1024MB. The launcher will attempt to launch.
 launch.failed=Unable to launch
-launch.failed.cannot_create_jvm=Java virtual machine cannot be created. Java arguments may have problems. You can enable the no args mode in the settings.
-launch.failed.creating_process=Failed to create process, maybe your java path is wrong, please modify your java path.
+launch.failed.cannot_create_jvm=Java virtual machine could not be created. Java arguments may cause issues. Please restart without JVM arguments.
+launch.failed.creating_process=Failed to create process. Check your Java path.
 launch.failed.decompressing_natives=Unable to decompress native libraries.
 launch.failed.download_library=Unable to download library %s.
 launch.failed.executable_permission=Unable to add permission to the launch script
-launch.failed.exited_abnormally=Game exited abnormally, please visit the log, or ask someone for help.
+launch.failed.exited_abnormally=Game exited abnormally, please check the log, or ask someone for help.
 launch.state.dependencies=Dependencies
 launch.state.done=Done
 launch.state.logging_in=Logging In
-launch.state.modpack=Preparing for modpack
-launch.state.waiting_launching=Waiting for game launching
-launch.wrong_javadir=Incorrect Java directory, will reset to default Java directory.
+launch.state.modpack=Loading modpack
+launch.state.waiting_launching=Launcing modpack
+launch.wrong_javadir=Invalid Java directory, default Java path will be applied.
 
 launcher=Launcher
 launcher.background=Background Image
-launcher.background.choose=Choose background path.
-launcher.background.default=Default
-launcher.cache_directory=Download Cache Directory
-launcher.cache_directory.choose=Choose download cache directory
-launcher.cache_directory.default=Default
+launcher.background.choose=Choose a background image file
+launcher.background.default=Standard
+launcher.cache_directory=Directory for caching
+launcher.cache_directory.choose=Choose the directory for caching
+launcher.cache_directory.default=Standard
 launcher.cache_directory.disabled=Disabled
-launcher.cache_directory.invalid=Invalid cache directory. Restore default settings.
+launcher.cache_directory.invalid=Invalid directory. Restoring default settings.
 launcher.contact=Contact Us
 launcher.crash=Hello Minecraft! Launcher has crashed!
-launcher.crash_out_dated=Hello Minecraft! Launcher has crashed! Your launcher is outdated. Update it!
+launcher.crash_out_dated=Hello Minecraft! Launcher has crashed! Your launcher is outdated. Please updater your launcher!
 launcher.update_java=Please upgrade your Java.
 
 login.empty_username=You have not set a username!
@@ -197,15 +211,16 @@ message.doing=Please wait
 message.downloading=Downloading...
 message.error=Error
 message.info=Info
-message.success=Tasks succeeded
+message.success=Job completed successfully
 message.unknown=Unknown
 message.warning=Warning
 
-modpack=Mod pack
-modpack.choose=Choose a modpack zip file which you want to install.
-modpack.desc=Describe your modpack, including precautions, changlog, supporting Markdown(also supporting online pictures).
-modpack.enter_name=Enter your desired name for this game.
+modpack=Modpack
+modpack.choose=Choose a modpack zip.
+modpack.desc=Describe your modpack, including precautions and changelog.  Markdown and online pictures are supported.
+modpack.enter_name=Enter a name for this modpack.
 modpack.export=Export Modpack
+modpack.export.as=Export Modpack As...
 modpack.files.blueprints=BuildCraft blueprints
 modpack.files.config=Mod configs
 modpack.files.dumps=NEI debug output
@@ -214,81 +229,87 @@ modpack.files.mods=Mods
 modpack.files.mods.voxelmods=VoxelMods (including VoxelMap) options
 modpack.files.options_txt=Game options
 modpack.files.optionsshaders_txt=Shaders options
-modpack.files.resourcepacks=Resource(Texture) packs
+modpack.files.resourcepacks=Resource/Texture packs
 modpack.files.saves=Saved games
 modpack.files.scripts=MineTweaker configuration
-modpack.files.servers_dat=Multiplayer servers list
+modpack.files.servers_dat=Server list
 modpack.install=Install %s modpack
 modpack.installing=Installing modpack
-modpack.introduction=Curse, MultiMC, HMCL modpacks supprted.
+modpack.introduction=Curse, MultiMC, HMCL modpacks are supprted.
 modpack.invalid=Invalid modpack file.
-modpack.mismatched_type=Mismatched modpack type, your current game is %s modpack, but your update file is %s modpack.
+modpack.mismatched_type=Inappropriate modpack type, your current game is a %s modpack, but your update file is a %s modpack.
 modpack.name=Modpack Name
-modpack.not_a_valid_name=Not a valid modpack name
+modpack.not_a_valid_name=Invalid modpack name
 modpack.scan=Scanning this modpack
 modpack.task.install=Import Modpack
-modpack.task.install.error=This modpack file cannot be recognized. Only Curse, MultiMC modpacks are supported.
+modpack.task.install.error=This modpack file cannot be recognized. Only Curse and MultiMC modpacks are supported.
 modpack.task.install.will=Install the modpack:
 modpack.type.curse=Curse
-modpack.type.curse.completion=Install relative files to Curse modpack
-modpack.type.curse.tolerable_error=But we cannot complete downloading all files of this Curse modpack. You can retry downloading when launching corresponding game version. You may retry for a couple of times due to network problems.
-modpack.type.curse.error=Unable to complete this Curse modpack. Please retry.
-modpack.type.curse.not_found=Some of required resources are deleted and cannot be downloaded. Please consider the latest version or other modpacks.
-modpack.type.hmcl=HMCL
+modpack.type.curse.completion=Install files related to Curse modpack
+modpack.type.curse.tolerable_error=We cannot complete the download of all files of this Curse modpack. You can retry the download when starting corresponding game version. You may retry for a couple of times due to network problems.
+modpack.type.curse.error=Unable to install this Curse modpack. Please retry.
+modpack.type.curse.not_found=Some of required resources are missing and thus could not be downloaded. Please consider the latest version or other modpacks.
+modpack.type.hmcl=Hello Minecraft! Launcher
+modpack.type.hmcl.export=Can be imported by Hello Minecraft! Launcher
 modpack.type.multimc=MultiMC
-modpack.unsupported=Unsupported modpack, only HMCL, MultiMC, Curse modpacks are supported.
-modpack.update=Upgrading game
-modpack.wizard=Exporting the modpack wizard
+modpack.type.multimc.export=Can be imported by Hello Minecraft! Launcher and MultiMC
+modpack.unsupported=Unsupported modpack, only HMCL, MultiMC, and Curse modpacks are supported.
+modpack.update=Game Update
+modpack.wizard=Exporting modpack wizard
 modpack.wizard.step.1=Basic options
-modpack.wizard.step.1.title=Set the basic options to the modpack.
-modpack.wizard.step.2=Files selection
-modpack.wizard.step.2.title=Choose the files you want to put into the modpack.
-modpack.wizard.step.3=Description
-modpack.wizard.step.initialization.exported_version=The exported game version
+modpack.wizard.step.1.title=Set the basic options for the modpack.
+modpack.wizard.step.2=Select files
+modpack.wizard.step.2.title=Add files to the modpack.
+modpack.wizard.step.3=Modpack Type
+modpack.wizard.step.3.title=Choose the format of the modpack.
+modpack.wizard.step.initialization.exported_version=Exported game version
 modpack.wizard.step.initialization.include_launcher=Include the launcher
-modpack.wizard.step.initialization.save=Choose a path to export the game files to
-modpack.wizard.step.initialization.warning=Before making modpack, you should ensure that your game can launch successfully,\nand that your Minecraft is release, not snapshot.\nand that it is not allowed to add mods which is not allowed to distribute to the modpack.
+modpack.wizard.step.initialization.save=Export to...
+modpack.wizard.step.initialization.warning=Before creating a modpack, you should ensure that the game can launch successfully,\nand that your Minecraft is a release version.\nDo NOT add mods which cannot be redistributed.
 
 mods=Mods
-mods.add=Add mods
-mods.add.failed=Failed to add mods %s.
-mods.add.success=Successfully added mods %s.
+mods.add=Install mods
+mods.add.failed=Failed to install mods %s.
+mods.add.success=Successfully installed mods %s.
 mods.choose_mod=Choose your mods
 mods.enable=Enable
 mods.disable=Disable
 mods.name=Name
 mods.remove=Remove
+mods.not_modded=You should install a modloader first (Fabric, Forge or LiteLoader)
 
-datapack=Data packs
-datapack.add=Add data pack
-datapack.choose_datapack=Choose the datapack zip to be imported
+datapack=Datapacks
+datapack.add=Install datapack
+datapack.choose_datapack=Choose the datapack zip to import
 datapack.extension=Datapack
 datapack.title=World %s - Datapacks
 datapack.remove=Remove
 
 world=Worlds/Datapacks
+world.add=Add world(.zip)
 world.datapack=Manage data packs
 world.datapack.1_13=Only Minecraft 1.13 and later versions support data packs.
 world.description=%s. Last played time: %s. Game version: %s.
 world.export=Export this world
-world.export.title=Choose a file location to hold your world
+world.export.title=Choose a location to store your world
 world.export.location=Export to
 world.export.wizard=Export world %s
 world.extension=World zip
 world.game_version=Game Version
 world.import.already_exists=This world already exists.
-world.import.choose=Choose the save zip to be imported
+world.import.choose=Choose the zip file to import
 world.import.failed=Unable to import this world: %s
-world.import.invalid=Not a valid world zip
+world.import.invalid=Invalid world zip file
 world.name=World Name
 world.name.enter=Enter the world name
 world.reveal=Reveal in Explorer
+world.show_all=Show all
 world.time=EEE, MMM d, yyyy HH:mm:ss
 
 profile=Game Directories
-profile.already_exists=This name already exists, please consider another name.
+profile.already_exists=This name already exists, please use a different name.
 profile.default=Current directory
-profile.home=User home
+profile.home=Standard
 profile.instance_directory=Game Directory
 profile.instance_directory.choose=Choose Game Directory
 profile.manage=Game Directory List
@@ -305,11 +326,11 @@ selector.custom=Custom
 settings=Game Settings
 
 settings.advanced=Advanced Settings
-settings.advanced.dont_check_game_completeness=Don't check game completeness
-settings.advanced.dont_check_jvm_validity=Don't check whether JVM can launch the game or not 
-settings.advanced.game_dir.default=Default (.minecraft/)
-settings.advanced.game_dir.independent=Independent (.minecraft/versions/<version name>/, except assets,libraries)
-settings.advanced.java_args_default=Default java args: -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:-UseAdaptiveSizePolicy -XX:MaxPermSize=???m -Xmx???m -Dfml.ignoreInvalidMinecraftCertificates=true -Dfml.ignorePatchDiscrepancies=true
+settings.advanced.dont_check_game_completeness=Do not scan game files
+settings.advanced.dont_check_jvm_validity=Don't check whether JVM can launch the game or not
+settings.advanced.game_dir.default=Standard (.minecraft/)
+settings.advanced.game_dir.independent=Independent (.minecraft/versions/<version name>/, except for assets and libraries)
+settings.advanced.java_args_default=Stadnard java args: -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:-UseAdaptiveSizePolicy -XX:MaxPermSize=???m -Xmx???m -Dfml.ignoreInvalidMinecraftCertificates=true -Dfml.ignorePatchDiscrepancies=true
 settings.advanced.java_permanent_generation_space=PermGen Space/MB
 settings.advanced.jvm_args=Java VM Arguments
 settings.advanced.launcher_visibility.close=Close the launcher when the game launched.
@@ -319,9 +340,9 @@ settings.advanced.launcher_visibility.keep=Keep the launcher visible.
 settings.advanced.launcher_visible=Launcher Visibility
 settings.advanced.minecraft_arguments=Minecraft Arguments
 settings.advanced.no_jvm_args=No Default JVM Args
-settings.advanced.precall_command=Pre-Launch command(will be executed before game launching)
-settings.advanced.server_ip=Server Host
-settings.advanced.wrapper_launcher=Wrapper Launcher(i.e. optirun...)
+settings.advanced.precall_command=Pre-Launch command (will be executed before game starts)
+settings.advanced.server_ip=Server Address
+settings.advanced.wrapper_launcher=Wrapper Launcher (i.e. optirun...)
 
 settings.custom=Custom
 
@@ -339,9 +360,9 @@ settings.game.working_directory.choose=Choose Working Directory
 settings.icon=Game Icon
 
 settings.launcher=Settings
-settings.launcher.common_path.tooltip=This app will save all game libraries and assets here unless there are existant files in game folder.
+settings.launcher.common_path.tooltip=This app will cache all downloads here.
 settings.launcher.download_source=Download Source
-settings.launcher.enable_game_list=Display game list in main page
+settings.launcher.enable_game_list=Show version list in main page
 settings.launcher.language=Language
 settings.launcher.launcher_log.export=Export launcher logs
 settings.launcher.launcher_log.export.failed=Failed to export logs
@@ -364,16 +385,18 @@ settings.physical_memory=Physical Memory Size
 settings.show_log=Show Logs
 settings.tabs.installers=Installers
 settings.type=Version setting type
-settings.type.global=Global global settings(all shared)
+settings.type.global=Global game settings (all settings shared among games)
 settings.type.global.manage=Global Game Settings
 settings.type.global.edit=Configure global game settings
 settings.type.special.enable=Enable specialized settings for this game
 
-sponsor.bmclapi=To obtain a stable download service, please consider support BMCLAPI. Click here for more information
-sponsor.hmcl=HMCL is a free, open source Minecraft launcher the enables users to easily manage multiple, separate installations of Minecraft. We're using Afdian so that we can continue to pay for our hosting and project development. Click here for more information.
+sponsor.bmclapi=To obtain a stable download service, please consider supporting BMCLAPI. Click here for more information
+sponsor.hmcl=Hello Minecraft! Launcher is a free and open source Minecraft launcher which allows users to easily manage multiple, individual Minecraft installations. We use Afdian to continue to pay for hosting and project development. Click here for more information.
 
 update=Update
-update.channel.dev=Update to development version
+update.accept=Update
+update.changelog=Changes
+update.channel.dev=Update to beta version
 update.channel.stable=Update to stable version
 update.checking=Checking for updates
 update.failed=Failed to perform upgrade
@@ -381,39 +404,39 @@ update.found=Update Available!
 update.newest_version=Latest version: %s
 update.bubble.title=Update Available: %s
 update.bubble.subtitle=Click here to upgrade
-update.note=Development version contains more functionality and bug fixes as well as more possible bugs.
-update.latest=This is latest Version.
-update.no_browser=Cannot open any browser. The link has been copied to the clipboard. Paste it to a browser address bar to update.
+update.note=Warning: Beta versions may have more functionality and bug fixes but also more possible errors.
+update.latest=This is the latest version.
+update.no_browser=Cannot open a browser. The link has been copied to the clipboard. Paste it into the address bar of browser to update.
 update.tooltip=Update
 
 version=Games
-version.cannot_read=Unable to gather the game version. Cannot continue auto-installing.
+version.cannot_read=Unable to find the game version. Cannot continue automatic installation.
 version.empty=No game
-version.empty.add=Install game in game list
-version.empty.launch=No game to launch, please install new game via game list page.
-version.forbidden_name=Forbidden name, do not use this.
+version.empty.add=Install new version
+version.empty.launch=No version to launch, please install a version via version list page.
+version.forbidden_name=Forbidden name please do not use that name.
 version.game.old=Old
-version.game.release=Release
-version.game.snapshot=Snapshot
+version.game.release=Releases
+version.game.snapshot=Snapshots
 version.launch=Play
 version.launch.test=Test Game
-version.launch_script=Make Launching Script
+version.launch_script=Make a Launching Script
 version.launch_script.failed=Unable to make launch script.
-version.launch_script.save=Save the launch script
-version.launch_script.success=Finished script creation, %s.
-version.manage=Game List
-version.manage.clean=Clean game directory
-version.manage.clean.tooltip=Clean logs, crash-reports
-version.manage.manage=Manage Game
+version.launch_script.save=Save launch script
+version.launch_script.success=Created script %s.
+version.manage=All Versions
+version.manage.clean=Clear game directory
+version.manage.clean.tooltip=Clear logs, crash-reports
+version.manage.manage=Manage Version
 version.manage.redownload_assets_index=Update Game Asset Files
-version.manage.remove=Delete this game
-version.manage.remove.confirm=Sure to remove game %s? You cannot restore this game again!
-version.manage.remove.confirm.trash=Sure to remove game %s? You can restore the game with the name of %s in your system trash.
-version.manage.remove.confirm.independent=Since this game is in independent mode, deleting this game will result in all saved worlds belonging to this game removed simultaneously. Sure to remove game %s?
+version.manage.remove=Delete this version
+version.manage.remove.confirm=Are you sure you want to remove this version %s? You cannot restore this version again!
+version.manage.remove.confirm.trash=Are you sure you want to remove this version %s? You can restore this version with the name of %s in your system trash.
+version.manage.remove.confirm.independent=Since this version is in independent mode, deleting this version will also delete all saved worlds belonging to this version. Do you want to remove this version %s?
 version.manage.remove_libraries=Delete library files
-version.manage.rename=Rename this game
-version.manage.rename.message=Please enter the new name
-version.manage.rename.fail=Failed to rename this game.
+version.manage.rename=Rename this version
+version.manage.rename.message=Please enter the new name for this version
+version.manage.rename.fail=Failed to rename the version.
 version.settings=Settings
 version.update=Update modpack
 

HMCL/src/main/resources/assets/lang/I18N_es.properties

@@ -0,0 +1,441 @@
+#
+# Hello Minecraft! Launcher
+# Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+
+# Contributors: gitfamhub
+about.copyright=Copyright
+about.copyright.statement=Copyright (c) 2019 huangyuhui.
+about.author=Autor
+about.author.statement=huanghongxun (hmcl@huangyuhui.net)
+about.thanks_to=Gracias a
+about.thanks_to.statement=bangbang93 (BMCLAPI, https://bmclapi2.bangbang93.com/)\ngamerteam (Imagen de fondo por defecto)\nTodos los contribuidores que participaron en este proyecto via issues, pull requests, etc.
+about.dependency=Dependencias
+# Debido a espacio limitado, sólo los primeros autores son listados
+about.dependency.statement=JFoenix (Shadi Shaheen, Apache 2.0)\nGson (Google, Apache 2.0)\nApache Commons Compress (ASF, Apache 2.0)\nXZ for Java (Lasse Collin, Public Domain)\nfx-gson (Joffrey Bion, MIT)\nConstant Pool Scanner (jenkins-ci, CDDL, GPL 2)\nOpenNBT (Steveice10, BSD 3-Clause)
+about.claim=Declaración
+about.claim.statement=Minecraft es derecho de Mojang AB. No somos responsables por cualquier infracción de copyright a causa del uso de este software.
+about.open_source=Código abierto
+about.open_source.statement=GPL v3 (https://github.com/huanghongxun/HMCL/)
+
+account=Cuentas
+account.character=personaje
+account.choose=Escoge un personaje
+account.create=Crea una nueva cuenta
+account.email=Email
+account.failed.character_deleted=El personaje ha sido borrado.
+account.failed.connect_authentication_server=No se puede conectar al servidor de autenticación. Verifique su red.
+account.failed.connect_injector_server=No se puede conectar al servidor de autenticación. Verifique su red y asegúrese que la dirección esté correcta.
+account.failed.injector_download_failure=No se pudo descargar authlib-injector. Verifique su red y trate cambiando a otra fuente de descarga.
+account.failed.invalid_credentials=Contraseña incorrecta, o estás prohibido iniciar una sesión temporalmente.
+account.failed.invalid_password=Contraseña incorrecta
+account.failed.invalid_token=Por favor cierre su sesión y reescriba su contraseña para iniciar una nueva.
+account.failed.no_character=No hay personaje en esta cuenta.
+account.failed.server_response_malformed=Respuesta de servidor inválida. El servidor de autenticación puede tener fallo.
+account.injector.add=Añadir servidor de autenticación
+account.injector.empty=Vacío (clic el botón plus a la derecha para añadir)
+account.injector.manage=Gestionar servidores de autenticación
+account.injector.manage.title=Servidores de autenticación
+account.injector.http=Advertencia: Este servidor está usando HTTP, su contraseña será transmitida en lo claro.
+account.injector.link.register=Registrar
+account.injector.server=Servidor de aut.
+account.injector.server_url=URL de servidor
+account.injector.server_name=Nombre de servidor
+account.manage=Lista de cuentas
+account.methods=Tipo de inición
+account.methods.authlib_injector=authlib-injector
+account.methods.offline=Offline
+account.methods.yggdrasil=Mojang
+account.missing=No hay cuenta
+account.missing.add=Clic aquí para añadir
+account.password=Contraseña
+account.username=Nombre
+
+archive.author=Autores
+archive.game_version=Juego
+archive.name=Nombre
+archive.version=Versión
+
+assets.download=Descargar assets
+assets.download_all=Verificar integridad de assets
+
+button.cancel=Cancelar
+button.clear=Despejar
+button.delete=Borrar
+button.edit=Editar
+button.install=Instalar
+button.export=Exportar
+button.no=No
+button.ok=OK
+button.refresh=Refrescar
+button.save=Guardar
+button.yes=Sí
+
+color.recent=Recomendado
+color.custom=Color personalizado
+
+crash.NoClassDefFound=Favor verificar que el software "Hello Minecraft! Launcher" esté completo.
+crash.user_fault=Su SO o ambiente de Java podría estar mal instalado resultando en fallos de este software, ¡por favor verifique su ambiente de Java o computadora!
+
+download=Descargar
+download.code.404=Archivo no encontrado en servidor remoto
+download.failed=Falló en descargar
+download.failed.empty=No hay candidatos. Clic aquí para regresar.
+download.failed.refresh=No se pudo cargar lista de versiones. Clic aquí para reintentar.
+download.provider.bmclapi=BMCLAPI (bangbang93, https://bmclapi2.bangbang93.com/)
+download.provider.mojang=Mojang (instalaciones de Forge y OptiFine siendo descargadas por BMCLAPI)
+
+extension.bat=Windows archivo bat
+extension.mod=Archivo mod
+extension.png=Archivo de imagen
+extension.sh=Bash shell
+
+fatal.missing_javafx=JavaFX no existe.\nSi usas Java 11 o después, por favor descargue Java 8 o 10.\nSi usas OpenJDK, asegúrese que OpenJFX esté incluido.
+fatal.missing_dst_root_ca_x3=El certificado DST Root CA X3 no existe en su plataforma Java.\nTodavía podrás usar Hello Minecraft! Launcher, pero Hello Minecraft! Launcher no podrá conectarse a algunos sites (como los que usen certificados de Let's Encrypt), lo cual podrá causar mala función.\nActualize su Java a 8u101 o luego para resolver el problema.
+fatal.config_loading_failure=La configuración no es accesible.\nAsegúrese que Hello Minecraft! Launcher tenga permisos read and write a "%s" y los archivos en ello.
+fatal.migration_requires_manual_reboot=La actualización está a punto de terminar. Favor reiniciar Hello Minecraft! Launcher.
+fatal.apply_update_failure=Lamentamos que Hello Minecraft! Launcher no pudo terminar la actualización por un error.\nPero todavía puedes terminarlo manualmente descargando Hello Minecraft! Launcher por %s.\nConsidere informándonos sobre el error.
+
+folder.config=Configs
+folder.game=Directorio de juego
+folder.mod=Mod
+folder.resourcepacks=Resource packs
+folder.saves=Saves
+folder.screenshots=Screenshots
+
+help=Documentations
+help.detail=Para creadores de data packs, modpacks, etc.
+
+input.email=Su nombre de usuario debe ser un e-mail.
+input.number=Debe ser un número.
+input.not_empty=Campo requerido
+input.url=Debe ser dirección válida.
+
+install=Instalar juego nuevo
+install.change_version=Cambiar de versión
+install.change_version.confirm=Seguro que quiere actualizar %s de versión %s a %s?
+install.failed=Falló la instalación
+install.failed.downloading=Falló la instalación por algunos archivos no podiendo ser descargados
+install.failed.downloading.detail=Falló bajar archivo: %s
+install.failed.downloading.timeout=Tiempo de espera agotado: %s
+install.failed.install_online=No se pudo reconocer el archivo instalador proveído
+install.failed.optifine_conflict=OptiFine y Forge ambos están instalados simultáneamente en Minecraft 1.13
+install.failed.version_mismatch=El library requiere versión del juego %s, pero versión actual es %s.
+install.installer.choose=Escoja una versión de %s
+install.installer.fabric=Fabric
+install.installer.forge=Forge
+install.installer.game=Juego
+install.installer.install=Instalar %s
+install.installer.install_offline=Instalar/actualizar con archivo local
+install.installer.install_offline.extension=Instalador de Forge/OptiFine
+install.installer.install_offline.tooltip=Soporta importación de archivo instalador jar de Forge/OptiFine
+install.installer.install_online=Instalar en línea
+install.installer.install_online.tooltip=Soporta instalación de Forge, OptiFine, LiteLoader
+install.installer.liteloader=LiteLoader
+install.installer.not_installed=%s no está instalado
+install.installer.optifine=OptiFine
+install.installer.version=Versión %s
+install.modpack=Instalar un modpack
+install.new_game=Instalar un juego nuevo
+install.new_game.already_exists=Esta versión ya existe.
+install.new_game.current_game_version=Versión de juego actual
+install.select=Seleccione una operación
+install.success=Instalado exitosamente
+
+lang=Español
+lang.default=Usar idioma de sistema
+
+launch.advice.corrected=Ya hemos corregido la selección de JVM y el juego puede ser lanzado. Si quiere mantener su escogido JVM, puede deshabilitar el JVM checker in la configuración de juego.
+launch.advice.uncorrected=Si está seguro que el juego puede ser lanzado normalmente, puede deshabilitar el Java VM checker en la configuración del juego.
+launch.advice.different_platform=Su SO es 64-Bit pero su Java es 32-Bit. 64-Bit Java es recomendado.
+launch.advice.forge2760_liteloader=Forge 2760 y posterior no es compatible con LiteLoader, considere actualizando Forge a 2773 o más.
+launch.advice.java8_1_13=Minecraft 1.13 y posterior sólo pueden correr en Java 8 o luego.
+launch.advice.java8_51_1_13=Minecraft 1.13 puediera fallar en Java 8 anterior 1.8.0_51. Debe instalar la versión de Java 8 más reciente.
+launch.advice.java9=No puedes lanzar Minecraft hasta que su versión de juego sea más allá de 1.13 con Java 9 o posterior.
+launch.advice.newer_java=Java 8 es recomendado, ya que corre el juego con más fluidez. Y muchos mods y Minecraft 1.12 y luego requieren Java 8.
+launch.advice.not_enough_space=Has alocado demasiada memoria. Como el tamaño físico de ella es %dMB, su juego probablemente fallará. El launcher intentará lanzarlo.
+launch.advice.too_large_memory_for_32bit=Has alocado demasiada memoria. Por su 32-Bit Java Runtime Environment, su juego probablemente fallará. La memoria máxima es 1024MB. El launcher intentará lanzarlo.
+launch.failed=No se puede lanzar
+launch.failed.cannot_create_jvm=Java virtual machine no puede ser creada. Java arguments pudieran tener problemas. Puede habilitar no args mode en la configuración.
+launch.failed.creating_process=Falló creando proceso, quizás su ruta de Java es incorrecta, favor modificar.
+launch.failed.decompressing_natives=No se pudieron descomprimir los native libraries.
+launch.failed.download_library=No se pudo descargar library %s.
+launch.failed.executable_permission=No se pudo añadir permiso al script de lanzamiento
+launch.failed.exited_abnormally=Juego cerró abnormalmente, por favor visite el registro, o pide ayuda.
+launch.state.dependencies=Dependencias
+launch.state.done=Terminado
+launch.state.logging_in=Iniciando sesión
+launch.state.modpack=Preparando para modpack
+launch.state.waiting_launching=Esperando por ejecutación del juego
+launch.wrong_javadir=Directorio Java incorrecto, se reseteará al de por defecto.
+
+launcher=Launcher
+launcher.background=Imagen de fondo
+launcher.background.choose=Escoja ruta de fondo
+launcher.background.default=Por defecto
+launcher.cache_directory=Directorio de descargas
+launcher.cache_directory.choose=Escoger ruta de descargas
+launcher.cache_directory.default=Por defecto
+launcher.cache_directory.disabled=Deshabilitado
+launcher.cache_directory.invalid=Directorio de descargas inválido. Restaurando configuración predeterminada.
+launcher.contact=Contactarnos
+launcher.crash=¡Hello Minecraft! Launcher ha fallado!
+launcher.crash_out_dated=¡Hello Minecraft! Launcher ha fallado! Su launcher está anticuado. ¡Actualízalo!
+launcher.update_java=Favor actualizar Java.
+
+login.empty_username=¡No has proveído un nombre!
+login.enter_password=Por favor entre su contraseña.
+
+logwindow.show_lines=Enseñar líneas
+logwindow.terminate_game=Terminar juego
+logwindow.title=Registros
+
+main_page=Hogar
+
+message.confirm=Confirmar
+message.doing=Favor esperar
+message.downloading=Descargando...
+message.error=Error
+message.info=Info
+message.success=Tareas logradas
+message.unknown=Desconocido
+message.warning=Advertencia
+
+modpack=Modpack
+modpack.choose=Escoja el modpack en archivo zip que quieras instalar.
+modpack.desc=Describa su modpack, incluyendo precauciones, changelog, soportando Markdown (también soportando imágenes en línea).
+modpack.enter_name=Entre su nombre deseado para este juego.
+modpack.export=Exportar modpack
+modpack.files.blueprints=Planos de BuildCraft
+modpack.files.config=Mod configs
+modpack.files.dumps=NEI debug output
+modpack.files.liteconfig=Configuraciones de mods
+modpack.files.mods=Mods
+modpack.files.mods.voxelmods=Opciones de VoxelMods (incluyendo VoxelMap)
+modpack.files.options_txt=Opciones de juegos
+modpack.files.optionsshaders_txt=Opciones de shaders
+modpack.files.resourcepacks=Resource (texture) packs
+modpack.files.saves=Juegos guardados
+modpack.files.scripts=Configuración de MineTweaker
+modpack.files.servers_dat=Lista de servidores multijugador
+modpack.install=Instalar modpack %s
+modpack.installing=Instalando modpack
+modpack.introduction=Modpacks Curse, MultiMC, HMCL soportados.
+modpack.invalid=Archivo modpack inválido.
+modpack.mismatched_type=Tipo de modpack no coincide, su juego actual es modpack %s, pero su archivo de actualización es modpack %s.
+modpack.name=Nombre de modpack
+modpack.not_a_valid_name=Nombre de modpack no es válido
+modpack.scan=Escaneando el modpack
+modpack.task.install=Importar modpack
+modpack.task.install.error=Este archivo modpack no pudo ser reconocido. Sólo modpacks Curse, MultiMC son soportados.
+modpack.task.install.will=Instalar el modpack:
+modpack.type.curse=Curse
+modpack.type.curse.completion=Instalar archivos a modpack Curse
+modpack.type.curse.tolerable_error=Pero no podemos completar la descarga de todos los archivos de este modpack Curse. Puedes reintentar la descarga cargando la versión de juego correspondiente. Puedes reintentar varias veces en caso de problemas de red.
+modpack.type.curse.error=No se puede completar este modpack Curse. Por favor reintente.
+modpack.type.curse.not_found=Algunos recursos requeridos fueron borrados y no se pueden descargar. Considere usando la última versíon u otros modpacks.
+modpack.type.hmcl=HMCL
+modpack.type.multimc=MultiMC
+modpack.unsupported=Modpack no soportado, sólo modpacks HMCL, MultiMC, Curse son soportados.
+modpack.update=Actualizando juego
+modpack.wizard=Exportando asistente de modpack
+modpack.wizard.step.1=Opciones básicas
+modpack.wizard.step.1.title=Establecer las opciones básicas del modpack.
+modpack.wizard.step.2=Selección de archivos
+modpack.wizard.step.2.title=Escoge los archivos que quieres tener en el modpack.
+modpack.wizard.step.3=Descripción
+modpack.wizard.step.initialization.exported_version=La versión del juego exportado
+modpack.wizard.step.initialization.include_launcher=Incluir el launcher
+modpack.wizard.step.initialization.save=Escoger ruta de exportación de los archivos del juego
+modpack.wizard.step.initialization.warning=Antes de hacer un modpack, debes asegurar que su juego ejecute exitosamente,\ny que su Minecraft sea "release", y no snapshot.\ny que no está permitido añadir mods los cuales no estás permitido distribuir en el modpack.
+
+mods=Mods
+mods.add=Añadir mods
+mods.add.failed=Falló añadir mods %s.
+mods.add.success=Exitosamente se añadieron mods %s.
+mods.choose_mod=Escoja sus mods
+mods.enable=Habilitar
+mods.disable=Deshabilitar
+mods.name=Nombre
+mods.remove=Borrar
+mods.not_modded=Debes instalar un modloader primero (Fabric, Forge or LiteLoader)
+
+datapack=Data packs
+datapack.add=Añadir data pack
+datapack.choose_datapack=Escoja el datapack zip que será importado
+datapack.extension=Datapack
+datapack.title=Mundo %s - Datapacks
+datapack.remove=Borrar
+
+world=Worlds/Datapacks
+world.add=Añadir mundo (.zip)
+world.datapack=Gestionar data packs
+world.datapack.1_13=Sólo Minecraft 1.13 y versiones posteriores soportan data packs.
+world.description=%s. Última vez jugado: %s. Versión de juego: %s.
+world.export=Exportar este mundo
+world.export.title=Escoja una ruta para alojar su mundo
+world.export.location=Exportar a
+world.export.wizard=Exportar mundo %s
+world.extension=Mundo zip
+world.game_version=Versión de juego
+world.import.already_exists=Este mundo ya existe.
+world.import.choose=Escoja el zip que será importado
+world.import.failed=No se pudo importar este mundo: %s
+world.import.invalid=No un mundo zip válido
+world.name=Nombre del mundo
+world.name.enter=Entra el nombre del mundo
+world.reveal=Revelar en Explorador
+world.show_all=Enseñar todo
+world.time=EEE, MMM d, yyyy HH:mm:ss
+
+profile=Directorios de juego
+profile.already_exists=Este nombre ya existe, por favor considere otro.
+profile.default=directorio actual
+profile.home=Hogar de usuario
+profile.instance_directory=Directorio de juego
+profile.instance_directory.choose=Escoja directorio de juego
+profile.manage=Lista de directorios de juego
+profile.name=Nombre
+profile.new=Nuevo config
+profile.title=Directorios de juego
+profile.selected=Seleccionado
+profile.use_relative_path=Usar ruta relativa para directorio de juego si posible
+
+selector.choose=Escoger
+selector.choose_file=Seleccionar archivo
+selector.custom=Personalizado
+
+settings=Configuraciones de juego
+
+settings.advanced=Configuraciones avanzadas
+settings.advanced.dont_check_game_completeness=No verificar cuán completo está el juego
+settings.advanced.dont_check_jvm_validity=No verificar si JVM puede lanzar el juego o no
+settings.advanced.game_dir.default=Por defecto (.minecraft/)
+settings.advanced.game_dir.independent=Independiente (.minecraft/versions/<version name>/, excepto assets,libraries)
+settings.advanced.java_args_default=Java args por defecto: -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:-UseAdaptiveSizePolicy -XX:MaxPermSize=???m -Xmx???m -Dfml.ignoreInvalidMinecraftCertificates=true -Dfml.ignorePatchDiscrepancies=true
+settings.advanced.java_permanent_generation_space=PermGen Space/MB
+settings.advanced.jvm_args=Java VM Arguments
+settings.advanced.launcher_visibility.close=Cerrar launcher cuando juego es iniciado.
+settings.advanced.launcher_visibility.hide=Esconder launcher cuando juego is iniciado.
+settings.advanced.launcher_visibility.hide_and_reopen=Esconder launcher y reabrir cuando juego cierre.
+settings.advanced.launcher_visibility.keep=Mantener launcher visible.
+settings.advanced.launcher_visible=Visibilidad de launcher
+settings.advanced.minecraft_arguments=Minecraft Arguments
+settings.advanced.no_jvm_args=No JVM Args por defecto
+settings.advanced.precall_command=Comando pre-inicio (será ejecutado antes de inicio del juego)
+settings.advanced.server_ip=Host de servidor
+settings.advanced.wrapper_launcher=Wrapper Launcher(i.e. optirun...)
+
+settings.custom=Personalización
+
+settings.game=Juegos
+settings.game.dimension=Dimensiones de ventana de juego
+settings.game.exploration=Explorar
+settings.game.fullscreen=Pantalla completa
+settings.game.java_directory=Directorio Java
+settings.game.java_directory.bit=, %s-Bit
+settings.game.java_directory.choose=Escoja directorio Java.
+settings.game.management=Gestionar
+settings.game.working_directory=Directorio de función
+settings.game.working_directory.choose=Escoja directory de función
+
+settings.icon=Ícono de juego
+
+settings.launcher=Configuración
+settings.launcher.common_path.tooltip=Esta app guardará todos los game libraries y assets aquí al menos que hayan archivos existentes en el directorio.
+settings.launcher.download_source=Fuente de descarga
+settings.launcher.enable_game_list=Mostrar lista de juegos en página inicial
+settings.launcher.language=Idioma
+settings.launcher.launcher_log.export=Exportar registros del launcher
+settings.launcher.launcher_log.export.failed=Falló exportar registros
+settings.launcher.launcher_log.export.success=Registros han sido exportados a %s
+settings.launcher.log=Registros
+settings.launcher.log.font=Tipografía de registro
+settings.launcher.proxy=Proxy
+settings.launcher.proxy.authentication=Autenticación de proxy
+settings.launcher.proxy.disable=Usar proxies de sistema
+settings.launcher.proxy.host=Host
+settings.launcher.proxy.http=HTTP
+settings.launcher.proxy.password=Contraseña
+settings.launcher.proxy.port=Port
+settings.launcher.proxy.socks=Socks
+settings.launcher.proxy.username=Cuenta
+settings.launcher.theme=Tema
+
+settings.max_memory=Max Memory/MB
+settings.physical_memory=Tamaño de memoria física
+settings.show_log=Enseñar registros
+settings.tabs.installers=Instaladores
+settings.type=Tipo de configuricón de la versión
+settings.type.global=Configuración global de juego (todo compartido)
+settings.type.global.manage=Configuración global de juego
+settings.type.global.edit=Configurar configuración global de juego
+settings.type.special.enable=Habilitar configuraciones especializadas para este juego
+
+sponsor.bmclapi=Para obtener un servicio de descargas estable, considere apoyar a BMCLAPI. Clic aquí para más información
+sponsor.hmcl=Hello Minecraft! Launcher es un Minecraft launcher gratis y do código abierto que habalita sus usuarios a fácilmente gestionar multiples instalaciones de Minecraft aparte. Usamos Afdian para que podamos continuar pagando por nuestro hosting y desarrollo. Clic aquí para más información.
+
+update=Actualizar
+update.accept=Actualizar
+update.changelog=Changelog
+update.channel.dev=Actualizar a versión en desarrollo
+update.channel.stable=Actualizar a versión estable
+update.checking=Verificar por actualizaciones
+update.failed=Falló realizar actualización
+update.found=¡Actualización disponible!
+update.newest_version=Versión más reciente: %s
+update.bubble.title=Actualización más reciente: %s
+update.bubble.subtitle=Clic aquí para actualizar
+update.note=Versión en desarrollo contiene más funcionalidad y corrección de errores al igual que errores nuevos.
+update.latest=Esta es la versión más reciente.
+update.no_browser=No se puede abrir en ningún navegador. La dirección ha sido copiada a tu portapapeles. Pégalo en tu navegador para actualizar.
+update.tooltip=Actualizar
+
+version=Juegos
+version.cannot_read=No se pudo encontrar la versión de juego. Descontinuando autoinstalación.
+version.empty=No hay juego
+version.empty.add=Instalar juego en lista de juegos
+version.empty.launch=No hay juego para iniciar, por favor instale juego nuevo via la lista.
+version.forbidden_name=Nombre prohibido.
+version.game.old=Viejo
+version.game.release=Release
+version.game.snapshot=Snapshot
+version.launch=Jugar
+version.launch.test=Probar juego
+version.launch_script=Crear script de ejecutación
+version.launch_script.failed=No se pudo crear script de ejecutación.
+version.launch_script.save=Guardar script de ejecutación
+version.launch_script.success=Se terminó creación de script, %s.
+version.manage=Lista de juegos
+version.manage.clean=Despejar directorio de juegos
+version.manage.clean.tooltip=Borrar logs, crash reports
+version.manage.manage=Gestionar juego
+version.manage.redownload_assets_index=Actualizar assets de juego
+version.manage.remove=Borrar este juego
+version.manage.remove.confirm=¿Seguro que quiere remover juego %s? ¡No se puede restaurar de nuevo!
+version.manage.remove.confirm.trash=¿Seguro que quiere remover juego %s? Lo puede restaurar con el nombre de %s en el basurero de su sistema.
+version.manage.remove.confirm.independent=Como este juego está en modo independiente, borrándolo resultará en todos sus mundos guardados siendo borrados simultáneamente. ¿Seguro que quiere remover juego %s?
+version.manage.remove_libraries=Borrar todos los library files
+version.manage.rename=Renombrar este juego
+version.manage.rename.message=Favor entrar el nombre nuevo
+version.manage.rename.fail=Falló en renombrar el juego.
+version.settings=Configuración
+version.update=Actualizar modpack
+
+wizard.prev=< Prev
+wizard.failed=Fallo
+wizard.finish=Acabar
+wizard.next=Próx >

HMCL/src/main/resources/assets/lang/I18N_ru.properties

@@ -0,0 +1,446 @@
+#
+# Hello Minecraft! Launcher
+# Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+
+# Contributors: Botylyov Yury
+about.copyright=Авторское право
+about.copyright.statement=Создано (c) 2019 huangyuhui.
+about.author=Автор
+about.author.statement=huanghongxun (hmcl@huangyuhui.net)
+about.thanks_to=Благодарность
+about.thanks_to.statement=bangbang93 (BMCLAPI, https://bmclapi2.bangbang93.com/)\ngamerteam (Default background image)\nAll contributors who participated in this project via issues, pull requests, etc.
+about.dependency=Зависимости
+# Due to space limitations, only first authors are listed
+about.dependency.statement=JFoenix (Shadi Shaheen, Apache 2.0)\nGson (Google, Apache 2.0)\nApache Commons Compress (ASF, Apache 2.0)\nXZ for Java (Lasse Collin, Public Domain)\nfx-gson (Joffrey Bion, MIT)\nConstant Pool Scanner (jenkins-ci, CDDL, GPL 2)\nOpenNBT (Steveice10, BSD 3-Clause)
+about.claim=Соглашение
+about.claim.statement=Авторские права на Minecraft принадлежат Mojang AB. Мы не несем ответственности за любые нарушения авторских прав, возникающие в результате использования данного программного обеспечения.
+about.open_source=Open Source
+about.open_source.statement=GPL v3 (https://github.com/huanghongxun/HMCL/)
+
+account=Аккаунты
+account.character=герой
+account.choose=Выберите героя
+account.create=Создать новый аккаунт
+account.email=Почта
+account.failed.character_deleted=Персонаж был удален.
+account.failed.connect_authentication_server=Не удается подключиться к серверу аутентификации. Проверьте подключение к интернету.
+account.failed.connect_injector_server=Не удается подключиться к серверу аутентификации. Проверьте свою сеть и убедитесь, что URL-адрес правильный.
+account.failed.injector_download_failure=Не удалось загрузить authlib-injector. Проверьте свою сеть и попробуйте переключиться на другой источник загрузки.
+account.failed.invalid_credentials=Неверный пароль или вам временно запрещен вход.
+account.failed.invalid_password=Неправильный пароль
+account.failed.invalid_token=Пожалуйста, выйдите и повторно введите свой пароль для входа.
+account.failed.no_character=Нет героев в этом аккаунте.
+account.failed.server_response_malformed=Неверный ответ сервера. Возможно, на сервере аутентификации произошел сбой.
+account.injector.add=Добавить сервер аутентификации
+account.injector.empty=Пусто (нажмите кнопку «плюс» справа, чтобы добавить)
+account.injector.manage=Управление серверами аутентификации
+account.injector.manage.title=Серверы аутентификации
+account.injector.http=Предупреждение\: этот сервер использует HTTP, поэтому ваш пароль будет передан в виде открытого текста.
+account.injector.link.register=Зарегистрироваться
+account.injector.server=Сервер авторизации
+account.injector.server_url=URL сервера
+account.injector.server_name=Название сервера
+account.manage=Список аккаунтов
+account.methods=Тип аккаунта
+account.methods.authlib_injector=authlib-injector
+account.methods.offline=Пиратка
+account.methods.yggdrasil=Лицензия
+account.missing=Без аккаунта
+account.missing.add=Нажмите сюда, чтобы добавить
+account.password=Пароль
+account.username=Никнейм
+
+archive.author=Авторы
+archive.game_version=Игра
+archive.name=Никнейм
+archive.version=Версия
+
+assets.download=Загрузка библиотек
+assets.download_all=Проверка целостности библиотек
+
+button.cancel=Отмена
+button.clear=Очистить
+button.delete=Удалить
+button.edit=Редактировать
+button.install=Установить
+button.export=Экспорт
+button.no=Нет
+button.ok=Ок
+button.refresh=Обновить
+button.save=Сохранить
+button.yes=Да
+
+color.recent=Рекомендуется
+color.custom=Свой цвет
+
+crash.NoClassDefFound=Пожалуйста, проверьте, что программное обеспечение "Hello Minecraft! Launcher" не повреждено.
+crash.user_fault=Ваша ОС или среда Java могут быть неправильно установлены, что приведет к сбою этого программного обеспечения, пожалуйста, проверьте свою среду Java или свой компьютер\!
+
+download=Загрузка
+download.code.404=Файл не найден на удаленном сервере
+download.failed=Не удалось загрузить
+download.failed.empty=Нет вариантов. Нажмите здесь, чтобы вернуться.
+download.failed.refresh=Невозможно загрузить список версий. Нажмите здесь, чтобы повторить попытку.
+download.provider.bmclapi=BMCLAPI (Резервный)
+download.provider.mojang=Mojang (Официальный)
+
+extension.bat=Windows Bat файл
+extension.mod=Mod файл
+extension.png=Файл картинки
+extension.sh=Командная оболочка bash
+
+fatal.missing_javafx=JavaFX отсутствует.\nЕсли вы используете Java 11 или более позднюю версию, пожалуйста, перейдите на Java 8 или 10.\nЕсли вы используете OpenJDK, убедитесь, что OpenJFX включен.
+fatal.missing_dst_root_ca_x3=The DST Root CA X3 certificate is missing on the current Java platform.\nYou can still use Hello Minecraft! Launcher, but Hello Minecraft! Launcher will be unable to connect to some sites (such as sites that use certificates issued by Let's Encrypt), which may cause Hello Minecraft! Launcher not to function properly.\nPlease upgrade your Java to 8u101 or later to resolve the problem.
+fatal.config_loading_failure=Конфигурация недоступна.\nУбедитесь, что у Hello Minecraft! Launcher есть права на чтение и запись для "%s" и файлов в нем.
+fatal.migration_requires_manual_reboot=Обновление скоро будет завершено. Пожалуйста, перезапустите Hello Minecraft! Launcher.
+fatal.apply_update_failure=Мы сожалеем, что Hello Minecraft! Launcher не смог завершить обновление, потому что что-то пошло не так.\nНо вы все же можете вручную завершить обновление, загрузив Hello Minecraft! Launcher с %s.\nПожалуйста, расскажите об этой проблеме нам.
+
+folder.config=Конфиги
+folder.game=Директория игры
+folder.mod=Мод
+folder.resourcepacks=Ресурс паки
+folder.saves=Сохранения
+folder.screenshots=Скриншоты
+
+help=Документация
+help.detail=Для производителей пакетов данных, модпаков и т.д.
+
+input.email=Имя пользователя должно быть электронной почтой.
+input.number=Должно быть числом.
+input.not_empty=Обязательное поле
+input.url=Должен быть действующим URL.
+
+install=Установить версию
+install.change_version=Изменить версию
+install.change_version.confirm=Уверены, что хотите обновить %s с версии %s до %s?
+install.failed=Не удалось установить
+install.failed.downloading=Не удалось установить из-за некоторых файлов, которые не были успешно загружены
+install.failed.downloading.detail=Не удалось загрузить файл\: %s
+install.failed.downloading.timeout=Превышено время ожидания при загрузке файла: %s
+install.failed.install_online=Невозможно распознать предоставленный файл установщика
+install.failed.optifine_conflict=OptiFine и Forge установлены одновременно на Minecraft 1.13
+install.failed.version_mismatch=Для библиотеки требуется версия игры %s, но фактическая версия - %s.
+install.installer.choose=Выберите %s версию
+install.installer.fabric=Fabric
+install.installer.forge=Forge
+install.installer.game=Версия
+install.installer.install=Установка %s
+install.installer.install_offline=Установить/Обновить из файла
+install.installer.install_offline.extension=Forge/OptiFine установщик
+install.installer.install_offline.tooltip=Моддерживается импорт файлов установки Forge/OptiFine
+install.installer.install_online=Установить онлайн
+install.installer.install_online.tooltip=Поддерживается установка Forge, OptiFine, LiteLoader.
+install.installer.liteloader=LiteLoader
+install.installer.not_installed=%s не установлен
+install.installer.optifine=OptiFine
+install.installer.version=%s Версия
+install.modpack=Новый модпак
+install.new_game=Новая версия
+install.new_game.already_exists=Эта версия уже существует.
+install.new_game.current_game_version=Текущая версия игры
+install.new_game.malformed=Неверное название
+install.select=Выберите операцию
+install.success=Успешно установлено
+
+lang=Русский
+lang.default=Использовать язык системы
+
+launch.advice.corrected=Мы уже исправили выбор JVM, и теперь игра может быть запущена. Если вы хотите сохранить свой выбор JVM, вы можете отключить проверку Java VM в настройках игры.
+launch.advice.uncorrected=Если вы уверены, что игра может быть запущена нормально, вы можете отключить проверку Java VM в настройках игры.
+launch.advice.different_platform=Ваша ОС 64-битная, а ваша Java 32-битная. Рекомендуется 64-битная Java.
+launch.advice.forge2760_liteloader=Forge 2760 и выше не совместимы с LiteLoader, рассмотрите возможность обновления Forge до 2773 или более поздней.
+launch.advice.java8_1_13=Minecraft 1.13 и более поздние версии могут работать только на Java 8 или более поздней версии.
+launch.advice.java8_51_1_13=Minecraft 1.13 может сломаться на Java 8 ранее, чем 1.8.0_51. Вы должны установить последнюю версию Java 8.
+launch.advice.java9=Вы не можете запустить Minecraft, пока версия игры не станет выше 1.13 с Java 9 или более поздними версиями Java.
+launch.advice.newer_java=Предлагается Java 8, которая может сделать игру более стабильной. А для многих модов и Minecraft 1.12 и более новых версий требуется Java 8.
+launch.advice.not_enough_space=Вы выделили слишком много памяти, поскольку объем физической памяти составляет %dMB, возможно, ваша игра будет вылетать. Лаунчер попробует это запустить.
+launch.advice.too_large_memory_for_32bit=Вы выделили слишком много памяти, из-за вашей 32-битной Java игра, вероятно, вылетает. Максимальный объем памяти составляет 1024 Мб. Лаунчер попробует с таким объемом памяти.
+launch.failed=Невозможно запустить
+launch.failed.cannot_create_jvm=Виртуальная машина Java не может быть создана. У аргументов Java могут быть проблемы. Вы можете включить режим без аргументов в настройках.
+launch.failed.creating_process=Не удалось создать процесс, возможно, ваш путь Java неверен, пожалуйста, измените путь Java.
+launch.failed.decompressing_natives=Невозможно распаковать нативные библиотеки.
+launch.failed.download_library=Невозможно загрузить библиотеку %s.
+launch.failed.executable_permission=Невозможно добавить разрешение в скрипт запуска
+launch.failed.exited_abnormally=Игра закрылась ненормально, зайдите в журнал или попросите кого-нибудь помочь.
+launch.state.dependencies=Зависимости
+launch.state.done=Готово
+launch.state.logging_in=Вход в систему
+launch.state.modpack=Приготовление к модпаку
+launch.state.waiting_launching=В ожидании запуска игры
+launch.wrong_javadir=Неверный каталог Java, будет установлен каталог Java по умолчанию.
+
+launcher=Лаунчер
+launcher.background=Изображение на заднем плане
+launcher.background.choose=Выберите путь до изображения на заднем плане
+launcher.background.default=Стандартное
+launcher.cache_directory=Каталог для скачки библиотек
+launcher.cache_directory.choose=Выбор каталога для скачки кеша
+launcher.cache_directory.default=По умолчанию
+launcher.cache_directory.disabled=Отключено
+launcher.cache_directory.invalid=Неправильный пусть до каталога для скачки кеша. Будет установлен стандартный каталог.
+launcher.contact=Связаться с нами
+launcher.crash=Hello Minecraft! Launcher вылетел
+launcher.crash_out_dated=Hello Minecraft! Launcher вылетел! Ваш лаунчер устарел! Обновите его!
+launcher.update_java=Пожалуйста, обновите Java!
+
+login.empty_username=Вы не установили имя пользователя!
+login.enter_password=Пожалуйста, введите пароль.
+
+logwindow.show_lines=Показать линии
+logwindow.terminate_game=Завершить игру
+logwindow.title=Лог
+
+main_page=Главная
+
+message.confirm=Подтвердить
+message.doing=Пожалуйста, подождите
+message.downloading=Загрузка ...
+message.error=Ошибка
+message.info=Информация
+message.success=Задание успешно завершено
+message.unknown=Неизвестно
+message.warning=Предупреждение
+
+modpack=Модпак
+modpack.choose=Выберите zip-файл модпака, который вы хотите установить.
+modpack.desc=Опишите свой модпак, включая меры предосторожности, журнал изменений, поддерживая Markdown (также поддерживая онлайн-изображения).
+modpack.enter_name=Введите желаемое имя для этой версии.
+modpack.export=Экспортировать модпак
+modpack.export.as=Экспорт модпака как...
+modpack.files.blueprints=BuildCraft чертежи
+modpack.files.config=Настройки мода
+modpack.files.dumps=Отладочный вывод NEI
+modpack.files.liteconfig=Мод конфигурации
+modpack.files.mods=Моды
+modpack.files.mods.voxelmods=Опции VoxelMods (включая VoxelMap)
+modpack.files.options_txt=Опции игры
+modpack.files.optionsshaders_txt=Опции шейдеров
+modpack.files.resourcepacks=Ресурсные (текстурные) паки
+modpack.files.saves=Сохраненные игры
+modpack.files.scripts=Конфигурация MineTweaker
+modpack.files.servers_dat=Список серверов
+modpack.install=Установка %s модпака
+modpack.installing=Установка модпака
+modpack.introduction=Curse, MultiMC, HMCL модпаки поддерживаются.
+modpack.invalid=Неверный файл модпака.
+modpack.mismatched_type=Несоответствующий тип модпака, ваша текущая игра %s модпак, но ваш файл обновления %s модпак.
+modpack.name=Название модпака
+modpack.not_a_valid_name=Неверное имя модпака
+modpack.scan=Сканирование этого модпака
+modpack.task.install=Импортировать модпак
+modpack.task.install.error=Этот файл мода не может быть распознан. Поддерживаются только Curse, MultiMC модпаки.
+modpack.task.install.will=Установите модпак\:
+modpack.type.curse=Curse
+modpack.type.curse.completion=Установить файлы относительно модпака Curse
+modpack.type.curse.tolerable_error=Но мы не можем завершить загрузку всех файлов этого модпака Curse. Вы можете повторить загрузку при запуске соответствующей версии игры. Вы можете повторить попытку несколько раз из-за проблем с сетью.
+modpack.type.curse.error=Невозможно завершить этот модпак Curse. Пожалуйста, повторите.
+modpack.type.curse.not_found=Некоторые из необходимых ресурсов удалены и не могут быть загружены. Пожалуйста, рассмотрите последнюю версию или другие модпаки.
+modpack.type.hmcl=Hello Minecraft! Launcher
+modpack.type.hmcl.export=Can be imported by Hello Minecraft! Launcher
+modpack.type.multimc=MultiMC
+modpack.type.multimc.export=Can be imported by Hello Minecraft! Launcher and MultiMC
+modpack.unsupported=Неподдерживаемый модпак, поддерживаются только модпаки HMCL, MultiMC, Curse.
+modpack.update=Обновление игры
+modpack.wizard=Мастер экспорта модпаков
+modpack.wizard.step.1=Основные опции
+modpack.wizard.step.1.title=Установите основные параметры для модпака.
+modpack.wizard.step.2=Выбор файлов
+modpack.wizard.step.2.title=Выберите файлы, которые вы хотите поместить в модпак.
+modpack.wizard.step.3=Тип модпака
+modpack.wizard.step.3.title=Выберите формат модпака.
+modpack.wizard.step.initialization.exported_version=Экспортированная версия игры
+modpack.wizard.step.initialization.include_launcher=Включить лаунчер
+modpack.wizard.step.initialization.save=Выберите путь для экспорта файлов игры в
+modpack.wizard.step.initialization.warning=Перед созданием модпака вы должны убедиться, что ваша игра может успешно запуститься,\nи что ваш Minecraft это релиз, а не снапшот.\nТак же, запрещено добавлять моды, которые нельзя распространять в модпаке.
+
+mods=Моды
+mods.add=Установить моды
+mods.add.failed=Не удалось установить моды %s.
+mods.add.success=Успешно установлены моды %s.
+mods.choose_mod=Выберите свои моды
+mods.enable=Включить
+mods.disable=Отключить
+mods.name=Название
+mods.remove=Удалить
+mods.not_modded=Сначала необходимо установить загрузчик модов (Forge, LiteLoader)
+
+datapack=Пакеты данных
+datapack.add=Добавить пакет данных
+datapack.choose_datapack=Выберите zip-файл для импорта
+datapack.extension=Пакет данных
+datapack.title=Мир %s - Пакеты данных
+datapack.remove=Удалить
+
+world=Сохранения
+world.add=Добавить мир (.zip)
+world.datapack=Управление данными
+world.datapack.1_13=Только Minecraft 1.13 и более поздние версии поддерживают пакеты данных.
+world.description=%s. Время последней игры\: %s. Версия игры\: %s.
+world.export=Экспортирт этого мира
+world.export.title=Выберите местоположение файла для хранения вашего мира
+world.export.location=Экспортировать в
+world.export.wizard=Экспорт мира %s
+world.extension=Zip файл мира
+world.game_version=Версия игры
+world.import.already_exists=Этот мир уже существует.
+world.import.choose=Выберите zip-файл для импорта
+world.import.failed=Невозможно импортировать этот мир\: %s
+world.import.invalid=Недопустимый zip мира
+world.name=Имя мира
+world.name.enter=Введите имя мира
+world.reveal=Показать в проводнике
+world.show_all=Показать все
+world.time=EEE, MMM d, yyyy HH\:mm\:ss
+
+profile=Каталоги игры
+profile.already_exists=Это имя уже существует, пожалуйста, рассмотрите другое имя.
+profile.default=Текущий каталог
+profile.home=Стандартная
+profile.instance_directory=Каталог игры
+profile.instance_directory.choose=Выберите каталог игры
+profile.manage=Список каталогов игры
+profile.name=Имя
+profile.new=Новый конфиг
+profile.title=Каталоги игры
+profile.selected=Выбрано
+profile.use_relative_path=Используйте относительный путь к каталогу игры, если это возможно
+
+selector.choose=Выбрать
+selector.choose_file=Выберите файл
+selector.custom=Настраиваемый
+
+settings=Настройки игры
+
+settings.advanced=Расширенные настройки
+settings.advanced.dont_check_game_completeness=Не проверять файлы игры
+settings.advanced.dont_check_jvm_validity=Не проверять, может ли JVM запустить игру или нет
+settings.advanced.game_dir.default=Стандарт (.minecraft/)
+settings.advanced.game_dir.independent=Независимая (.minecraft/versions/<версия>/, кроме ассетов и библиотек)
+settings.advanced.java_args_default=Стандартные аргументы java\: -XX\:+UseConcMarkSweepGC -XX\:+CMSIncrementalMode -XX\:-UseAdaptiveSizePolicy -XX\:MaxPermSize\=???m -Xmx???m -Dfml.ignoreInvalidMinecraftCertificates\=true -Dfml.ignorePatchDiscrepancies\=true
+settings.advanced.java_permanent_generation_space=PermGen Space/MB
+settings.advanced.jvm_args=Java VM Аргументы
+settings.advanced.launcher_visibility.close=Закрывать лаунчер после запуска игры.
+settings.advanced.launcher_visibility.hide=Скрывать лаунчер при запуске игры.
+settings.advanced.launcher_visibility.hide_and_reopen=Скрывать лаунчер и снова открывать, когда игра закроется.
+settings.advanced.launcher_visibility.keep=Держать лаунчер видимым.
+settings.advanced.launcher_visible=Видимость лаунчера
+settings.advanced.minecraft_arguments=Аргументы Minecraft
+settings.advanced.no_jvm_args=Аргументы JVM по умолчанию отсутствуют
+settings.advanced.precall_command=Команда перед запуском (будет выполнена до запуска игры)
+settings.advanced.server_ip=Адрес сервера
+settings.advanced.wrapper_launcher=Wrapper Launcher(optirun...)
+
+settings.custom=Своя
+
+settings.game=Игры
+settings.game.dimension=Размер игрового окна
+settings.game.exploration=Изменить
+settings.game.fullscreen=На весь экран
+settings.game.java_directory=Каталог Java
+settings.game.java_directory.bit=, %s-бит
+settings.game.java_directory.choose=Выберите каталог Java.
+settings.game.management=Управление
+settings.game.working_directory=Рабочий каталог
+settings.game.working_directory.choose=Выберите рабочий каталог
+
+settings.icon=Иконка игры
+
+settings.launcher=Настройки
+settings.launcher.common_path.tooltip=Это приложение сохранит все игровые библиотеки и ресурсы здесь, если в папке с игрой нет существующих файлов.
+settings.launcher.download_source=Источник загрузки файлов
+settings.launcher.enable_game_list=Показать список версий на главной странице
+settings.launcher.language=Язык
+settings.launcher.launcher_log.export=Экспорт логов лаунчера
+settings.launcher.launcher_log.export.failed=Не удалось экспортировать лог
+settings.launcher.launcher_log.export.success=Логи успешно экспортированы в %s
+settings.launcher.log=Лог
+settings.launcher.log.font=Шрифт логов
+settings.launcher.proxy=Прокси
+settings.launcher.proxy.authentication=Аутентификация прокси
+settings.launcher.proxy.disable=Использовать системные прокси
+settings.launcher.proxy.host=Хост
+settings.launcher.proxy.http=HTTP
+settings.launcher.proxy.password=Пароль
+settings.launcher.proxy.port=Порт
+settings.launcher.proxy.socks=Socks
+settings.launcher.proxy.username=Пользователь
+settings.launcher.theme=Тема
+
+settings.max_memory=Макс. Память / МБ
+settings.physical_memory=Размер физической памяти
+settings.show_log=Показать логи
+settings.tabs.installers=Установщики
+settings.type=Тип настройки версии
+settings.type.global=Общие глобальные настройки(для всех версий)
+settings.type.global.manage=Глобальные настройки игры
+settings.type.global.edit=Глобальные настройки
+settings.type.special.enable=Независимые настройки
+
+sponsor.bmclapi=Для получения стабильной загрузки службы, пожалуйста, рассмотреть возможность поддержки BMCLAPI. Нажмите здесь для получения дополнительной информации
+sponsor.hmcl=Hello Minecraft! Launcher - это бесплатная программа Minecraft с открытым исходным кодом, позволяющая пользователям легко управлять несколькими отдельными установками Minecraft. Мы используем Afdian, чтобы продолжать оплачивать хостинг и разработку проектов. Для получения дополнительной информации нажмите здесь.
+
+update=Обновление
+update.accept=Обновиться
+update.changelog=Изменения
+update.channel.dev=Обновляться до бета-версий
+update.channel.stable=Обновляться до стабильных версий
+update.checking=Проверка обновлений
+update.failed=Не удалось выполнить обновление
+update.found=Доступно обновление\!
+update.newest_version=Последняя версия\: %s
+update.bubble.title=Доступно обновление\: %s
+update.bubble.subtitle=Нажмите здесь, чтобы обновить
+update.note=Бета-версия содержит больше функций и исправлений ошибок, а также больше возможных ошибок.
+update.latest=Это последняя версия.
+update.no_browser=Не удается открыть любой браузер. Ссылка была скопирована в буфер обмена. Вставьте его в адресную строку браузера для обновления.
+update.tooltip=Обновить
+
+version=Версии
+version.cannot_read=Невозможно узнать версию игры. Не удается продолжить автоматическую установку.
+version.empty=Нет версий
+version.empty.add=Установить версию
+version.empty.launch=Нет версии для запуска, пожалуйста, установите новую версию через страницу со списком версий.
+version.forbidden_name=Запрещенное имя, не используйте его.
+version.game.old=Старые
+version.game.release=Релизы
+version.game.snapshot=Снапшоты
+version.launch=Играть
+version.launch.test=Тест версии
+version.launch_script=Сделать стартовый скрипт
+version.launch_script.failed=Невозможно сделать скрипт запуска.
+version.launch_script.save=Сохраните скрипт запуска
+version.launch_script.success=Завершено создание скрипта, %s.
+version.manage=Все версии
+version.manage.clean=Очистить каталог версии
+version.manage.clean.tooltip=Очистить журналы, отчеты об ошибках
+version.manage.manage=Управление версией
+version.manage.redownload_assets_index=Перескачать ассеты
+version.manage.remove=Удалить эту версию
+version.manage.remove.confirm=Обязательно удалить версию %s? Вы не можете восстановить эту версию снова\!
+version.manage.remove.confirm.trash=Обязательно удалить версию %s? Вы можете восстановить игру с именем %s в системной корзине.
+version.manage.remove.confirm.independent=Поскольку эта версия находится в независимом режиме, удаление этой версии приведет к удалению всех сохраненных миров, принадлежащих этой игре. Намерены удалить версию %s?
+version.manage.remove_libraries=Удалить файлы библиотеки
+version.manage.rename=Переименовать эту версию
+version.manage.rename.message=Пожалуйста, введите имя для версии
+version.manage.rename.fail=Не удалось переименовать эту версию.
+version.settings=Настройки
+version.update=Обновление модпака
+
+wizard.prev=< Пред
+wizard.failed=Не удалось
+wizard.finish=Закончено
+wizard.next=След >

HMCL/src/main/resources/assets/lang/I18N_zh.properties

@@ -86,15 +86,16 @@ button.yes=是
 color.recent=推薦
 color.custom=自訂顏色
 
-crash.NoClassDefFound=請確認 HMCL 本體是否完整，或更新您的 Java。
+crash.NoClassDefFound=請確認 Hello Minecraft! Launcher 本體是否完整，或更新您的 Java。
 crash.user_fault=您的系統或 Java 環境可能安裝不當導致本軟體崩潰，請檢查您的 Java 環境或您的電腦！可以嘗試重新安裝 Java。
 
 download=下載
+download.code.404=遠程伺服器不包含需要下載的文件
 download.failed=下載失敗
 download.failed.empty=沒有可供安裝的版本，點擊此處返回。
 download.failed.refresh=載入版本列表失敗，點擊此處重試。
 download.provider.bmclapi=BMCLAPI（bangbang93，https://bmclapi2.bangbang93.com/）
-download.provider.mojang=官方伺服器（Mojang）
+download.provider.mojang=官方伺服器（Forge 和 OptiFine 自動安裝的下載來源是 BMCLAPI）
 
 extension.bat=Windows 腳本
 extension.mod=模組檔案
@@ -102,10 +103,10 @@ extension.png=圖片檔案
 extension.sh=Bash 腳本
 
 fatal.missing_javafx=找不到 JavaFX。\n如果您使用的是 Java 11 或更高版本，請降級到 Java 8 或 10。\n如果您使用的是 OpenJDK，請確保其包含 OpenJFX。
-fatal.missing_dst_root_ca_x3=目前的 Java 平台缺少 DST Root CA X3 憑證。\n您依然可以使用 HMCL，但將無法連線到部分網站（如使用 Lets Encrypt 證書的站點），這可能會使 HMCL 無法正常運作。\n請將您的 Java 升級到 8u101 以上以解決此問題。
-fatal.config_loading_failure=HMCL 無法載入設定檔案。\n請確保 HMCL 對 "%s" 目錄及該目錄下的檔案擁有讀寫權限。
-fatal.migration_requires_manual_reboot=HMCL 即將升級完成，請重新打開 HMCL。
-fatal.apply_update_failure=我們很抱歉 HMCL 無法自動完成升級程序，因為出現了一些問題。\n但你依然可以從 %s 處手動下載 HMCL 來完成升級。\n請考慮向我們回報該問題。
+fatal.missing_dst_root_ca_x3=目前的 Java 平台缺少 DST Root CA X3 憑證。\n您依然可以使用 Hello Minecraft! Launcher，但將無法連線到部分網站（如使用 Lets Encrypt 證書的站點），這可能會使 Hello Minecraft! Launcher 無法正常運作。\n請將您的 Java 升級到 8u101 以上以解決此問題。
+fatal.config_loading_failure=Hello Minecraft! Launcher 無法載入設定檔案。\n請確保 Hello Minecraft! Launcher 對 "%s" 目錄及該目錄下的檔案擁有讀寫權限。
+fatal.migration_requires_manual_reboot=Hello Minecraft! Launcher 即將升級完成，請重新打開 Hello Minecraft! Launcher。
+fatal.apply_update_failure=我們很抱歉 Hello Minecraft! Launcher 無法自動完成升級程序，因為出現了一些問題。\n但你依然可以從 %s 處手動下載 Hello Minecraft! Launcher 來完成升級。\n請考慮向我們回報該問題。
 
 folder.config=設定資料夾
 folder.game=遊戲資料夾
@@ -114,7 +115,7 @@ folder.resourcepacks=資源包資料夾
 folder.saves=遊戲存檔資料夾
 folder.screenshots=截圖資料夾
 
-help=HMCL 幫助文檔
+help=Hello Minecraft! Launcher 幫助文檔
 help.detail=可查閱資料包、整合包製作指南等內容。
 
 input.email=「使用者名稱」必須是電子信箱格式
@@ -123,13 +124,24 @@ input.not_empty=必填
 input.url=必須為有效連結
 
 install=新增遊戲
+install.change_version=更換版本
+install.change_version.confirm=你確定要將 %s 從 %s 更新到 %s 嗎？
 install.failed=安裝失敗
 install.failed.downloading=安裝失敗，部分文件未能完成下載
 install.failed.downloading.detail=未能下載檔案：%s
+install.failed.downloading.timeout=下載超時：%s
+install.failed.install_online=無法識別要安裝的軟體
+install.failed.optifine_conflict=暫不支持 OptiFine 與 Forge 同時安裝在 Minecraft 1.13 上
+install.failed.version_mismatch=該軟體需要的遊戲版本為 %s，但實際的遊戲版本為 %s。
 install.installer.choose=選擇 %s 版本
 install.installer.forge=Forge
 install.installer.game=遊戲
 install.installer.install=安裝 %s
+install.installer.install_offline=從本地檔案安裝/升級
+install.installer.install_offline.extension=Forge/OptiFine 安裝器
+install.installer.install_offline.tooltip=支持導入已經下載好的 Forge/OptiFine 安裝器
+install.installer.install_online=在線安裝
+install.installer.install_online.tooltip=支持安裝 Fabric、Forge、OptiFine、LiteLoader
 install.installer.liteloader=LiteLoader
 install.installer.not_installed=暫時不安裝 %s，可以點擊此處安裝
 install.installer.optifine=OptiFine
@@ -138,6 +150,7 @@ install.modpack=安裝整合包
 install.new_game=安裝新遊戲版本
 install.new_game.already_exists=此版本已經存在，請換一個名字
 install.new_game.current_game_version=目前遊戲版本
+install.new_game.malformed=名字不合法
 install.select=請選擇安裝方式
 install.success=安裝成功
 
@@ -205,6 +218,7 @@ modpack.choose=選擇要安裝的遊戲整合包檔案
 modpack.desc=描述你要製作的整合包，比如整合包注意事項和更新記錄，支援 Markdown（圖片請上傳至網路）。
 modpack.enter_name=給遊戲取個你喜歡的名字
 modpack.export=匯出整合包
+modpack.export.as=請選擇整合包類型。若你無法決定，請選擇 HMCL 類型。
 modpack.files.blueprints=BuildCraft 藍圖
 modpack.files.config=Mod 模組設定檔案
 modpack.files.dumps=NEI 調校輸出
@@ -234,7 +248,9 @@ modpack.type.curse.tolerable_error=但未能完成 Curse 整合包文件的下
 modpack.type.curse.error=無法完成 Curse 整合包的下載，請多次重試或設定代理
 modpack.type.curse.not_found=部分必需檔案已經從網路中被刪除並且再也無法下載，請嘗試該整合包的最新版本或者安裝其他整合包。
 modpack.type.hmcl=HMCL
+modpack.type.hmcl.export=可以被 Hello Minecraft! Launcher (HMCL) 導入
 modpack.type.multimc=MultiMC
+modpack.type.multimc.export=可以被 Hello Minecraft! Launcher (HMCL) 和 MultiMC 導入
 modpack.unsupported=不支援該整合包。僅 HMCL、MultiMC、Curse 整合包受支援。
 modpack.update=正在升級整合包
 modpack.wizard=匯出整合包引導
@@ -242,7 +258,8 @@ modpack.wizard.step.1=基本設定
 modpack.wizard.step.1.title=設定整合包的主要訊息
 modpack.wizard.step.2=檔案選擇
 modpack.wizard.step.2.title=選中你想加到整合包中的檔案或資料夾
-modpack.wizard.step.3=整合包描述
+modpack.wizard.step.3=整合包類型
+modpack.wizard.step.3.title=選擇整合包導出類型
 modpack.wizard.step.initialization.exported_version=要匯出的遊戲版本
 modpack.wizard.step.initialization.include_launcher=包含啟動器
 modpack.wizard.step.initialization.save=選擇要匯出到的遊戲整合包位置
@@ -255,7 +272,9 @@ mods.add.success=成功新增模組 %s。
 mods.choose_mod=選擇模組
 mods.enable=啟用
 mods.disable=禁用
+mods.name=名稱
 mods.remove=刪除
+mods.not_modded=你需要先在自動安裝頁面安裝 Fabric、Forge 或 LiteLoader 才能進行模組管理。
 
 datapack=資料包
 datapack.add=添加資料包
@@ -265,6 +284,7 @@ datapack.title=世界 %s - 資料包
 datapack.remove=刪除
 
 world=世界/資料包
+world.add=添加世界
 world.datapack=管理資料包
 world.datapack.1_13=僅 Minecraft 1.13 及之後的版本支持資料包
 world.description=%s. 上一次遊戲時間: %s. 遊戲版本: %s
@@ -281,6 +301,7 @@ world.game_version=遊戲版本
 world.name=世界名稱
 world.name.enter=輸入世界名稱
 world.reveal=打開資料夾
+world.show_all=顯示全部
 world.time=yyyy 年 MM 月 dd 日 HH:mm:ss
 
 profile=遊戲目錄
@@ -368,9 +389,11 @@ settings.type.global.edit=編輯全域遊戲設定
 settings.type.special.enable=啟用遊戲特別設定（不影響其他遊戲版本）
 
 sponsor.bmclapi=請贊助 BMCLAPI 從而獲得穩定高速的下載服務，點擊此處查閱詳細訊息。
-sponsor.hmcl=HMCL 是一個免費、開源的 Minecraft 啟動器，允許玩家方便快捷地安裝、管理、運行遊戲。您的贊助將幫助 HMCL 獲得更好的發展、支持穩定高速的遊戲安裝與文件下載服務。點擊此處查閱更多詳細訊息。
+sponsor.hmcl=Hello Minecraft! Launcher 是一個免費、開源的 Minecraft 啟動器，允許玩家方便快捷地安裝、管理、運行遊戲。您的贊助將幫助 Hello Minecraft! Launcher 獲得更好的發展、支持穩定高速的遊戲安裝與文件下載服務。點擊此處查閱更多詳細訊息。
 
 update=啟動器更新
+update.accept=更新
+update.changelog=更新日誌
 update.channel.dev=更新到開發版
 update.channel.stable=更新到推薦版本
 update.checking=正在檢查更新

HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties

@@ -86,15 +86,16 @@ button.yes=是
 color.recent=推荐
 color.custom=自定义颜色
 
-crash.NoClassDefFound=请确认 HMCL 本体是否完整，或更新您的 Java。
+crash.NoClassDefFound=请确认 Hello Minecraft! Launcher 本体是否完整，或更新您的 Java。
 crash.user_fault=您的系统或 Java 环境可能安装不当导致本软件崩溃，请检查您的 Java 环境或您的电脑！可以尝试重新安装 Java。
 
 download=下载
+download.code.404=远程服务器不包含需要下载的文件
 download.failed=下载失败
 download.failed.empty=没有可供安装的版本，点击此处返回。
 download.failed.refresh=加载版本列表失败，点击此处重试。
 download.provider.bmclapi=BMCLAPI（bangbang93，https://bmclapi2.bangbang93.com/）
-download.provider.mojang=官方（Mojang）
+download.provider.mojang=官方（Forge 和 OptiFine 自动安装使用 BMCLAPI 下载源）
 
 extension.bat=Windows 脚本
 extension.mod=模组文件
@@ -102,10 +103,10 @@ extension.png=图片文件
 extension.sh=Bash 脚本
 
 fatal.missing_javafx=JavaFX 缺失。\n如果您使用的是 Java 11 或更高版本，请降级到 Java 8 或 10。\n如果您使用的是 OpenJDK，请确保其包含 OpenJFX。
-fatal.missing_dst_root_ca_x3=当前 Java 平台缺少 DST Root CA X3 证书。\n您依然可以使用 HMCL，但将无法连接到部分站点（如使用 Lets Encrypt 证书的站点），这可能会使 HMCL 无法正常工作。\n请将您的 Java 升级到 8u101 以上以解决此问题。
-fatal.config_loading_failure=HMCL 无法加载配置文件。\n请确保 HMCL 对 "%s" 目录及该目录下的文件拥有读写权限。
-fatal.migration_requires_manual_reboot=HMCL 即将完成升级，请重新打开 HMCL。
-fatal.apply_update_failure=我们很抱歉 HMCL 无法自动完成升级，因为出现了一些问题。\n但你依然可以从 %s 处手动下载 HMCL 来完成升级。\n请考虑向我们反馈该问题。
+fatal.missing_dst_root_ca_x3=当前 Java 平台缺少 DST Root CA X3 证书。\n您依然可以使用 Hello Minecraft! Launcher，但将无法连接到部分站点（如使用 Lets Encrypt 证书的站点），这可能会使 HMCL 无法正常工作。\n请将您的 Java 升级到 8u101 以上以解决此问题。
+fatal.config_loading_failure=Hello Minecraft! Launcher 无法加载配置文件。\n请确保 Hello Minecraft! Launcher 对 "%s" 目录及该目录下的文件拥有读写权限。
+fatal.migration_requires_manual_reboot=Hello Minecraft! Launcher 即将完成升级，请重新打开 Hello Minecraft! Launcher。
+fatal.apply_update_failure=我们很抱歉 Hello Minecraft! Launcher 无法自动完成升级，因为出现了一些问题。\n但你依然可以从 %s 处手动下载 Hello Minecraft! Launcher 来完成升级。\n请考虑向我们反馈该问题。
 
 folder.config=配置文件夹
 folder.game=游戏文件夹
@@ -114,7 +115,7 @@ folder.resourcepacks=资源包文件夹
 folder.saves=存档文件夹
 folder.screenshots=截图文件夹
 
-help=HMCL 帮助文档
+help=Hello Minecraft! Launcher 帮助文档
 help.detail=可查阅数据包、整合包制作指南等内容。
 
 input.email=用户名必须是邮箱
@@ -123,13 +124,25 @@ input.not_empty=必填项
 input.url=必须是合法的链接
 
 install=添加游戏
+install.change_version=更换版本
+install.change_version.confirm=你确定要将 %s 从 %s 更新到 %s 吗？
 install.failed=安装失败
 install.failed.downloading=安装失败，部分文件未能完成下载
 install.failed.downloading.detail=未能下载文件：%s
+install.failed.downloading.timeout=下载超时：%s
+install.failed.install_online=无法识别要安装的软件
+install.failed.optifine_conflict=暂不支持 OptiFine, Fabric 与 Forge 同时安装在 Minecraft 1.13 及以上版本
+install.failed.version_mismatch=该软件需要的游戏版本为 %s，但实际的游戏版本为 %s。
 install.installer.choose=选择 %s 版本
+install.installer.fabric=Fabric
 install.installer.forge=Forge
 install.installer.game=游戏
 install.installer.install=安装 %s
+install.installer.install_offline=从本地文件安装/升级
+install.installer.install_offline.extension=Forge/OptiFine 安装器
+install.installer.install_offline.tooltip=支持导入已经下载好的 Forge/OptiFine 安装器
+install.installer.install_online=在线安装
+install.installer.install_online.tooltip=支持安装 Fabric、Forge、OptiFine、LiteLoader
 install.installer.liteloader=LiteLoader
 install.installer.not_installed=暂不安装 %s，可以点击此处安装
 install.installer.optifine=OptiFine
@@ -138,6 +151,7 @@ install.modpack=安装整合包
 install.new_game=安装新游戏版本
 install.new_game.already_exists=此版本已经存在，请换一个名字
 install.new_game.current_game_version=当前游戏版本
+install.new_game.malformed=名字不合法
 install.select=请选择安装方式
 install.success=安装成功
 
@@ -193,7 +207,7 @@ main_page=主页
 
 message.confirm=提示
 message.doing=请耐心等待
-message.downloading=正在下载...
+message.downloading=正在下载
 message.error=错误
 message.info=提示
 message.success=已完成
@@ -205,6 +219,7 @@ modpack.choose=选择要安装的游戏整合包文件
 modpack.desc=描述你要制作的整合包，比如整合包注意事项和更新记录，支持 Markdown（图片请用网络图）。
 modpack.enter_name=给游戏起个你喜欢的名字
 modpack.export=导出整合包
+modpack.export.as=请选择整合包类型。若你无法决定，请选择 HMCL 类型。
 modpack.files.blueprints=BuildCraft 蓝图
 modpack.files.config=Mod 配置文件
 modpack.files.dumps=NEI 调试输出
@@ -234,7 +249,9 @@ modpack.type.curse.tolerable_error=但未能完成 Curse 整合包文件的下
 modpack.type.curse.error=未能完成 Curse 整合包的下载，请多次重试或设置代理
 modpack.type.curse.not_found=部分必需文件已经在网络中被删除并且再也无法下载，请尝试该整合包的最新版本或者安装其他整合包。
 modpack.type.hmcl=HMCL
+modpack.type.hmcl.export=可以被 Hello Minecraft! Launcher (HMCL) 导入
 modpack.type.multimc=MultiMC
+modpack.type.multimc.export=可以被 Hello Minecraft! Launcher (HMCL) 和 MultiMC 导入
 modpack.unsupported=该整合包不被支持。仅 HMCL、MultiMC、Curse 整合包受支持。
 modpack.update=正在升级整合包
 modpack.wizard=导出整合包向导
@@ -242,7 +259,8 @@ modpack.wizard.step.1=基本设置
 modpack.wizard.step.1.title=设置整合包的主要信息
 modpack.wizard.step.2=文件选择
 modpack.wizard.step.2.title=选中你想加到整合包中的文件或文件夹
-modpack.wizard.step.3=整合包描述
+modpack.wizard.step.3=整合包类型
+modpack.wizard.step.3.title=选择整合包导出类型
 modpack.wizard.step.initialization.exported_version=要导出的游戏版本
 modpack.wizard.step.initialization.include_launcher=包含启动器
 modpack.wizard.step.initialization.save=选择要导出到的游戏整合包位置
@@ -255,7 +273,9 @@ mods.add.success=成功添加模组 %s。
 mods.choose_mod=选择模组
 mods.enable=启用
 mods.disable=禁用
+mods.name=名称
 mods.remove=删除
+mods.not_modded=你需要先在自动安装页面安装 Fabric、Forge 或 LiteLoader 才能进行模组管理。
 
 datapack=数据包
 datapack.add=添加数据包
@@ -265,6 +285,7 @@ datapack.title=世界 %s - 数据包
 datapack.remove=删除
 
 world=世界/数据包
+world.add=添加世界
 world.datapack=管理数据包
 world.datapack.1_13=仅 Minecraft 1.13 及之后的版本支持数据包
 world.description=%s. 上一次游戏时间: %s. 游戏版本: %s
@@ -281,6 +302,7 @@ world.import.invalid=无法识别的存档压缩包
 world.name=世界名称
 world.name.enter=输入世界名称
 world.reveal=打开文件夹
+world.show_all=显示全部
 world.time=yyyy 年 MM 月 dd 日 HH:mm:ss
 
 profile=游戏目录
@@ -368,9 +390,11 @@ settings.type.global.edit=编辑全局版本设置
 settings.type.special.enable=启用游戏特定设置（不影响其他游戏版本）
 
 sponsor.bmclapi=请赞助 BMCLAPI 从而获得稳定高速的下载服务，点击此处查阅详细信息。
-sponsor.hmcl=HMCL 是一个免费、开源的 Minecraft 启动器，允许玩家方便快捷地安装、管理、运行游戏。您的赞助将帮助 HMCL 获得更好的发展、支持稳定高速的游戏安装与文件下载服务。点击此处查阅更多详细信息。
+sponsor.hmcl=Hello Minecraft! Launcher 是一个免费、开源的 Minecraft 启动器，允许玩家方便快捷地安装、管理、运行游戏。您的赞助将帮助 Hello Minecraft! Launcher 获得更好的发展、支持稳定高速的游戏安装与文件下载服务。点击此处查阅更多详细信息。
 
 update=启动器更新
+update.accept=更新
+update.changelog=更新日志
 update.channel.dev=更新到开发版
 update.channel.stable=更新到推荐版本
 update.checking=正在检查更新

HMCL/src/main/resources/assets/log-window-content.html

@@ -47,7 +47,7 @@
         .trace { background-color: blue; }
     </style>
     <script>
-        var colors = ["fatal", "error", "warn", "info", "debug", "trace"]
+        var colors = ["fatal", "error", "warn", "info", "debug", "trace"];
         var limitedLogs = 100;
         function appendLog(log, level) {
             var e = document.createElement("div");
@@ -78,13 +78,13 @@
                 redisplay(c[i]);
         }
         function redisplay(div) {
-            var flag = false
+            var flag = false;
             for (var j = 0; j < colors.length; ++j) {
-                if (div.className == colors[j]) {
+                if (div.className === colors[j]) {
                     flag = true;
                     break;
                 }
-                div.hidden = div.className != colors[j];
+                div.hidden = div.className !== colors[j];
             }
             div.hidden = !flag;
         }

HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorAccountFactory.java

@@ -23,8 +23,11 @@ import org.jackhuang.hmcl.auth.CharacterSelector;
 import org.jackhuang.hmcl.auth.yggdrasil.CompleteGameProfile;
 import org.jackhuang.hmcl.auth.yggdrasil.GameProfile;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilSession;
+import org.jackhuang.hmcl.util.javafx.ObservableOptionalCache;
+
 import java.util.Map;
 import java.util.Objects;
+import java.util.UUID;
 import java.util.function.Function;
 
 import static org.jackhuang.hmcl.util.Lang.tryCast;
@@ -70,7 +73,9 @@ public class AuthlibInjectorAccountFactory extends AccountFactory<AuthlibInjecto
                     @SuppressWarnings("unchecked")
                     Map<String, String> properties = it;
                     GameProfile selected = session.getSelectedProfile();
-                    server.getYggdrasilService().getProfileRepository().put(selected.getId(), new CompleteGameProfile(selected, properties));
+                    ObservableOptionalCache<UUID, CompleteGameProfile, AuthenticationException> profileRepository = server.getYggdrasilService().getProfileRepository();
+                    profileRepository.put(selected.getId(), new CompleteGameProfile(selected, properties));
+                    profileRepository.invalidate(selected.getId());
                 });
 
         return new AuthlibInjectorAccount(server, downloader, username, session);