no longer force using javaw

Fix #586

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

@@ -158,9 +158,11 @@ public class HMCLGameRepository extends DefaultGameRepository {
         File iconFile = getVersionIconFile(id);
         if (iconFile.exists())
             return new Image("file:" + iconFile.getAbsolutePath());
-        else if ("net.minecraft.launchwrapper.Launch".equals(version.getMainClass())
-                || version.getMainClass().startsWith("net.fabricmc")
-                || "cpw.mods.modlauncher.Launcher".equals(version.getMainClass()))
+        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 newImage("/assets/img/grass.png");

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;
@@ -30,7 +31,7 @@ import java.util.List;
 /**
  * Export the game to a mod pack file.
  */
-public class HMCLModpackExportTask extends Task {
+public class HMCLModpackExportTask extends Task<Void> {
     private final DefaultGameRepository repository;
     private final String version;
     private final List<String> whitelist;
@@ -55,7 +56,7 @@ public class HMCLModpackExportTask extends Task {
 
     @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");

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

@@ -20,7 +20,6 @@ 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.mod.MinecraftInstanceTask;
 import org.jackhuang.hmcl.mod.Modpack;
 import org.jackhuang.hmcl.mod.ModpackConfiguration;
@@ -36,13 +35,13 @@ import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
 
-public final class HMCLModpackInstallTask extends Task {
+public final class HMCLModpackInstallTask extends Task<Void> {
     private final File zipFile;
     private final String name;
     private final HMCLGameRepository repository;
     private final Modpack modpack;
-    private final List<Task> dependencies = new LinkedList<>();
-    private final List<Task> dependents = new LinkedList<>();
+    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();
@@ -77,12 +76,12 @@ public final class HMCLModpackInstallTask extends Task {
     }
 
     @Override
-    public List<Task> getDependencies() {
+    public List<Task<?>> getDependencies() {
         return dependencies;
     }
 
     @Override
-    public List<Task> getDependents() {
+    public List<Task<?>> getDependents() {
         return dependents;
     }
 
@@ -90,7 +89,7 @@ public final class HMCLModpackInstallTask extends Task {
     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));
+        dependencies.add(repository.save(version));
         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

@@ -27,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;
@@ -56,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;
@@ -103,7 +115,7 @@ public final class LauncherHelper {
             try {
                 checkGameState(profile, setting, version, () -> {
                     Controllers.dialog(launchingStepsPane);
-                    Schedulers.newThread().schedule(this::launch0);
+                    Schedulers.newThread().execute(this::launch0);
                 });
             } catch (InterruptedException ignore) {
             }
@@ -119,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.of(Schedulers.javafx(), () -> emitStatus(LoadingState.DEPENDENCIES))
-                .then(() -> {
+        TaskExecutor executor = Task.runAsync(Schedulers.javafx(), () -> emitStatus(LoadingState.DEPENDENCIES))
+                .thenComposeAsync(() -> {
                     if (setting.isNotCheckGame())
                         return null;
                     else
                         return dependencyManager.checkGameCompletionAsync(version);
                 })
-                .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.MODS)))
-                .then(() -> {
+                .thenRunAsync(Schedulers.javafx(), () -> emitStatus(LoadingState.MODS))
+                .thenComposeAsync(() -> {
                     try {
                         ModpackConfiguration<?> configuration = ModpackHelper.readModpackConfiguration(repository.getModpackConfiguration(selectedVersion));
                         if ("Curse".equals(configuration.getType()))
@@ -141,8 +153,8 @@ public final class LauncherHelper {
                         return null;
                     }
                 })
-                .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.LOGGING_IN)))
-                .thenCompose(() -> Task.ofResult(i18n("account.methods"), () -> {
+                .thenRunAsync(Schedulers.javafx(), () -> emitStatus(LoadingState.LOGGING_IN))
+                .thenSupplyAsync(i18n("account.methods"), () -> {
                     try {
                         return account.logIn();
                     } catch (CredentialExpiredException e) {
@@ -152,21 +164,21 @@ public final class LauncherHelper {
                         LOG.warning("Authentication failed, try playing offline: " + e);
                         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, setting, gameVersion.isPresent())
+                                : 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 {
@@ -176,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)
@@ -200,7 +212,7 @@ public final class LauncherHelper {
             final AtomicInteger finished = new AtomicInteger(0);
 
             @Override
-            public void onFinished(Task task) {
+            public void onFinished(Task<?> task) {
                 finished.incrementAndGet();
                 int runningTasks = executor.getRunningTasks();
                 Platform.runLater(() -> launchingStepsPane.setProgress(1.0 * finished.get() / runningTasks));
@@ -214,7 +226,7 @@ public final class LauncherHelper {
                         // because onStop will be invoked if tasks fail when the executor service shut down.
                         if (!Controllers.isStopped()) {
                             launchingStepsPane.fireEvent(new DialogCloseEvent());
-                            Exception ex = executor.getLastException();
+                            Exception ex = executor.getException();
                             if (ex != null) {
                                 String message;
                                 if (ex instanceof CurseCompletionException) {
@@ -420,7 +432,7 @@ public final class LauncherHelper {
         }
     }
 
-    private static class LaunchTask<T> extends TaskResult<T> {
+    private static class LaunchTask<T> extends Task<T> {
         private final ExceptionalSupplier<T, Exception> supplier;
 
         public LaunchTask(ExceptionalSupplier<T, Exception> supplier) {
@@ -440,7 +452,6 @@ public final class LauncherHelper {
      */
     class HMCLProcessListener implements ProcessListener {
 
-        private final VersionSetting setting;
         private final Map<String, String> forbiddenTokens;
         private ManagedProcess process;
         private boolean lwjgl;
@@ -449,8 +460,7 @@ public final class LauncherHelper {
         private final LinkedList<Pair<String, Log4jLevel>> logs;
         private final CountDownLatch latch = new CountDownLatch(1);
 
-        public HMCLProcessListener(AuthInfo authInfo, VersionSetting setting, boolean detectWindow) {
-            this.setting = setting;
+        public HMCLProcessListener(AuthInfo authInfo, boolean detectWindow) {
             this.detectWindow = detectWindow;
 
             if (authInfo == null)

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;
@@ -86,7 +91,7 @@ public final class ModpackHelper {
             throw new UnsupportedModpackException();
     }
 
-    public static Task getInstallTask(Profile profile, File zipFile, String name, Modpack modpack) {
+    public static Task<Void> getInstallTask(Profile profile, File zipFile, String name, Modpack modpack) {
         profile.getRepository().markVersionAsModpack(name);
 
         ExceptionalRunnable<?> success = () -> {
@@ -117,11 +122,11 @@ 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)
-                    .then(new MultiMCInstallVersionSettingTask(profile, ((MultiMCInstanceConfiguration) modpack.getManifest()), name));
+                    .thenComposeAsync(new MultiMCInstallVersionSettingTask(profile, ((MultiMCInstanceConfiguration) modpack.getManifest()), name));
         else throw new IllegalStateException("Unrecognized modpack: " + modpack);
     }
 
-    public static Task getUpdateTask(Profile profile, File zipFile, Charset charset, String name, ModpackConfiguration<?> configuration) throws UnsupportedModpackException, MismatchedModpackTypeException {
+    public static Task<Void> getUpdateTask(Profile profile, File zipFile, Charset charset, String name, ModpackConfiguration<?> configuration) throws UnsupportedModpackException, MismatchedModpackTypeException {
         Modpack modpack = ModpackHelper.readModpackManifest(zipFile.toPath(), charset);
 
         switch (configuration.getType()) {

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

@@ -17,16 +17,15 @@
  */
 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.Scheduler;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 
 import java.util.Objects;
 
-public final class MultiMCInstallVersionSettingTask extends Task {
+public final class MultiMCInstallVersionSettingTask extends Task<Void> {
     private final Profile profile;
     private final MultiMCInstanceConfiguration manifest;
     private final String version;
@@ -35,11 +34,8 @@ public final class MultiMCInstallVersionSettingTask extends Task {
         this.profile = profile;
         this.manifest = manifest;
         this.version = version;
-    }
 
-    @Override
-    public Scheduler getScheduler() {
-        return Schedulers.javafx();
+        setExecutor(Schedulers.javafx());
     }
 
     @Override

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

@@ -197,7 +197,7 @@ public final class Accounts {
 
         Account selected = selectedAccount.get();
         if (selected != null) {
-            Schedulers.io().schedule(() -> {
+            Schedulers.io().execute(() -> {
                 try {
                     selected.logIn();
                 } catch (AuthenticationException e) {
@@ -209,7 +209,7 @@ public final class Accounts {
         for (AuthlibInjectorServer server : config().getAuthlibInjectorServers()) {
             if (selected instanceof AuthlibInjectorAccount && ((AuthlibInjectorAccount) selected).getServer() == server)
                 continue;
-            Schedulers.io().schedule(() -> {
+            Schedulers.io().execute(() -> {
                 try {
                     server.fetchMetadataResponse();
                 } catch (IOException e) {

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

@@ -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/VersionSetting.java

@@ -537,6 +537,7 @@ public final class VersionSetting {
                 .setGameDir(gameDir)
                 .setJava(javaVersion)
                 .setVersionName(Metadata.TITLE)
+                .setVersionType(Metadata.TITLE)
                 .setProfileName(Metadata.TITLE)
                 .setMinecraftArgs(getMinecraftArgs())
                 .setJavaArgs(getJavaArgs())
@@ -595,7 +596,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

@@ -208,7 +208,7 @@ public final class Controllers {
             dialog(i18n("launcher.cache_directory.invalid"));
         }
 
-        Task.of(JavaVersion::initialize).start();
+        Task.runAsync(JavaVersion::initialize).start();
 
         scene = new Scene(decorator.getDecorator(), 800, 519);
         scene.getStylesheets().setAll(config().getTheme().getStylesheets());

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

@@ -397,7 +397,7 @@ public final class FXUtils {
      */
     @SuppressWarnings("unchecked")
     @Deprecated
-    public static void bindEnum(JFXComboBox<?> comboBox, Property<? extends Enum> property) {
+    public static void bindEnum(JFXComboBox<?> comboBox, Property<? extends Enum<?>> property) {
         unbindEnum(comboBox);
         ChangeListener<Number> listener = (a, b, newValue) ->
                 ((Property) property).setValue(property.getValue().getClass().getEnumConstants()[newValue.intValue()]);

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

@@ -20,6 +20,7 @@ package org.jackhuang.hmcl.ui;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.effects.JFXDepthManager;
 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;
@@ -40,11 +41,16 @@ public class InstallerItem extends BorderPane {
         setStyle("-fx-background-radius: 2; -fx-background-color: white; -fx-padding: 8;");
         JFXDepthManager.setDepth(this, 1);
 
-        {
+        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);
         }
 
         {

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

@@ -18,7 +18,6 @@
 package org.jackhuang.hmcl.ui;
 
 import javafx.application.Platform;
-import javafx.scene.layout.Region;
 import org.jackhuang.hmcl.event.EventBus;
 import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
 import org.jackhuang.hmcl.game.HMCLGameRepository;
@@ -28,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;
@@ -39,7 +37,6 @@ 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;
@@ -118,11 +115,11 @@ public final class LeftPaneController extends AdvancedListBox {
                 if (repository.getVersionCount() == 0) {
                     File modpackFile = new File("modpack.zip").getAbsoluteFile();
                     if (modpackFile.exists()) {
-                        Task.ofResult(() -> CompressingUtils.findSuitableEncoding(modpackFile.toPath()))
-                                .thenApply(encoding -> ModpackHelper.readModpackManifest(modpackFile.toPath(), encoding))
-                                .thenApply(modpack -> ModpackHelper.getInstallTask(repository.getProfile(), modpackFile, modpack.getName(), modpack)
-                                            .with(Task.of(Schedulers.javafx(), this::checkAccount)).executor())
-                                .thenAccept(Schedulers.javafx(), executor -> {
+                        Task.supplyAsync(() -> CompressingUtils.findSuitableEncoding(modpackFile.toPath()))
+                                .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/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;
@@ -33,7 +38,6 @@ import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
-import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
 import javafx.util.Duration;
 import org.jackhuang.hmcl.setting.Profile;
@@ -114,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/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/account/AccountLoginPane.java

@@ -61,7 +61,7 @@ public class AccountLoginPane extends StackPane {
         String password = txtPassword.getText();
         progressBar.setVisible(true);
         lblCreationWarning.setText("");
-        Task.ofResult(() -> oldAccount.logInWithPassword(password))
+        Task.supplyAsync(() -> oldAccount.logInWithPassword(password))
                 .whenComplete(Schedulers.javafx(), authInfo -> {
                     success.accept(authInfo);
                     fireEvent(new DialogCloseEvent());

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

@@ -77,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");
@@ -197,7 +197,7 @@ public class AddAccountPane extends StackPane {
         AccountFactory<?> factory = cboType.getSelectionModel().getSelectedItem();
         Object additionalData = getAuthAdditionalData();
 
-        Task.ofResult(() -> factory.create(new Selector(), username, password, additionalData))
+        Task.supplyAsync(() -> factory.create(new Selector(), username, password, additionalData))
                 .whenComplete(Schedulers.javafx(), account -> {
                     int oldIndex = Accounts.getAccounts().indexOf(account);
                     if (oldIndex == -1) {

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

@@ -104,13 +104,13 @@ public class AddAuthlibInjectorServerPane extends StackPane implements DialogAwa
         nextPane.showSpinner();
         addServerPane.setDisable(true);
 
-        Task.of(() -> {
+        Task.runAsync(() -> {
             serverBeingAdded = AuthlibInjectorServer.locateServer(url);
-        }).whenComplete(Schedulers.javafx(), (isDependentSucceeded, exception) -> {
+        }).whenComplete(Schedulers.javafx(), exception -> {
             addServerPane.setDisable(false);
             nextPane.hideSpinner();
 
-            if (isDependentSucceeded) {
+            if (exception == null) {
                 lblServerName.setText(serverBeingAdded.getName());
                 lblServerUrl.setText(serverBeingAdded.getUrl());
 

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

@@ -21,10 +21,6 @@ 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;
@@ -32,8 +28,6 @@ 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 ListPage<AuthlibInjectorServerItem> implements DecoratorPage {

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

@@ -17,7 +17,6 @@
  */
 package org.jackhuang.hmcl.ui.construct;
 
-import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;

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

@@ -75,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;

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/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;
@@ -42,7 +48,7 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class TaskListPane extends StackPane {
     private final AdvancedListBox listBox = new AdvancedListBox();
-    private final Map<Task, ProgressListNode> nodes = new HashMap<>();
+    private final Map<Task<?>, ProgressListNode> nodes = new HashMap<>();
     private final ReadOnlyIntegerWrapper finishedTasks = new ReadOnlyIntegerWrapper();
     private final ReadOnlyIntegerWrapper totTasks = new ReadOnlyIntegerWrapper();
 
@@ -72,17 +78,19 @@ public final class TaskListPane extends StackPane {
             }
 
             @Override
-            public void onReady(Task task) {
+            public void onReady(Task<?> task) {
                 Platform.runLater(() -> totTasks.set(totTasks.getValue() + 1));
             }
 
             @Override
-            public void onRunning(Task task) {
+            public void onRunning(Task<?> task) {
                 if (!task.getSignificance().shouldShow())
                     return;
 
                 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) {
@@ -113,7 +121,7 @@ public final class TaskListPane extends StackPane {
             }
 
             @Override
-            public void onFinished(Task task) {
+            public void onFinished(Task<?> task) {
                 ProgressListNode node = nodes.remove(task);
                 if (node == null)
                     return;
@@ -125,7 +133,7 @@ public final class TaskListPane extends StackPane {
             }
 
             @Override
-            public void onFailed(Task task, Throwable throwable) {
+            public void onFailed(Task<?> task, Throwable throwable) {
                 ProgressListNode node = nodes.remove(task);
                 if (node == null)
                     return;
@@ -142,7 +150,7 @@ public final class TaskListPane extends StackPane {
         private final Label title = new Label();
         private final Label state = new Label();
 
-        public ProgressListNode(Task task) {
+        public ProgressListNode(Task<?> task) {
             bar.progressProperty().bind(task.progressProperty());
             title.setText(task.getName());
             state.textProperty().bind(task.messageProperty());

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

@@ -21,7 +21,6 @@ import com.jfoenix.controls.JFXButton;
 import com.jfoenix.svg.SVGGlyph;
 import javafx.beans.binding.Bindings;
 import javafx.collections.ListChangeListener;
-import javafx.geometry.BoundingBox;
 import javafx.geometry.Bounds;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
@@ -56,7 +55,6 @@ public class DecoratorSkin extends SkinBase<Decorator> {
 
     private double xOffset, yOffset, newX, newY, initX, initY;
     private boolean allowMove, isDragging;
-    private BoundingBox originalBox, maximizedBox;
 
     /**
      * Constructor for all SkinBase instances.
@@ -125,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,29 @@ 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")));
+        JFXButton[] buttons = new JFXButton[]{btnFabric, btnForge, btnLiteLoader, btnOptiFine};
+        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];
+            buttons[i].setDisable(versions[i] != null);
+            if (versions[i] != null || controller.getSettings().containsKey(libraryId))
+                labels[i].setText(i18n("install.installer.version", i18n("install.installer." + libraryId)) + ": " + Lang.nonNull(versions[i], 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);
     }
-
-    public static final String INSTALLER_TYPE = "INSTALLER_TYPE";
 }

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

@@ -19,17 +19,14 @@ package org.jackhuang.hmcl.ui.download;
 
 import javafx.scene.Node;
 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.game.LibraryDownloadException;
 import org.jackhuang.hmcl.download.optifine.OptiFineInstallTask;
-import org.jackhuang.hmcl.game.Library;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.task.DownloadException;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.task.TaskResult;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
@@ -41,26 +38,17 @@ import org.jackhuang.hmcl.util.io.ResponseCodeException;
 import java.net.SocketTimeoutException;
 import java.util.Map;
 
-import static org.jackhuang.hmcl.download.LibraryAnalyzer.LibraryType.*;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 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.get(FORGE).map(Library::getVersion).orElse(null);
-        liteLoader = analyzer.get(LITELOADER).map(Library::getVersion).orElse(null);
-        optiFine = analyzer.get(OPTIFINE).map(Library::getVersion).orElse(null);
     }
 
     public Profile getProfile() {
@@ -75,18 +63,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) {
     }
@@ -96,18 +72,14 @@ public final class InstallerWizardProvider implements WizardProvider {
         settings.put("success_message", i18n("install.success"));
         settings.put("failure_callback", (FailureCallback) (settings1, exception, next) -> alertFailureMessage(exception, next));
 
-        TaskResult<Version> ret = Task.ofResult(() -> version);
+        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.then(profile.getRepository().refreshVersionsAsync());
+        return ret.thenComposeAsync(profile.getRepository().refreshVersionsAsync());
     }
 
     @Override

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

@@ -42,6 +42,9 @@ public class InstallersPage extends StackPane implements WizardPage {
     @FXML
     private VBox list;
 
+    @FXML
+    private JFXButton btnFabric;
+
     @FXML
     private JFXButton btnForge;
 
@@ -54,6 +57,9 @@ public class InstallersPage extends StackPane implements WizardPage {
     @FXML
     private Label lblGameVersion;
 
+    @FXML
+    private Label lblFabric;
+
     @FXML
     private Label lblForge;
 
@@ -81,20 +87,14 @@ public class InstallersPage extends StackPane implements WizardPage {
         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 +109,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 +131,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;
@@ -71,7 +71,7 @@ public class ModpackInstallWizardProvider implements WizardProvider {
         settings.put(PROFILE, profile);
     }
 
-    private Task finishModpackInstallingAsync(Map<String, Object> settings) {
+    private Task<Void> finishModpackInstallingAsync(Map<String, Object> settings) {
         if (!settings.containsKey(ModpackPage.MODPACK_FILE))
             return null;
 
@@ -93,7 +93,7 @@ public class ModpackInstallWizardProvider implements WizardProvider {
             return null;
         } else {
             return ModpackHelper.getInstallTask(profile, selected, name, modpack)
-                    .then(Task.of(Schedulers.javafx(), () -> profile.setSelectedVersion(name)));
+                    .thenRunAsync(Schedulers.javafx(), () -> profile.setSelectedVersion(name));
         }
     }
 

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

@@ -109,8 +109,8 @@ public final class ModpackPage extends StackPane implements WizardPage {
         }
 
         spinnerPane.showSpinner();
-        Task.ofResult(() -> CompressingUtils.findSuitableEncoding(selectedFile.toPath()))
-                .thenApply(encoding -> manifest = ModpackHelper.readModpackManifest(selectedFile.toPath(), encoding))
+        Task.supplyAsync(() -> CompressingUtils.findSuitableEncoding(selectedFile.toPath()))
+                .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

@@ -19,16 +19,14 @@ package org.jackhuang.hmcl.ui.download;
 
 import javafx.scene.Node;
 import org.jackhuang.hmcl.download.DownloadProvider;
-import org.jackhuang.hmcl.download.MaintainTask;
 import org.jackhuang.hmcl.download.RemoteVersion;
-import org.jackhuang.hmcl.game.Library;
 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.LinkedList;
 import java.util.Map;
 
 import static org.jackhuang.hmcl.ui.download.InstallerWizardProvider.alertFailureMessage;
@@ -39,14 +37,14 @@ public final class UpdateInstallerWizardProvider implements WizardProvider {
     private final String gameVersion;
     private final Version version;
     private final String libraryId;
-    private final Library oldLibrary;
+    private final String oldLibraryVersion;
 
-    public UpdateInstallerWizardProvider(Profile profile, String gameVersion, Version version, String libraryId, Library oldLibrary) {
+    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.oldLibrary = oldLibrary;
+        this.oldLibraryVersion = oldLibraryVersion;
     }
 
     @Override
@@ -60,11 +58,9 @@ public final class UpdateInstallerWizardProvider implements WizardProvider {
 
         // We remove library but not save it,
         // so if installation failed will not break down current version.
-        LinkedList<Library> newList = new LinkedList<>(version.getLibraries());
-        newList.remove(oldLibrary);
-        return new MaintainTask(version.setLibraries(newList))
-                .thenCompose(profile.getDependency().installLibraryAsync((RemoteVersion) settings.get(libraryId)))
-                .then(profile.getRepository().refreshVersionsAsync());
+        return profile.getDependency().removeLibraryWithoutSavingAsync(version.getId(), libraryId)
+                .thenComposeAsync(profile.getDependency().installLibraryAsync((RemoteVersion) settings.get(libraryId)))
+                .thenComposeAsync(profile.getRepository().refreshVersionsAsync());
     }
 
     @Override
@@ -73,7 +69,7 @@ public final class UpdateInstallerWizardProvider implements WizardProvider {
         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), oldLibrary.getVersion(), ((RemoteVersion) settings.get(libraryId)).getSelfVersion()),
+                    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:

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

@@ -43,24 +43,19 @@ public final class VanillaInstallWizardProvider implements WizardProvider {
         settings.put(PROFILE, profile);
     }
 
-    private Task finishVersionDownloadingAsync(Map<String, Object> settings) {
+    private Task<Void> finishVersionDownloadingAsync(Map<String, Object> settings) {
         GameBuilder builder = profile.getDependency().gameBuilder();
 
         String name = (String) settings.get("name");
         builder.name(name);
         builder.gameVersion(((RemoteVersion) settings.get("game")).getGameVersion());
 
-        if (settings.containsKey("forge"))
-            builder.version((RemoteVersion) settings.get("forge"));
+        for (Map.Entry<String, Object> entry : settings.entrySet())
+            if (!"game".equals(entry.getKey()) && entry.getValue() instanceof RemoteVersion)
+                builder.version((RemoteVersion) entry.getValue());
 
-        if (settings.containsKey("liteloader"))
-            builder.version((RemoteVersion) settings.get("liteloader"));
-
-        if (settings.containsKey("optifine"))
-            builder.version((RemoteVersion) settings.get("optifine"));
-
-        return builder.buildAsync().whenComplete((a, b) -> profile.getRepository().refreshVersions())
-                .then(Task.of(Schedulers.javafx(), () -> profile.setSelectedVersion(name)));
+        return builder.buildAsync().whenComplete(any -> profile.getRepository().refreshVersions())
+                .thenRunAsync(Schedulers.javafx(), () -> profile.setSelectedVersion(name));
     }
 
     @Override

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

@@ -128,8 +128,8 @@ public final class VersionsPage extends BorderPane implements WizardPage, Refres
     @Override
     public void refresh() {
         transitionHandler.setContent(spinner, ContainerAnimations.FADE.getAnimationProducer());
-        executor = versionList.refreshAsync(gameVersion, downloadProvider).whenComplete((isDependentSucceeded, exception) -> {
-            if (isDependentSucceeded) {
+        executor = versionList.refreshAsync(gameVersion, downloadProvider).whenComplete(exception -> {
+            if (exception == null) {
                 List<VersionsPageItem> items = loadVersions();
 
                 Platform.runLater(() -> {

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);
-        List<File> launcherJar = Launcher.getCurrentJarFiles();
-        boolean includeLauncher = (Boolean) settings.get(ModpackInfoPage.MODPACK_INCLUDE_LAUNCHER) && launcherJar != null;
+        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);
 
-        return new Task() {
-            Task dependency = null;
+        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 = 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.then(Task.of(() -> {
+                    dependency = dependency.thenRunAsync(() -> {
                         try (Zipper zip = new Zipper(modpackFile.toPath())) {
                             Config exported = new Config();
 
@@ -109,12 +123,55 @@ public final class ExportWizardProvider implements WizardProvider {
                             for (File jar : launcherJar)
                                 zip.putFile(jar, jar.getName());
                         }
-                    }));
+                    });
                 }
             }
 
             @Override
-            public Collection<? extends Task> getDependencies() {
+            public Collection<Task<?>> getDependencies() {
+                return Collections.singleton(dependency);
+            }
+        };
+    }
+
+    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);
             }
         };
@@ -124,7 +181,8 @@ public final class ExportWizardProvider implements WizardProvider {
     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;
@@ -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 <[email protected]> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.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/ProfilePage.java

@@ -26,11 +26,9 @@ import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.fxml.FXML;
-import javafx.scene.Node;
 import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
-import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.construct.FileItem;
 import org.jackhuang.hmcl.ui.construct.PageCloseEvent;
@@ -38,7 +36,6 @@ import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
 import org.jackhuang.hmcl.util.StringUtils;
 
 import java.io.File;
-import java.nio.file.Paths;
 import java.util.Optional;
 
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

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

@@ -60,17 +60,18 @@ public class DatapackListPage extends ListPageBase<DatapackListPageSkin.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);
-                }
-            });
-        }, this::refresh);
+        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
@@ -80,8 +81,8 @@ public class DatapackListPage extends ListPageBase<DatapackListPageSkin.Datapack
 
     public void refresh() {
         setLoading(true);
-        Task.of(datapack::loadFromDir)
-                .with(Task.of(Schedulers.javafx(), () -> setLoading(false)))
+        Task.runAsync(datapack::loadFromDir)
+                .withRunAsync(Schedulers.javafx(), () -> setLoading(false))
                 .start();
     }
 
@@ -97,15 +98,7 @@ public class DatapackListPage extends ListPageBase<DatapackListPageSkin.Datapack
         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();
     }

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

@@ -18,25 +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 static org.jackhuang.hmcl.download.LibraryAnalyzer.LibraryType.*;
+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);
@@ -52,13 +56,19 @@ 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.get(FORGE).ifPresent(library -> libraries.append(", ").append(i18n("install.installer.forge")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)forge", ""))));
-                    analyzer.get(LITELOADER).ifPresent(library -> libraries.append(", ").append(i18n("install.installer.liteloader")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)liteloader", ""))));
-                    analyzer.get(OPTIFINE).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));
+                    analyzer.forEachLibrary((libraryId, libraryVersion) -> {
+                        if (libraryId.equals(MINECRAFT.getPatchId())) return;
+                        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/GameListItemSkin.java

@@ -22,7 +22,9 @@ 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;
@@ -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);
@@ -91,5 +95,16 @@ public class GameListItemSkin extends SkinBase<GameListItem> {
         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/InstallerListPage.java

@@ -21,29 +21,31 @@ 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.*;
+import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.InstallerItem;
+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.io.File;
 import java.util.Arrays;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import static org.jackhuang.hmcl.download.LibraryAnalyzer.LibraryType.*;
 import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
@@ -68,38 +70,33 @@ public class InstallerListPage extends ListPageBase<InstallerItem> {
     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;
 
-        Task.ofResult(() -> {
+        Task.supplyAsync(() -> {
             gameVersion = GameVersion.minecraftVersion(profile.getRepository().getVersionJar(version)).orElse(null);
 
-            return LibraryAnalyzer.analyze(version);
-        }).thenAccept(Schedulers.javafx(), analyzer -> {
-            Function<Library, Consumer<InstallerItem>> removeAction = library -> x -> {
-                LinkedList<Library> newList = new LinkedList<>(version.getLibraries());
-                newList.remove(library);
-                new MaintainTask(version.setLibraries(newList))
-                        .then(maintainedVersion -> new VersionJsonSaveTask(profile.getRepository(), maintainedVersion))
-                        .with(profile.getRepository().refreshVersionsAsync())
-                        .with(Task.of(Schedulers.javafx(), () -> loadVersion(this.profile, this.versionId)))
+            return LibraryAnalyzer.analyze(profile.getRepository().getResolvedPreservingPatchesVersion(versionId));
+        }).thenAcceptAsync(Schedulers.javafx(), analyzer -> {
+            Function<String, Consumer<InstallerItem>> removeAction = libraryId -> x -> {
+                profile.getDependency().removeLibraryAsync(version.getId(), libraryId)
+                        .withComposeAsync(profile.getRepository().refreshVersionsAsync())
+                        .withRunAsync(Schedulers.javafx(), () -> loadVersion(this.profile, this.versionId))
                         .start();
             };
 
             itemsProperty().clear();
-            analyzer.get(FORGE).ifPresent(library -> itemsProperty().add(
-                    new InstallerItem("Forge", library.getVersion(), () -> {
-                        Controllers.getDecorator().startWizard(new UpdateInstallerWizardProvider(profile, gameVersion, version, "forge", library));
-                    }, removeAction.apply(library))));
-            analyzer.get(LITELOADER).ifPresent(library -> itemsProperty().add(
-                    new InstallerItem("LiteLoader", library.getVersion(), () -> {
-                        Controllers.getDecorator().startWizard(new UpdateInstallerWizardProvider(profile, gameVersion, version, "liteloader", library));
-                    }, removeAction.apply(library))));
-            analyzer.get(OPTIFINE).ifPresent(library -> itemsProperty().add(
-                    new InstallerItem("OptiFine", library.getVersion(), () -> {
-                        Controllers.getDecorator().startWizard(new UpdateInstallerWizardProvider(profile, gameVersion, version, "optifine", library));
-                    }, removeAction.apply(library))));
-            analyzer.get(FABRIC).ifPresent(library -> itemsProperty().add(new InstallerItem("Fabric", library.getVersion(), null, null)));
+            analyzer.forEachLibrary((libraryId, libraryVersion) -> {
+                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();
     }
 
@@ -118,8 +115,8 @@ public class InstallerListPage extends ListPageBase<InstallerItem> {
     }
 
     private void doInstallOffline(File file) {
-        Task task = profile.getDependency().installLibraryAsync(version, file.toPath())
-                .then(profile.getRepository().refreshVersionsAsync());
+        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
@@ -129,9 +126,9 @@ public class InstallerListPage extends ListPageBase<InstallerItem> {
                         loadVersion(profile, versionId);
                         Controllers.dialog(i18n("install.success"));
                     } else {
-                        if (executor.getLastException() == null)
+                        if (executor.getException() == null)
                             return;
-                        InstallerWizardProvider.alertFailureMessage(executor.getLastException(), null);
+                        InstallerWizardProvider.alertFailureMessage(executor.getException(), null);
                     }
                 });
             }

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

@@ -79,22 +79,22 @@ public final class ModListPage extends ListPageBase<ModListPageSkin.ModInfoObjec
     }
 
     public void loadVersion(Profile profile, String id) {
-        libraryAnalyzer = LibraryAnalyzer.analyze(profile.getRepository().getResolvedVersion(id));
+        libraryAnalyzer = LibraryAnalyzer.analyze(profile.getRepository().getResolvedPreservingPatchesVersion(id));
         modded.set(libraryAnalyzer.hasModLoader());
         loadMods(profile.getRepository().getModManager(id));
     }
 
     private void loadMods(ModManager modManager) {
         this.modManager = modManager;
-        Task.ofResult(() -> {
+        Task.supplyAsync(() -> {
             synchronized (ModListPage.this) {
                 runInFX(() -> loadingProperty().set(true));
                 modManager.refreshMods();
                 return new LinkedList<>(modManager.getMods());
             }
-        }).whenComplete(Schedulers.javafx(), (list, isDependentSucceeded, exception) -> {
+        }).whenComplete(Schedulers.javafx(), (list, exception) -> {
             loadingProperty().set(false);
-            if (isDependentSucceeded)
+            if (exception == null)
                 FXUtils.onWeakChangeAndOperate(parentTab.getSelectionModel().selectedItemProperty(), newValue -> {
                     if (newValue != null && newValue.getUserData() == ModListPage.this)
                         itemsProperty().setAll(list.stream().map(ModListPageSkin.ModInfoObject::new).collect(Collectors.toList()));
@@ -112,7 +112,7 @@ public final class ModListPage extends ListPageBase<ModListPageSkin.ModInfoObjec
         List<String> succeeded = new LinkedList<>();
         List<String> failed = new LinkedList<>();
         if (res == null) return;
-        Task.of(() -> {
+        Task.runAsync(() -> {
             for (File file : res) {
                 try {
                     modManager.addMod(file);
@@ -124,7 +124,7 @@ public final class ModListPage extends ListPageBase<ModListPageSkin.ModInfoObjec
                     // Actually addMod will not throw exceptions because FileChooser has already filtered files.
                 }
             }
-        }).with(Task.of(Schedulers.javafx(), () -> {
+        }).withRunAsync(Schedulers.javafx(), () -> {
             List<String> prompt = new LinkedList<>();
             if (!succeeded.isEmpty())
                 prompt.add(i18n("mods.add.success", String.join(", ", succeeded)));
@@ -132,7 +132,7 @@ public final class ModListPage extends ListPageBase<ModListPageSkin.ModInfoObjec
                 prompt.add(i18n("mods.add.failed", String.join(", ", failed)));
             Controllers.dialog(String.join("\n", prompt), i18n("mods.add"));
             loadMods(modManager);
-        })).start();
+        }).start();
     }
 
     public void setParentTab(JFXTabPane parentTab) {

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

@@ -115,7 +115,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
 
         FXUtils.smoothScrolling(scroll);
 
-        Task.ofResult(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))
@@ -270,8 +270,8 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
         VersionSetting versionSetting = lastVersionSetting;
         if (versionSetting == null)
             return;
-        Task.ofResult(versionSetting::getJavaVersion)
-                .thenAccept(Schedulers.javafx(), javaVersion -> javaItem.setSubtitle(Optional.ofNullable(javaVersion)
+        Task.supplyAsync(versionSetting::getJavaVersion)
+                .thenAcceptAsync(Schedulers.javafx(), javaVersion -> javaItem.setSubtitle(Optional.ofNullable(javaVersion)
                         .map(JavaVersion::getBinary).map(Path::toString).orElse("Invalid Java Path")))
                 .start();
     }

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

@@ -19,10 +19,8 @@ package org.jackhuang.hmcl.ui.versions;
 
 import javafx.stage.FileChooser;
 import org.jackhuang.hmcl.download.game.GameAssetDownloadTask;
-import org.jackhuang.hmcl.download.game.GameAssetIndexDownloadTask;
 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;
@@ -78,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/WorldExportPage.java

@@ -74,6 +74,6 @@ public class WorldExportPage extends WizardSinglePage {
 
     @Override
     protected Object finish() {
-        return Task.of(i18n("world.export.wizard", worldName.get()), () -> world.export(Paths.get(path.get()), worldName.get()));
+        return Task.runAsync(i18n("world.export.wizard", worldName.get()), () -> world.export(Paths.get(path.get()), worldName.get()));
     }
 }

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

@@ -82,12 +82,12 @@ public class WorldListPage extends ListPageBase<WorldListItem> {
 
         setLoading(true);
         Task
-                .of(() -> gameVersion = GameVersion.minecraftVersion(profile.getRepository().getVersionJar(id)).orElse(null))
-                .thenSupply(() -> World.getWorlds(savesDir).parallel().collect(Collectors.toList()))
-                .whenComplete(Schedulers.javafx(), (result, isDependentSucceeded, exception) -> {
+                .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 (isDependentSucceeded)
+                    if (exception == null)
                         itemsProperty().setAll(result.stream()
                                 .filter(world -> isShowAll() || world.getGameVersion() == null || world.getGameVersion().equals(gameVersion))
                                 .map(WorldListItem::new).collect(Collectors.toList()));
@@ -107,10 +107,10 @@ public class WorldListPage extends ListPageBase<WorldListItem> {
     private void installWorld(File zipFile) {
         // Only accept one world file because user is required to confirm the new world name
         // Or too many input dialogs are popped.
-        Task.ofResult(() -> new World(zipFile.toPath()))
+        Task.supplyAsync(() -> new World(zipFile.toPath()))
                 .whenComplete(Schedulers.javafx(), world -> {
                     Controllers.inputDialog(i18n("world.name.enter"), (name, resolve, reject) -> {
-                        Task.of(() -> world.install(savesDir, name))
+                        Task.runAsync(() -> world.install(savesDir, name))
                                 .whenComplete(Schedulers.javafx(), () -> {
                                     itemsProperty().add(new WorldListItem(new World(savesDir.resolve(name))));
                                     resolve.run();

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

@@ -32,8 +32,8 @@ public interface AbstractWizardDisplayer extends WizardDisplayer {
     Queue<Object> getCancelQueue();
 
     @Override
-    default void handleTask(Map<String, Object> settings, Task task) {
-        TaskExecutor executor = task.with(Task.of(Schedulers.javafx(), this::navigateToSuccess)).executor();
+    default void handleTask(Map<String, Object> settings, Task<?> task) {
+        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/DefaultWizardDisplayer.java

@@ -23,7 +23,6 @@ import javafx.fxml.FXML;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.layout.StackPane;
-import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.animation.TransitionHandler;
 import org.jackhuang.hmcl.util.StringUtils;

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

@@ -35,7 +35,7 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 public interface TaskExecutorDialogWizardDisplayer extends AbstractWizardDisplayer {
 
     @Override
-    default void handleTask(Map<String, Object> settings, Task task) {
+    default void handleTask(Map<String, Object> settings, Task<?> task) {
         TaskExecutorDialogPane pane = new TaskExecutorDialogPane(it -> {
             it.fireEvent(new DialogCloseEvent());
             onEnd();
@@ -70,11 +70,11 @@ public interface TaskExecutorDialogWizardDisplayer extends AbstractWizardDisplay
                             else if (!settings.containsKey("forbid_success_message"))
                                 Controllers.dialog(i18n("message.success"), null, MessageType.FINE, () -> onEnd());
                         } else {
-                            if (executor.getLastException() == null)
+                            if (executor.getException() == null)
                                 return;
-                            String appendix = StringUtils.getStackTrace(executor.getLastException());
+                            String appendix = StringUtils.getStackTrace(executor.getException());
                             if (settings.get("failure_callback") instanceof WizardProvider.FailureCallback)
-                                ((WizardProvider.FailureCallback)settings.get("failure_callback")).onFail(settings, executor.getLastException(), () -> onEnd());
+                                ((WizardProvider.FailureCallback)settings.get("failure_callback")).onFail(settings, executor.getException(), () -> onEnd());
                             else if (settings.get("failure_message") instanceof String)
                                 Controllers.dialog(appendix, (String) settings.get("failure_message"), MessageType.ERROR, () -> onEnd());
                             else if (!settings.containsKey("forbid_failure_message"))

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

@@ -111,7 +111,7 @@ public class WizardController implements Navigation {
     public void onFinish() {
         Object result = provider.finish(settings);
         if (result instanceof Summary) displayer.navigateTo(((Summary) result).getComponent(), NavigationDirection.NEXT);
-        else if (result instanceof Task) displayer.handleTask(settings, ((Task) result));
+        else if (result instanceof Task<?>) displayer.handleTask(settings, ((Task<?>) result));
         else if (result != null) throw new IllegalStateException("Unrecognized wizard result: " + result);
     }
 

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

@@ -27,5 +27,5 @@ public interface WizardDisplayer {
     void onEnd();
     void onCancel();
     void navigateTo(Node page, Navigation.NavigationDirection nav);
-    void handleTask(Map<String, Object> settings, Task task);
+    void handleTask(Map<String, Object> settings, Task<?> task);
 }

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

@@ -20,7 +20,7 @@ package org.jackhuang.hmcl.upgrade;
 import com.google.gson.Gson;
 import com.google.gson.JsonParseException;
 import javafx.application.Platform;
-import javafx.scene.layout.Region;
+
 import org.jackhuang.hmcl.Main;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.task.Task;
@@ -38,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;
@@ -101,7 +98,7 @@ public final class UpdateHandler {
                 return;
             }
 
-            Task task = new HMCLDownloadTask(version, downloaded);
+            Task<?> task = new HMCLDownloadTask(version, downloaded);
 
             TaskExecutor executor = task.executor();
             Controllers.taskDialog(executor, i18n("message.downloading"));
@@ -122,7 +119,7 @@ public final class UpdateHandler {
                     }
 
                 } else {
-                    Throwable e = executor.getLastException();
+                    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));
                 }
@@ -161,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())
@@ -206,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/i18n/Locales.java

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

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

@@ -526,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;

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/download/additional-installers.fxml

@@ -15,6 +15,18 @@
         </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">

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

@@ -15,6 +15,18 @@
         </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">

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

@@ -135,6 +135,7 @@ install.failed.install_online=Unable to recognize what you provided installer fi
 install.failed.optifine_conflict=OptiFine and Forge are both installed simultaneously on Minecraft 1.13
 install.failed.version_mismatch=The library requires game version %s, but 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 %s
@@ -189,7 +190,7 @@ launcher.cache_directory=Download Cache Directory
 launcher.cache_directory.choose=Choose download cache directory
 launcher.cache_directory.default=Default
 launcher.cache_directory.disabled=Disabled
-launcher.cache_directory.invalid=Invalid cache directory. Restore default settings.
+launcher.cache_directory.invalid=Invalid cache 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!
@@ -218,6 +219,7 @@ 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.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
@@ -242,12 +244,14 @@ modpack.task.install=Import Modpack
 modpack.task.install.error=This modpack file cannot be recognized. Only Curse, 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.completion=Install files related 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.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=Unsupported modpack, only HMCL, MultiMC, Curse modpacks are supported.
 modpack.update=Upgrading game
 modpack.wizard=Exporting the modpack wizard
@@ -255,7 +259,8 @@ 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.3=Modpack Type
+modpack.wizard.step.3.title=Choose the format of the modpack.
 modpack.wizard.step.initialization.exported_version=The 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
@@ -268,7 +273,6 @@ mods.add.success=Successfully added 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 mod loader first (Forge, or LiteLoader)
 
@@ -321,7 +325,7 @@ 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.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
@@ -379,7 +383,7 @@ 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

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

@@ -0,0 +1,441 @@
+#
+# Hello Minecraft! Launcher
+# Copyright (C) 2019  huangyuhui <[email protected]> and contributors
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+
+# Contributors: dxNeil
+about.copyright=Copyright
+about.copyright.statement=Copyright (c) 2019 huangyuhui.
+about.author=Autor
+about.author.statement=huanghongxun ([email protected])
+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 "HMCL" 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 HMCL, pero HMCL 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 HMCL 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 HMCL.
+fatal.apply_update_failure=Lamentamos que HMCL no pudo terminar la actualización por un error.\nPero todavía puedes terminarlo manualmente descargando HMCL 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 (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=HMCL 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_zh.properties

@@ -217,6 +217,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 調校輸出
@@ -246,7 +247,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=匯出整合包引導
@@ -254,7 +257,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=選擇要匯出到的遊戲整合包位置

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

@@ -131,9 +131,10 @@ 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.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
@@ -205,7 +206,7 @@ main_page=主页
 
 message.confirm=提示
 message.doing=请耐心等待
-message.downloading=正在下载...
+message.downloading=正在下载
 message.error=错误
 message.info=提示
 message.success=已完成
@@ -217,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 调试输出
@@ -246,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=导出整合包向导
@@ -254,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=选择要导出到的游戏整合包位置

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/AuthlibInjectorDownloader.java

@@ -40,8 +40,8 @@ public class AuthlibInjectorDownloader implements AuthlibInjectorArtifactProvide
 
     private static final String LATEST_BUILD_URL = "https://authlib-injector.yushi.moe/artifact/latest.json";
 
-    private Path artifactLocation;
-    private Supplier<DownloadProvider> downloadProvider;
+    private final Path artifactLocation;
+    private final Supplier<DownloadProvider> downloadProvider;
 
     /**
      * The flag will be reset after application restart.

HMCLCore/src/main/java/org/jackhuang/hmcl/auth/yggdrasil/TextureModel.java

@@ -25,7 +25,7 @@ public enum TextureModel {
 
     public final String modelName;
 
-    private TextureModel(String modelName) {
+    TextureModel(String modelName) {
         this.modelName = modelName;
     }
 

HMCLCore/src/main/java/org/jackhuang/hmcl/download/AbstractDependencyManager.java

@@ -17,8 +17,6 @@
  */
 package org.jackhuang.hmcl.download;
 
-import org.jackhuang.hmcl.util.CacheRepository;
-
 /**
  *
  * @author huangyuhui

HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java

@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hmcl.download;
 
+import org.jackhuang.hmcl.download.fabric.FabricVersionList;
 import org.jackhuang.hmcl.download.forge.ForgeBMCLVersionList;
 import org.jackhuang.hmcl.download.game.GameVersionList;
 import org.jackhuang.hmcl.download.liteloader.LiteLoaderBMCLVersionList;
@@ -43,6 +44,8 @@ public class BMCLAPIDownloadProvider implements DownloadProvider {
         switch (id) {
             case "game":
                 return GameVersionList.INSTANCE;
+            case "fabric":
+                return FabricVersionList.INSTANCE;
             case "forge":
                 return ForgeBMCLVersionList.INSTANCE;
             case "liteloader":

HMCLCore/src/main/java/org/jackhuang/hmcl/download/DefaultDependencyManager.java

@@ -18,17 +18,13 @@
 package org.jackhuang.hmcl.download;
 
 import org.jackhuang.hmcl.download.forge.ForgeInstallTask;
-import org.jackhuang.hmcl.download.forge.ForgeRemoteVersion;
-import org.jackhuang.hmcl.download.game.*;
-import org.jackhuang.hmcl.download.liteloader.LiteLoaderInstallTask;
-import org.jackhuang.hmcl.download.liteloader.LiteLoaderRemoteVersion;
+import org.jackhuang.hmcl.download.game.GameAssetDownloadTask;
+import org.jackhuang.hmcl.download.game.GameDownloadTask;
+import org.jackhuang.hmcl.download.game.GameLibrariesTask;
 import org.jackhuang.hmcl.download.optifine.OptiFineInstallTask;
-import org.jackhuang.hmcl.download.optifine.OptiFineRemoteVersion;
 import org.jackhuang.hmcl.game.DefaultGameRepository;
 import org.jackhuang.hmcl.game.Version;
-import org.jackhuang.hmcl.task.ParallelTask;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.task.TaskResult;
 import org.jackhuang.hmcl.util.function.ExceptionalFunction;
 
 import java.io.IOException;
@@ -72,9 +68,10 @@ public class DefaultDependencyManager extends AbstractDependencyManager {
     }
 
     @Override
-    public Task checkGameCompletionAsync(Version version) {
-        return new ParallelTask(
-                Task.ofThen(() -> {
+    public Task<?> checkGameCompletionAsync(Version original) {
+        Version version = original.resolve(repository);
+        return Task.allOf(
+                Task.composeAsync(() -> {
                     if (!repository.getVersionJar(version).exists())
                         return new GameDownloadTask(this, null, version);
                     else
@@ -86,44 +83,39 @@ public class DefaultDependencyManager extends AbstractDependencyManager {
     }
 
     @Override
-    public Task checkLibraryCompletionAsync(Version version) {
+    public Task<?> checkLibraryCompletionAsync(Version version) {
         return new GameLibrariesTask(this, version);
     }
 
     @Override
-    public TaskResult<Version> installLibraryAsync(String gameVersion, Version version, String libraryId, String libraryVersion) {
+    public Task<Version> installLibraryAsync(String gameVersion, Version baseVersion, String libraryId, String libraryVersion) {
+        if (baseVersion.isResolved()) throw new IllegalArgumentException("Version should not be resolved");
+
         VersionList<?> versionList = getVersionList(libraryId);
         return versionList.loadAsync(gameVersion, getDownloadProvider())
-                .thenCompose(() -> installLibraryAsync(version, versionList.getVersion(gameVersion, libraryVersion)
+                .thenComposeAsync(() -> installLibraryAsync(baseVersion, versionList.getVersion(gameVersion, libraryVersion)
                         .orElseThrow(() -> new IllegalStateException("Remote library " + libraryId + " has no version " + libraryVersion))));
     }
 
     @Override
-    public TaskResult<Version> installLibraryAsync(Version oldVersion, RemoteVersion libraryVersion) {
-        TaskResult<Version> task;
-        if (libraryVersion instanceof ForgeRemoteVersion)
-            task = new ForgeInstallTask(this, oldVersion, (ForgeRemoteVersion) libraryVersion);
-        else if (libraryVersion instanceof LiteLoaderRemoteVersion)
-            task = new LiteLoaderInstallTask(this, oldVersion, (LiteLoaderRemoteVersion) libraryVersion);
-        else if (libraryVersion instanceof OptiFineRemoteVersion)
-            task = new OptiFineInstallTask(this, oldVersion, (OptiFineRemoteVersion) libraryVersion);
-        else
-            throw new IllegalArgumentException("Remote library " + libraryVersion + " is unrecognized.");
-        return task
-                .thenCompose(LibrariesUniqueTask::new)
-                .thenCompose(MaintainTask::new)
-                .thenCompose(newVersion -> new VersionJsonSaveTask(repository, newVersion));
+    public Task<Version> installLibraryAsync(Version baseVersion, RemoteVersion libraryVersion) {
+        if (baseVersion.isResolved()) throw new IllegalArgumentException("Version should not be resolved");
+
+        return libraryVersion.getInstallTask(this, baseVersion)
+                .thenApplyAsync(baseVersion::addPatch)
+                .thenComposeAsync(repository::save);
     }
 
-    public ExceptionalFunction<Version, TaskResult<Version>, ?> installLibraryAsync(RemoteVersion libraryVersion) {
+
+    public ExceptionalFunction<Version, Task<Version>, ?> installLibraryAsync(RemoteVersion libraryVersion) {
         return version -> installLibraryAsync(version, libraryVersion);
     }
 
-    public Task installLibraryAsync(Version oldVersion, Path installer) {
+    public Task<Version> installLibraryAsync(Version oldVersion, Path installer) {
+        if (oldVersion.isResolved()) throw new IllegalArgumentException("Version should not be resolved");
+
         return Task
-                .of(() -> {
-                })
-                .thenCompose(() -> {
+                .composeAsync(() -> {
                     try {
                         return ForgeInstallTask.install(this, oldVersion, installer);
                     } catch (IOException ignore) {
@@ -136,8 +128,36 @@ public class DefaultDependencyManager extends AbstractDependencyManager {
 
                     throw new UnsupportedOperationException("Library cannot be recognized");
                 })
-                .thenCompose(LibrariesUniqueTask::new)
-                .thenCompose(MaintainTask::new)
-                .thenCompose(newVersion -> new VersionJsonSaveTask(repository, newVersion));
+                .thenApplyAsync(oldVersion::addPatch)
+                .thenComposeAsync(repository::save);
+    }
+
+    /**
+     * Remove installed library.
+     * Will try to remove libraries and patches.
+     *
+     * @param versionId version id
+     * @param libraryId forge/liteloader/optifine/fabric
+     * @return task to remove the specified library
+     */
+    public Task<Version> removeLibraryWithoutSavingAsync(String versionId, String libraryId) {
+        // MaintainTask requires version that does not inherits from any version.
+        // If we want to remove a library in dependent version, we should keep the dependents not changed
+        // So resolving this game version to preserve all information in this version.json is necessary.
+        Version version = repository.getResolvedPreservingPatchesVersion(versionId);
+
+        return Task.supplyAsync(() -> LibraryAnalyzer.analyze(version).removeLibrary(libraryId).build());
+    }
+
+    /**
+     * Remove installed library.
+     * Will try to remove libraries and patches.
+     *
+     * @param versionId version id
+     * @param libraryId forge/liteloader/optifine/fabric
+     * @return task to remove the specified library
+     */
+    public Task<Version> removeLibraryAsync(String versionId, String libraryId) {
+        return removeLibraryWithoutSavingAsync(versionId, libraryId).thenComposeAsync(repository::save);
     }
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/download/DefaultGameBuilder.java

@@ -17,13 +17,11 @@
  */
 package org.jackhuang.hmcl.download;
 
-import org.jackhuang.hmcl.download.game.*;
 import org.jackhuang.hmcl.game.Version;
-import org.jackhuang.hmcl.task.ParallelTask;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.task.TaskResult;
 import org.jackhuang.hmcl.util.function.ExceptionalFunction;
-import org.jackhuang.hmcl.util.gson.JsonUtils;
+
+import java.util.Map;
 
 /**
  *
@@ -48,40 +46,23 @@ public class DefaultGameBuilder extends GameBuilder {
     }
 
     @Override
-    public Task buildAsync() {
-        return new VersionJsonDownloadTask(gameVersion, dependencyManager).thenCompose(rawJson -> {
-            Version original = JsonUtils.GSON.fromJson(rawJson, Version.class);
-            Version version = original.setId(name).setJar(null);
-            Task vanillaTask = downloadGameAsync(gameVersion, version).then(new ParallelTask(
-                    new GameAssetDownloadTask(dependencyManager, version, GameAssetDownloadTask.DOWNLOAD_INDEX_FORCIBLY),
-                    new GameLibrariesTask(dependencyManager, version) // Game libraries will be downloaded for multiple times partly, this time is for vanilla libraries.
-            ).with(new VersionJsonSaveTask(dependencyManager.getGameRepository(), version))); // using [with] because download failure here are tolerant.
+    public Task<?> buildAsync() {
+        Task<Version> libraryTask = Task.supplyAsync(() -> new Version(name));
+        libraryTask = libraryTask.thenComposeAsync(libraryTaskHelper(gameVersion, "game", gameVersion));
 
-            TaskResult<Version> libraryTask = vanillaTask.thenSupply(() -> version);
+        for (Map.Entry<String, String> entry : toolVersions.entrySet())
+            libraryTask = libraryTask.thenComposeAsync(libraryTaskHelper(gameVersion, entry.getKey(), entry.getValue()));
 
-            if (toolVersions.containsKey("forge"))
-                libraryTask = libraryTask.thenCompose(libraryTaskHelper(gameVersion, "forge"));
-            if (toolVersions.containsKey("liteloader"))
-                libraryTask = libraryTask.thenCompose(libraryTaskHelper(gameVersion, "liteloader"));
-            if (toolVersions.containsKey("optifine"))
-                libraryTask = libraryTask.thenCompose(libraryTaskHelper(gameVersion, "optifine"));
+        for (RemoteVersion remoteVersion : remoteVersions)
+            libraryTask = libraryTask.thenComposeAsync(dependencyManager.installLibraryAsync(remoteVersion));
 
-            for (RemoteVersion remoteVersion : remoteVersions)
-                libraryTask = libraryTask.thenCompose(dependencyManager.installLibraryAsync(remoteVersion));
-
-            return libraryTask;
-        }).whenComplete((isDependentSucceeded, exception) -> {
-            if (!isDependentSucceeded)
+        return libraryTask.whenComplete(exception -> {
+            if (exception != null)
                 dependencyManager.getGameRepository().removeVersionFromDisk(name);
         });
     }
 
-    private ExceptionalFunction<Version, TaskResult<Version>, ?> libraryTaskHelper(String gameVersion, String libraryId) {
-        return version -> dependencyManager.installLibraryAsync(gameVersion, version, libraryId, toolVersions.get(libraryId));
+    private ExceptionalFunction<Version, Task<Version>, ?> libraryTaskHelper(String gameVersion, String libraryId, String libraryVersion) {
+        return version -> dependencyManager.installLibraryAsync(gameVersion, version, libraryId, libraryVersion);
     }
-
-    protected Task downloadGameAsync(String gameVersion, Version version) {
-        return new GameDownloadTask(dependencyManager, gameVersion, version);
-    }
-
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/download/DependencyManager.java

@@ -46,7 +46,7 @@ public interface DependencyManager {
      *
      * @return the task to check game completion.
      */
-    Task checkGameCompletionAsync(Version version);
+    Task<?> checkGameCompletionAsync(Version version);
 
     /**
      * Check if the game is complete.
@@ -54,7 +54,7 @@ public interface DependencyManager {
      *
      * @return the task to check game completion.
      */
-    Task checkLibraryCompletionAsync(Version version);
+    Task<?> checkLibraryCompletionAsync(Version version);
 
     /**
      * The builder to build a brand new game then libraries such as Forge, LiteLoader and OptiFine.
@@ -66,22 +66,22 @@ public interface DependencyManager {
      * **Note**: Installing a library may change the version.json.
      *
      * @param gameVersion the Minecraft version that the library relies on.
-     * @param version the version.json.
+     * @param baseVersion the version.json.
      * @param libraryId the type of being installed library. i.e. "forge", "liteloader", "optifine"
      * @param libraryVersion the version of being installed library.
      * @return the task to install the specific library.
      */
-    Task installLibraryAsync(String gameVersion, Version version, String libraryId, String libraryVersion);
+    Task<?> installLibraryAsync(String gameVersion, Version baseVersion, String libraryId, String libraryVersion);
 
     /**
      * Install a library to a version.
      * **Note**: Installing a library may change the version.json.
      *
-     * @param version the version.json.\
+     * @param baseVersion the version.json.
      * @param libraryVersion the remote version of being installed library.
      * @return the task to install the specific library.
      */
-    Task installLibraryAsync(Version version, RemoteVersion libraryVersion);
+    Task<?> installLibraryAsync(Version baseVersion, RemoteVersion libraryVersion);
 
     /**
      * Get registered version list.

HMCLCore/src/main/java/org/jackhuang/hmcl/download/DownloadProvider.java

@@ -44,6 +44,7 @@ public interface DownloadProvider {
      *
      * @param id the id of specific version list that this download provider provides. i.e. "forge", "liteloader", "game", "optifine"
      * @return the version list
+     * @throws IllegalArgumentException if the version list does not exist
      */
     VersionList<?> getVersionListById(String id);
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/download/GameBuilder.java

@@ -72,5 +72,5 @@ public abstract class GameBuilder {
     /**
      * @return the task that can build thw whole Minecraft environment
      */
-    public abstract Task buildAsync();
+    public abstract Task<?> buildAsync();
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/download/LibraryAnalyzer.java

@@ -19,63 +19,137 @@ package org.jackhuang.hmcl.download;
 
 import org.jackhuang.hmcl.game.Library;
 import org.jackhuang.hmcl.game.Version;
+import org.jackhuang.hmcl.util.Pair;
+import org.jetbrains.annotations.Nullable;
 
-import java.util.Arrays;
-import java.util.EnumMap;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
+import java.util.function.BiConsumer;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 public final class LibraryAnalyzer {
-    private final Map<LibraryType, Library> libraries;
+    private Version version;
+    private final Map<String, Pair<Library, String>> libraries;
 
-    private LibraryAnalyzer(Map<LibraryType, Library> libraries) {
+    private LibraryAnalyzer(Version version, Map<String, Pair<Library, String>> libraries) {
+        this.version = version;
         this.libraries = libraries;
     }
 
-    public Optional<Library> get(LibraryType type) {
-        return Optional.ofNullable(libraries.get(type));
+    public Optional<String> getVersion(LibraryType type) {
+        return getVersion(type.getPatchId());
+    }
+
+    public Optional<String> getVersion(String type) {
+        return Optional.ofNullable(libraries.get(type)).map(Pair::getValue);
+    }
+
+    public void forEachLibrary(BiConsumer<String, @Nullable String> callback) {
+        for (Map.Entry<String, Pair<Library, String>> entry : libraries.entrySet())
+            callback.accept(entry.getKey(), entry.getValue().getValue());
     }
 
     public boolean has(LibraryType type) {
+        return has(type.getPatchId());
+    }
+
+    public boolean has(String type) {
         return libraries.containsKey(type);
     }
 
     public boolean hasModLoader() {
-        return Arrays.stream(LibraryType.values())
-                .filter(LibraryType::isModLoader)
-                .anyMatch(this::has);
+        return libraries.keySet().stream().map(LibraryType::fromPatchId)
+                .filter(Objects::nonNull)
+                .anyMatch(LibraryType::isModLoader);
+    }
+
+    public boolean hasModLauncher() {
+        final String modLauncher = "cpw.mods.modlauncher.Launcher";
+        return modLauncher.equals(version.getMainClass()) || version.getPatches().stream().anyMatch(patch -> modLauncher.equals(patch.getMainClass()));
+    }
+
+    private Version removingMatchedLibrary(Version version, String libraryId) {
+        LibraryType type = LibraryType.fromPatchId(libraryId);
+        if (type == null) return version;
+
+        List<Library> libraries = new ArrayList<>();
+        for (Library library : version.getLibraries()) {
+            String groupId = library.getGroupId();
+            String artifactId = library.getArtifactId();
+
+            if (type.group.matcher(groupId).matches() && type.artifact.matcher(artifactId).matches()) {
+                // skip
+            } else {
+                libraries.add(library);
+            }
+        }
+        return version.setLibraries(libraries);
+    }
+
+    /**
+     * Remove library by library id
+     * @param libraryId patch id or "forge"/"optifine"/"liteloader"/"fabric"
+     * @return this
+     */
+    public LibraryAnalyzer removeLibrary(String libraryId) {
+        if (!has(libraryId)) return this;
+        version = removingMatchedLibrary(version, libraryId)
+                .setPatches(version.getPatches().stream()
+                        .filter(patch -> !libraryId.equals(patch.getId()))
+                        .map(patch -> removingMatchedLibrary(patch, libraryId))
+                        .collect(Collectors.toList()));
+        return this;
+    }
+
+    public Version build() {
+        return version;
     }
 
     public static LibraryAnalyzer analyze(Version version) {
-        Map<LibraryType, Library> libraries = new EnumMap<>(LibraryType.class);
+        if (version.getInheritsFrom() != null)
+            throw new IllegalArgumentException("LibraryAnalyzer can only analyze independent game version");
 
-        for (Library library : version.getLibraries()) {
+        Map<String, Pair<Library, String>> libraries = new HashMap<>();
+
+        for (Library library : version.resolve(null).getLibraries()) {
             String groupId = library.getGroupId();
             String artifactId = library.getArtifactId();
 
             for (LibraryType type : LibraryType.values()) {
                 if (type.group.matcher(groupId).matches() && type.artifact.matcher(artifactId).matches()) {
-                    libraries.put(type, library);
+                    libraries.put(type.getPatchId(), Pair.pair(library, library.getVersion()));
                     break;
                 }
             }
         }
 
-        return new LibraryAnalyzer(libraries);
+        for (Version patch : version.getPatches()) {
+            if (patch.isHidden()) continue;
+            libraries.put(patch.getId(), Pair.pair(null, patch.getVersion()));
+        }
+
+        return new LibraryAnalyzer(version, libraries);
     }
 
     public enum LibraryType {
-        FORGE(true, Pattern.compile("net\\.minecraftforge"), Pattern.compile("forge")),
-        LITELOADER(true, Pattern.compile("com\\.mumfrey"), Pattern.compile("liteloader")),
-        OPTIFINE(false, Pattern.compile("(net\\.)?optifine"), Pattern.compile(".*")),
-        FABRIC(true, Pattern.compile("net\\.fabricmc"), Pattern.compile("fabric-loader"));
+        MINECRAFT(true, "game", Pattern.compile("^$"), Pattern.compile("^$")),
+        FABRIC(true, "fabric", Pattern.compile("net\\.fabricmc"), Pattern.compile("fabric-loader")),
+        FORGE(true, "forge", Pattern.compile("net\\.minecraftforge"), Pattern.compile("forge")),
+        LITELOADER(true, "liteloader", Pattern.compile("com\\.mumfrey"), Pattern.compile("liteloader")),
+        OPTIFINE(false, "optifine", Pattern.compile("(net\\.)?optifine"), Pattern.compile("^(?!.*launchwrapper).*$"));
 
-        private final Pattern group, artifact;
         private final boolean modLoader;
+        private final String patchId;
+        private final Pattern group, artifact;
 
-        LibraryType(boolean modLoader, Pattern group, Pattern artifact) {
+        LibraryType(boolean modLoader, String patchId, Pattern group, Pattern artifact) {
             this.modLoader = modLoader;
+            this.patchId = patchId;
             this.group = group;
             this.artifact = artifact;
         }
@@ -83,5 +157,16 @@ public final class LibraryAnalyzer {
         public boolean isModLoader() {
             return modLoader;
         }
+
+        public String getPatchId() {
+            return patchId;
+        }
+
+        public static LibraryType fromPatchId(String patchId) {
+            for (LibraryType type : values())
+                if (type.getPatchId().equals(patchId))
+                    return type;
+            return null;
+        }
     }
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/download/MaintainTask.java

@@ -17,37 +17,63 @@
  */
 package org.jackhuang.hmcl.download;
 
-import org.jackhuang.hmcl.game.*;
-import org.jackhuang.hmcl.task.TaskResult;
+import org.jackhuang.hmcl.game.Artifact;
+import org.jackhuang.hmcl.game.CompatibilityRule;
+import org.jackhuang.hmcl.game.GameRepository;
+import org.jackhuang.hmcl.game.Library;
+import org.jackhuang.hmcl.game.Version;
+import org.jackhuang.hmcl.game.VersionLibraryBuilder;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.util.SimpleMultimap;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
+import org.jackhuang.hmcl.util.versioning.VersionNumber;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 import static org.jackhuang.hmcl.download.LibraryAnalyzer.LibraryType.*;
 
-public class MaintainTask extends TaskResult<Version> {
-
+public class MaintainTask extends Task<Version> {
+    private final GameRepository repository;
     private final Version version;
 
-    public MaintainTask(Version version) {
+    public MaintainTask(GameRepository repository, Version version) {
+        this.repository = repository;
         this.version = version;
+
+        if (version.getInheritsFrom() != null)
+            throw new IllegalArgumentException("MaintainTask requires independent game version");
     }
 
     @Override
     public void execute() {
-        setResult(maintain(version));
+        setResult(maintain(repository, version));
     }
 
-    public static Version maintain(Version version) {
-        if (version.getMainClass().contains("launchwrapper")) {
-            return maintainGameWithLaunchWrapper(version);
+    public static Version maintain(GameRepository repository, Version version) {
+        if (version.getInheritsFrom() != null)
+            throw new IllegalArgumentException("MaintainTask requires independent game version");
+
+        String mainClass = version.resolve(null).getMainClass();
+
+        if (mainClass != null && mainClass.contains("launchwrapper")) {
+            return maintainOptiFineLibrary(repository, maintainGameWithLaunchWrapper(unique(version)));
         } else {
             // Vanilla Minecraft does not need maintain
             // Forge 1.13 support not implemented, not compatible with OptiFine currently.
-            return version;
+            // Fabric does not need maintain, nothing compatible with fabric now.
+            return maintainOptiFineLibrary(repository, unique(version));
         }
     }
 
     private static Version maintainGameWithLaunchWrapper(Version version) {
         LibraryAnalyzer libraryAnalyzer = LibraryAnalyzer.analyze(version);
         VersionLibraryBuilder builder = new VersionLibraryBuilder(version);
+        String mainClass = null;
 
         if (!libraryAnalyzer.has(FORGE)) {
             builder.removeTweakClass("forge");
@@ -56,7 +82,7 @@ public class MaintainTask extends TaskResult<Version> {
         // Installing Forge will override the Minecraft arguments in json, so LiteLoader and OptiFine Tweaker are being re-added.
 
         builder.removeTweakClass("liteloader");
-        if (libraryAnalyzer.has(LITELOADER)) {
+        if (libraryAnalyzer.has(LITELOADER) && !libraryAnalyzer.hasModLauncher()) {
             builder.addArgument("--tweakClass", "com.mumfrey.liteloader.launch.LiteLoaderTweaker");
         }
 
@@ -65,11 +91,101 @@ public class MaintainTask extends TaskResult<Version> {
             if (!libraryAnalyzer.has(LITELOADER) && !libraryAnalyzer.has(FORGE)) {
                 builder.addArgument("--tweakClass", "optifine.OptiFineTweaker");
             } else {
-                // If forge or LiteLoader installed, OptiFine Forge Tweaker is needed.
-                builder.addArgument("--tweakClass", "optifine.OptiFineForgeTweaker");
+                if (libraryAnalyzer.hasModLauncher()) {
+                    // If ModLauncher installed, we use ModLauncher in place of LaunchWrapper.
+                    mainClass = "cpw.mods.modlauncher.Launcher";
+                } else {
+                    // If forge or LiteLoader installed, OptiFine Forge Tweaker is needed.
+                    builder.addArgument("--tweakClass", "optifine.OptiFineForgeTweaker");
+                }
             }
         }
 
-        return builder.build();
+        Version ret = builder.build();
+        return mainClass == null ? ret : ret.setMainClass(mainClass);
+    }
+
+    private static Version maintainOptiFineLibrary(GameRepository repository, Version version) {
+        LibraryAnalyzer libraryAnalyzer = LibraryAnalyzer.analyze(version);
+        List<Library> libraries = new ArrayList<>(version.getLibraries());
+
+        if (libraryAnalyzer.has(OPTIFINE)) {
+            if (libraryAnalyzer.has(LITELOADER) || libraryAnalyzer.has(FORGE)) {
+                // If forge or LiteLoader installed, OptiFine Forge Tweaker is needed.
+                // And we should load the installer jar instead of patch jar.
+                if (repository != null)
+                    for (int i = 0; i < version.getLibraries().size(); ++i) {
+                        Library library = libraries.get(i);
+                        if (library.is("optifine", "OptiFine")) {
+                            Library newLibrary = new Library(new Artifact("optifine", "OptiFine", library.getVersion(), "installer"));
+                            if (repository.getLibraryFile(version, newLibrary).exists()) {
+                                libraries.set(i, null);
+                                // OptiFine should be loaded after Forge in classpath.
+                                // Although we have altered priority of OptiFine higher than Forge,
+                                // there still exists a situation that Forge is installed without patch.
+                                // Here we manually alter the position of OptiFine library in classpath.
+                                libraries.add(newLibrary);
+                            }
+                        }
+                    }
+            }
+        }
+
+        return version.setLibraries(libraries.stream().filter(Objects::nonNull).collect(Collectors.toList()));
+    }
+
+    public static Version unique(Version version) {
+        List<Library> libraries = new ArrayList<>();
+
+        SimpleMultimap<String, Integer> multimap = new SimpleMultimap<String, Integer>(HashMap::new, LinkedList::new);
+
+        for (Library library : version.getLibraries()) {
+            String id = library.getGroupId() + ":" + library.getArtifactId();
+            VersionNumber number = VersionNumber.asVersion(library.getVersion());
+            String serialized = JsonUtils.GSON.toJson(library);
+
+            if (multimap.containsKey(id)) {
+                boolean duplicate = false;
+                for (int otherLibraryIndex : multimap.get(id)) {
+                    Library otherLibrary = libraries.get(otherLibraryIndex);
+                    VersionNumber otherNumber = VersionNumber.asVersion(otherLibrary.getVersion());
+                    if (CompatibilityRule.equals(library.getRules(), otherLibrary.getRules())) { // rules equal, ignore older version.
+                        boolean flag = true;
+                        if (number.compareTo(otherNumber) > 0) { // if this library is newer
+                            // replace [otherLibrary] with [library]
+                            libraries.set(otherLibraryIndex, library);
+                        } else if (number.compareTo(otherNumber) == 0) { // same library id.
+                            // prevent from duplicated libraries
+                            if (library.equals(otherLibrary)) {
+                                String otherSerialized = JsonUtils.GSON.toJson(otherLibrary);
+                                // A trick, the library that has more information is better, which can be
+                                // considered whose serialized JSON text will be longer.
+                                if (serialized.length() > otherSerialized.length()) {
+                                    libraries.set(otherLibraryIndex, library);
+                                }
+                            } else {
+                                // for text2speech, which have same library id as well as version number,
+                                // but its library and native library does not equal
+                                flag = false;
+                            }
+                        }
+                        if (flag) {
+                            duplicate = true;
+                            break;
+                        }
+                    }
+                }
+
+                if (!duplicate) {
+                    multimap.put(id, libraries.size());
+                    libraries.add(library);
+                }
+            } else {
+                multimap.put(id, libraries.size());
+                libraries.add(library);
+            }
+        }
+
+        return version.setLibraries(libraries);
     }
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/download/MojangDownloadProvider.java

@@ -17,8 +17,8 @@
  */
 package org.jackhuang.hmcl.download;
 
+import org.jackhuang.hmcl.download.fabric.FabricVersionList;
 import org.jackhuang.hmcl.download.forge.ForgeBMCLVersionList;
-import org.jackhuang.hmcl.download.forge.ForgeVersionList;
 import org.jackhuang.hmcl.download.game.GameVersionList;
 import org.jackhuang.hmcl.download.liteloader.LiteLoaderVersionList;
 import org.jackhuang.hmcl.download.optifine.OptiFineBMCLVersionList;
@@ -44,6 +44,8 @@ public class MojangDownloadProvider implements DownloadProvider {
         switch (id) {
             case "game":
                 return GameVersionList.INSTANCE;
+            case "fabric":
+                return FabricVersionList.INSTANCE;
             case "forge":
                 return ForgeBMCLVersionList.INSTANCE;
             case "liteloader":

HMCLCore/src/main/java/org/jackhuang/hmcl/download/RemoteVersion.java

@@ -17,6 +17,8 @@
  */
 package org.jackhuang.hmcl.download;
 
+import org.jackhuang.hmcl.game.Version;
+import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.util.ToStringBuilder;
 import org.jackhuang.hmcl.util.versioning.VersionNumber;
 
@@ -75,6 +77,10 @@ public class RemoteVersion implements Comparable<RemoteVersion> {
         return type;
     }
 
+    public Task<Version> getInstallTask(DefaultDependencyManager dependencyManager, Version baseVersion) {
+        throw new UnsupportedOperationException(toString() + " cannot be installed yet");
+    }
+
     @Override
     public boolean equals(Object obj) {
         return obj instanceof RemoteVersion && Objects.equals(selfVersion, ((RemoteVersion) obj).selfVersion);

HMCLCore/src/main/java/org/jackhuang/hmcl/download/VersionList.java

@@ -62,19 +62,19 @@ public abstract class VersionList<T extends RemoteVersion> {
      * @param downloadProvider DownloadProvider
      * @return the task to reload the remote version list.
      */
-    public abstract Task refreshAsync(DownloadProvider downloadProvider);
+    public abstract Task<?> refreshAsync(DownloadProvider downloadProvider);
 
     /**
      * @param gameVersion the remote version depends on
      * @param downloadProvider DownloadProvider
      * @return the task to reload the remote version list.
      */
-    public Task refreshAsync(String gameVersion, DownloadProvider downloadProvider) {
+    public Task<?> refreshAsync(String gameVersion, DownloadProvider downloadProvider) {
         return refreshAsync(downloadProvider);
     }
 
-    public Task loadAsync(DownloadProvider downloadProvider) {
-        return Task.ofThen(() -> {
+    public Task<?> loadAsync(DownloadProvider downloadProvider) {
+        return Task.composeAsync(() -> {
             lock.readLock().lock();
             boolean loaded;
 
@@ -87,8 +87,8 @@ public abstract class VersionList<T extends RemoteVersion> {
         });
     }
 
-    public Task loadAsync(String gameVersion, DownloadProvider downloadProvider) {
-        return Task.ofThen(() -> {
+    public Task<?> loadAsync(String gameVersion, DownloadProvider downloadProvider) {
+        return Task.composeAsync(() -> {
             lock.readLock().lock();
             boolean loaded;
 

HMCLCore/src/main/java/org/jackhuang/hmcl/download/fabric/FabricInstallTask.java

@@ -0,0 +1,133 @@
+/*
+ * 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.download.fabric;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import org.jackhuang.hmcl.download.DefaultDependencyManager;
+import org.jackhuang.hmcl.game.Arguments;
+import org.jackhuang.hmcl.game.Artifact;
+import org.jackhuang.hmcl.game.Library;
+import org.jackhuang.hmcl.game.Version;
+import org.jackhuang.hmcl.task.GetTask;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
+import org.jackhuang.hmcl.util.io.NetworkUtils;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * <b>Note</b>: Fabric should be installed first.
+ *
+ * @author huangyuhui
+ */
+public final class FabricInstallTask extends Task<Version> {
+
+    private final DefaultDependencyManager dependencyManager;
+    private final Version version;
+    private final FabricRemoteVersion remote;
+    private final GetTask launchMetaTask;
+    private final List<Task<?>> dependencies = new LinkedList<>();
+
+    public FabricInstallTask(DefaultDependencyManager dependencyManager, Version version, FabricRemoteVersion remoteVersion) {
+        this.dependencyManager = dependencyManager;
+        this.version = version;
+        this.remote = remoteVersion;
+
+        launchMetaTask = new GetTask(NetworkUtils.toURL(getLaunchMetaUrl(remote.getSelfVersion())))
+                .setCacheRepository(dependencyManager.getCacheRepository());
+    }
+
+    @Override
+    public boolean doPreExecute() {
+        return true;
+    }
+
+    @Override
+    public void preExecute() {
+        if (!Objects.equals("net.minecraft.client.main.Main", version.resolve(dependencyManager.getGameRepository()).getMainClass()))
+            throw new UnsupportedFabricInstallationException();
+    }
+
+    @Override
+    public Collection<Task<?>> getDependents() {
+        return Collections.singleton(launchMetaTask);
+    }
+
+    @Override
+    public Collection<Task<?>> getDependencies() {
+        return dependencies;
+    }
+
+    @Override
+    public boolean isRelyingOnDependencies() {
+        return false;
+    }
+
+    @Override
+    public void execute() throws IOException {
+        setResult(getPatch(JsonUtils.GSON.fromJson(launchMetaTask.getResult(), JsonObject.class), remote.getGameVersion(), remote.getSelfVersion()));
+
+        dependencies.add(dependencyManager.checkLibraryCompletionAsync(getResult()));
+    }
+
+    private static String getLaunchMetaUrl(String loaderVersion) {
+        return String.format("%s/%s/%s/%s/%3$s-%4$s.json", "https://maven.fabricmc.net/", "net/fabricmc", "fabric-loader", loaderVersion);
+    }
+
+    private Version getPatch(JsonObject jsonObject, String gameVersion, String loaderVersion) {
+        Arguments arguments = new Arguments();
+
+        String mainClass;
+        if (!jsonObject.get("mainClass").isJsonObject()) {
+            mainClass = jsonObject.get("mainClass").getAsString();
+        } else {
+            mainClass = jsonObject.get("mainClass").getAsJsonObject().get("client").getAsString();
+        }
+
+        if (jsonObject.has("launchwrapper")) {
+            String clientTweaker = jsonObject.get("launchwrapper").getAsJsonObject().get("tweakers").getAsJsonObject().get("client").getAsJsonArray().get(0).getAsString();
+            arguments = arguments.addGameArguments("--tweakClass", clientTweaker);
+        }
+
+        JsonObject librariesObject = jsonObject.getAsJsonObject("libraries");
+        List<Library> libraries = new ArrayList<>();
+
+        // "common, server" is hard coded in fabric installer.
+        // Don't know the purpose of ignoring client libraries.
+        for (String side : new String[]{"common", "server"}) {
+            for (JsonElement element : librariesObject.getAsJsonArray(side)) {
+                libraries.add(JsonUtils.GSON.fromJson(element, Library.class));
+            }
+        }
+
+        libraries.add(new Library(new Artifact("net.fabricmc", "intermediary", gameVersion), "https://maven.fabricmc.net/", null));
+        libraries.add(new Library(new Artifact("net.fabricmc", "fabric-loader", loaderVersion), "https://maven.fabricmc.net/", null));
+
+        return new Version("net.fabricmc", loaderVersion, 30000, arguments, mainClass, libraries);
+    }
+
+    public static class UnsupportedFabricInstallationException extends UnsupportedOperationException {
+    }
+}

HMCLCore/src/main/java/org/jackhuang/hmcl/download/fabric/FabricRemoteVersion.java

@@ -15,43 +15,27 @@
  * 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.task;
+package org.jackhuang.hmcl.download.fabric;
 
-import java.util.Arrays;
-import java.util.Collection;
-
-/**
- * The tasks that provides a way to execute tasks parallelly.
- * Fails when some of {@link #tasks} failed.
- *
- * @author huangyuhui
- */
-public final class ParallelTask extends Task {
-
-    private final Collection<Task> tasks;
+import org.jackhuang.hmcl.download.DefaultDependencyManager;
+import org.jackhuang.hmcl.download.RemoteVersion;
+import org.jackhuang.hmcl.game.Version;
+import org.jackhuang.hmcl.task.Task;
 
+public class FabricRemoteVersion extends RemoteVersion {
     /**
      * Constructor.
      *
-     * @param tasks the tasks that can be executed parallelly.
+     * @param gameVersion the Minecraft version that this remote version suits.
+     * @param selfVersion the version string of the remote version.
+     * @param url         the installer or universal jar URL.
      */
-    public ParallelTask(Task... tasks) {
-        this.tasks = Arrays.asList(tasks);
-        setSignificance(TaskSignificance.MINOR);
-    }
-
-    public ParallelTask(Collection<Task> tasks) {
-        this.tasks = tasks;
-        setSignificance(TaskSignificance.MINOR);
+    FabricRemoteVersion(String gameVersion, String selfVersion, String url) {
+        super(gameVersion, selfVersion, url);
     }
 
     @Override
-    public void execute() {
+    public Task<Version> getInstallTask(DefaultDependencyManager dependencyManager, Version baseVersion) {
+        return new FabricInstallTask(dependencyManager, baseVersion, this);
     }
-
-    @Override
-    public Collection<Task> getDependents() {
-        return tasks;
-    }
-
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/download/fabric/FabricVersionList.java

@@ -0,0 +1,119 @@
+/*
+ * 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.download.fabric;
+
+import com.google.gson.reflect.TypeToken;
+import org.jackhuang.hmcl.download.DownloadProvider;
+import org.jackhuang.hmcl.download.VersionList;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
+import org.jackhuang.hmcl.util.io.NetworkUtils;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public final class FabricVersionList extends VersionList<FabricRemoteVersion> {
+
+    public static final FabricVersionList INSTANCE = new FabricVersionList();
+
+    private FabricVersionList() {
+    }
+
+    @Override
+    public boolean hasType() {
+        return false;
+    }
+
+    @Override
+    public Task<?> refreshAsync(DownloadProvider downloadProvider) {
+        return new Task<Void>() {
+            @Override
+            public void execute() throws IOException, XMLStreamException {
+                List<String> gameVersions = getGameVersions(META_URL);
+                List<String> loaderVersions = getVersions(FABRIC_MAVEN_URL, FABRIC_PACKAGE_NAME, FABRIC_JAR_NAME);
+
+                lock.writeLock().lock();
+
+                try {
+                    for (String gameVersion : gameVersions)
+                        for (String loaderVersion : loaderVersions)
+                            versions.put(gameVersion, new FabricRemoteVersion(gameVersion, loaderVersion, ""));
+                } finally {
+                    lock.writeLock().unlock();
+                }
+            }
+        };
+    }
+
+    private static final String META_URL = "https://meta.fabricmc.net/v2/versions/game";
+    private static final String FABRIC_MAVEN_URL = "https://maven.fabricmc.net/";
+    private static final String FABRIC_PACKAGE_NAME = "net/fabricmc";
+    private static final String FABRIC_JAR_NAME = "fabric-loader";
+
+    private List<String> getVersions(String mavenServerURL, String packageName, String jarName) throws IOException, XMLStreamException {
+        List<String> versions = new ArrayList<>();
+        URL url = new URL(mavenServerURL + packageName + "/" + jarName + "/maven-metadata.xml");
+        XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(url.openStream());
+
+        while(reader.hasNext()) {
+            if (reader.next() == 1 && reader.getLocalName().equals("version")) {
+                String text = reader.getElementText();
+                versions.add(text);
+            }
+        }
+
+        reader.close();
+        Collections.reverse(versions);
+        return versions;
+    }
+
+    private List<String> getGameVersions(String metaUrl) throws IOException {
+        String json = NetworkUtils.doGet(NetworkUtils.toURL(metaUrl));
+        return JsonUtils.GSON.<ArrayList<GameVersion>>fromJson(json, new TypeToken<ArrayList<GameVersion>>() {
+        }.getType()).stream().map(GameVersion::getVersion).collect(Collectors.toList());
+    }
+
+    private static class GameVersion {
+        private final String version;
+        private final boolean stable;
+
+        public GameVersion() {
+            this("", false);
+        }
+
+        public GameVersion(String version, boolean stable) {
+            this.version = version;
+            this.stable = stable;
+        }
+
+        public String getVersion() {
+            return version;
+        }
+
+        public boolean isStable() {
+            return stable;
+        }
+    }
+}

HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeBMCLVersionList.java

@@ -46,21 +46,21 @@ public final class ForgeBMCLVersionList extends VersionList<ForgeRemoteVersion>
     }
 
     @Override
-    public Task loadAsync(DownloadProvider downloadProvider) {
+    public Task<?> loadAsync(DownloadProvider downloadProvider) {
         throw new UnsupportedOperationException("ForgeBMCLVersionList does not support loading the entire Forge remote version list.");
     }
 
     @Override
-    public Task refreshAsync(DownloadProvider downloadProvider) {
+    public Task<?> refreshAsync(DownloadProvider downloadProvider) {
         throw new UnsupportedOperationException("ForgeBMCLVersionList does not support loading the entire Forge remote version list.");
     }
 
     @Override
-    public Task refreshAsync(String gameVersion, DownloadProvider downloadProvider) {
+    public Task<?> refreshAsync(String gameVersion, DownloadProvider downloadProvider) {
         final GetTask task = new GetTask(NetworkUtils.toURL("https://bmclapi2.bangbang93.com/forge/minecraft/" + gameVersion));
-        return new Task() {
+        return new Task<Void>() {
             @Override
-            public Collection<Task> getDependents() {
+            public Collection<Task<?>> getDependents() {
                 return Collections.singleton(task);
             }
 

HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeInstall.java

@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hmcl.download.forge;
 
+import org.jackhuang.hmcl.game.Artifact;
 import org.jackhuang.hmcl.util.Immutable;
 
 /**
@@ -28,7 +29,7 @@ public final class ForgeInstall {
 
     private final String profileName;
     private final String target;
-    private final String path;
+    private final Artifact path;
     private final String version;
     private final String filePath;
     private final String welcome;
@@ -40,7 +41,7 @@ public final class ForgeInstall {
         this(null, null, null, null, null, null, null, null, null);
     }
 
-    public ForgeInstall(String profileName, String target, String path, String version, String filePath, String welcome, String minecraft, String mirrorList, String logo) {
+    public ForgeInstall(String profileName, String target, Artifact path, String version, String filePath, String welcome, String minecraft, String mirrorList, String logo) {
         this.profileName = profileName;
         this.target = target;
         this.path = path;
@@ -60,7 +61,7 @@ public final class ForgeInstall {
         return target;
     }
 
-    public String getPath() {
+    public Artifact getPath() {
         return path;
     }
 

HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeInstallTask.java

@@ -23,7 +23,6 @@ import org.jackhuang.hmcl.game.GameVersion;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.task.FileDownloadTask;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.task.TaskResult;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.CompressingUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
@@ -39,18 +38,21 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.Optional;
 
+import static org.jackhuang.hmcl.util.StringUtils.removePrefix;
+import static org.jackhuang.hmcl.util.StringUtils.removeSuffix;
+
 /**
  *
  * @author huangyuhui
  */
-public final class ForgeInstallTask extends TaskResult<Version> {
+public final class ForgeInstallTask extends Task<Version> {
 
     private final DefaultDependencyManager dependencyManager;
     private final Version version;
     private Path installer;
     private final ForgeRemoteVersion remote;
-    private Task dependent;
-    private TaskResult<Version> dependency;
+    private Task<Void> dependent;
+    private Task<Version> dependency;
 
     public ForgeInstallTask(DefaultDependencyManager dependencyManager, Version version, ForgeRemoteVersion remoteVersion) {
         this.dependencyManager = dependencyManager;
@@ -68,6 +70,7 @@ public final class ForgeInstallTask extends TaskResult<Version> {
         installer = Files.createTempFile("forge-installer", ".jar");
 
         dependent = new FileDownloadTask(NetworkUtils.toURL(remote.getUrl()), installer.toFile())
+                .setCacheRepository(dependencyManager.getCacheRepository())
                 .setCaching(true);
     }
 
@@ -83,25 +86,26 @@ public final class ForgeInstallTask extends TaskResult<Version> {
     }
 
     @Override
-    public Collection<Task> getDependents() {
+    public Collection<Task<?>> getDependents() {
         return Collections.singleton(dependent);
     }
 
     @Override
-    public Collection<Task> getDependencies() {
+    public Collection<Task<?>> getDependencies() {
         return Collections.singleton(dependency);
     }
 
     @Override
     public void execute() {
         if (VersionNumber.VERSION_COMPARATOR.compare("1.13", remote.getGameVersion()) <= 0)
-            dependency = new ForgeNewInstallTask(dependencyManager, version, installer);
+            dependency = new ForgeNewInstallTask(dependencyManager, version, remote.getSelfVersion(), installer);
         else
-            dependency = new ForgeOldInstallTask(dependencyManager, version, installer);
+            dependency = new ForgeOldInstallTask(dependencyManager, version, remote.getSelfVersion(), installer);
     }
 
     /**
      * Install Forge library from existing local file.
+     * This method will try to identify this installer whether it is in old or new format.
      *
      * @param dependencyManager game repository
      * @param version version.json
@@ -110,7 +114,7 @@ public final class ForgeInstallTask extends TaskResult<Version> {
      * @throws IOException if unable to read compressed content of installer file, or installer file is corrupted, or the installer is not the one we want.
      * @throws VersionMismatchException if required game version of installer does not match the actual one.
      */
-    public static TaskResult<Version> install(DefaultDependencyManager dependencyManager, Version version, Path installer) throws IOException, VersionMismatchException {
+    public static Task<Version> install(DefaultDependencyManager dependencyManager, Version version, Path installer) throws IOException, VersionMismatchException {
         Optional<String> gameVersion = GameVersion.minecraftVersion(dependencyManager.getGameRepository().getVersionJar(version));
         if (!gameVersion.isPresent()) throw new IOException();
         try (FileSystem fs = CompressingUtils.createReadOnlyZipFileSystem(installer)) {
@@ -120,15 +124,19 @@ public final class ForgeInstallTask extends TaskResult<Version> {
                 ForgeNewInstallProfile profile = JsonUtils.fromNonNullJson(installProfileText, ForgeNewInstallProfile.class);
                 if (!gameVersion.get().equals(profile.getMinecraft()))
                     throw new VersionMismatchException(profile.getMinecraft(), gameVersion.get());
-                return new ForgeNewInstallTask(dependencyManager, version, installer);
+                return new ForgeNewInstallTask(dependencyManager, version, modifyVersion(gameVersion.get(), profile.getPath().getVersion().replaceAll("(?i)forge", "")), installer);
             } else if (installProfile.containsKey("install") && installProfile.containsKey("versionInfo")) {
                 ForgeInstallProfile profile = JsonUtils.fromNonNullJson(installProfileText, ForgeInstallProfile.class);
                 if (!gameVersion.get().equals(profile.getInstall().getMinecraft()))
                     throw new VersionMismatchException(profile.getInstall().getMinecraft(), gameVersion.get());
-                return new ForgeOldInstallTask(dependencyManager, version, installer);
+                return new ForgeOldInstallTask(dependencyManager, version, modifyVersion(gameVersion.get(), profile.getInstall().getPath().getVersion().replaceAll("(?i)forge", "")), installer);
             } else {
                 throw new IOException();
             }
         }
     }
+
+    private static String modifyVersion(String gameVersion, String version) {
+        return removeSuffix(removePrefix(removeSuffix(removePrefix(version.replace(gameVersion, "").trim(), "-"), "-"), "_"), "_");
+    }
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeNewInstallTask.java

@@ -18,11 +18,14 @@
 package org.jackhuang.hmcl.download.forge;
 
 import org.jackhuang.hmcl.download.DefaultDependencyManager;
+import org.jackhuang.hmcl.download.LibraryAnalyzer;
 import org.jackhuang.hmcl.download.game.GameLibrariesTask;
 import org.jackhuang.hmcl.download.optifine.OptiFineInstallTask;
-import org.jackhuang.hmcl.game.*;
+import org.jackhuang.hmcl.game.Artifact;
+import org.jackhuang.hmcl.game.DefaultGameRepository;
+import org.jackhuang.hmcl.game.Library;
+import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.task.TaskResult;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.function.ExceptionalFunction;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
@@ -32,16 +35,22 @@ import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.platform.CommandBuilder;
 import org.jackhuang.hmcl.util.platform.JavaVersion;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
+import org.jackhuang.hmcl.util.platform.SystemUtils;
 
-import java.io.BufferedReader;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.nio.file.FileSystem;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 import java.util.stream.Collectors;
@@ -50,23 +59,25 @@ import static org.jackhuang.hmcl.util.DigestUtils.digest;
 import static org.jackhuang.hmcl.util.Hex.encodeHex;
 import static org.jackhuang.hmcl.util.Logging.LOG;
 
-public class ForgeNewInstallTask extends TaskResult<Version> {
+public class ForgeNewInstallTask extends Task<Version> {
 
     private final DefaultDependencyManager dependencyManager;
     private final DefaultGameRepository gameRepository;
     private final Version version;
     private final Path installer;
-    private final List<Task> dependents = new LinkedList<>();
-    private final List<Task> dependencies = new LinkedList<>();
+    private final List<Task<?>> dependents = new LinkedList<>();
+    private final List<Task<?>> dependencies = new LinkedList<>();
 
     private ForgeNewInstallProfile profile;
     private Version forgeVersion;
+    private final String selfVersion;
 
-    public ForgeNewInstallTask(DefaultDependencyManager dependencyManager, Version version, Path installer) {
+    ForgeNewInstallTask(DefaultDependencyManager dependencyManager, Version version, String selfVersion, Path installer) {
         this.dependencyManager = dependencyManager;
         this.gameRepository = dependencyManager.getGameRepository();
         this.version = version;
         this.installer = installer;
+        this.selfVersion = selfVersion;
 
         setSignificance(TaskSignificance.MINOR);
     }
@@ -77,18 +88,18 @@ public class ForgeNewInstallTask extends TaskResult<Version> {
         else if (StringUtils.isSurrounded(literal, "'", "'"))
             return StringUtils.removeSurrounding(literal, "'");
         else if (StringUtils.isSurrounded(literal, "[", "]"))
-            return gameRepository.getArtifactFile(version, new Artifact(StringUtils.removeSurrounding(literal, "[", "]"))).toString();
+            return gameRepository.getArtifactFile(version, Artifact.fromDescriptor(StringUtils.removeSurrounding(literal, "[", "]"))).toString();
         else
             return plainConverter.apply(literal);
     }
 
     @Override
-    public Collection<Task> getDependents() {
+    public Collection<Task<?>> getDependents() {
         return dependents;
     }
 
     @Override
-    public List<Task> getDependencies() {
+    public Collection<Task<?>> getDependencies() {
         return dependencies;
     }
 
@@ -125,7 +136,7 @@ public class ForgeNewInstallTask extends TaskResult<Version> {
 
     @Override
     public void execute() throws Exception {
-        if ("net.minecraft.launchwrapper.Launch".equals(version.getMainClass()))
+        if ("net.minecraft.launchwrapper.Launch".equals(version.resolve(dependencyManager.getGameRepository()).getMainClass()))
             throw new OptiFineInstallTask.UnsupportedOptiFineInstallationException();
 
         Path temp  = Files.createTempDirectory("forge_installer");
@@ -229,13 +240,7 @@ public class ForgeNewInstallTask extends TaskResult<Version> {
                 command.addAll(args);
 
                 LOG.info("Executing external processor " + processor.getJar().toString() + ", command line: " + new CommandBuilder().addAll(command).toString());
-                Process process = new ProcessBuilder(command).start();
-                try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
-                    for (String line; (line = reader.readLine()) != null;) {
-                        System.out.println(line);
-                    }
-                }
-                int exitCode = process.waitFor();
+                int exitCode = SystemUtils.callExternalProcess(command);
                 if (exitCode != 0)
                     throw new IllegalStateException("Game processor exited abnormally");
 
@@ -259,15 +264,10 @@ public class ForgeNewInstallTask extends TaskResult<Version> {
             }
         }
 
-        // resolve the version
-        SimpleVersionProvider provider = new SimpleVersionProvider();
-        provider.addVersion(version);
-
         setResult(forgeVersion
-                .setInheritsFrom(version.getId())
-                .resolve(provider).setJar(null)
-                .setId(version.getId()).setLogging(Collections.emptyMap()));
-
+                .setPriority(30000)
+                .setId(LibraryAnalyzer.LibraryType.FORGE.getPatchId())
+                .setVersion(selfVersion));
         dependencies.add(dependencyManager.checkLibraryCompletionAsync(forgeVersion));
 
         FileUtils.deleteDirectory(temp.toFile());

HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeOldInstallTask.java

@@ -18,36 +18,44 @@
 package org.jackhuang.hmcl.download.forge;
 
 import org.jackhuang.hmcl.download.DefaultDependencyManager;
-import org.jackhuang.hmcl.game.*;
+import org.jackhuang.hmcl.download.LibraryAnalyzer;
+import org.jackhuang.hmcl.game.Library;
+import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.task.TaskResult;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.io.IOUtils;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.nio.file.Path;
-import java.util.*;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-public class ForgeOldInstallTask extends TaskResult<Version> {
+public class ForgeOldInstallTask extends Task<Version> {
 
     private final DefaultDependencyManager dependencyManager;
     private final Version version;
     private final Path installer;
-    private final List<Task> dependencies = new LinkedList<>();
+    private final String selfVersion;
+    private final List<Task<?>> dependencies = new LinkedList<>();
 
-    public ForgeOldInstallTask(DefaultDependencyManager dependencyManager, Version version, Path installer) {
+    ForgeOldInstallTask(DefaultDependencyManager dependencyManager, Version version, String selfVersion, Path installer) {
         this.dependencyManager = dependencyManager;
         this.version = version;
         this.installer = installer;
+        this.selfVersion = selfVersion;
 
         setSignificance(TaskSignificance.MINOR);
     }
 
     @Override
-    public List<Task> getDependencies() {
+    public List<Task<?>> getDependencies() {
         return dependencies;
     }
 
@@ -66,7 +74,7 @@ public class ForgeOldInstallTask extends TaskResult<Version> {
             ForgeInstallProfile installProfile = JsonUtils.fromNonNullJson(json, ForgeInstallProfile.class);
 
             // unpack the universal jar in the installer file.
-            Library forgeLibrary = Library.fromName(installProfile.getInstall().getPath());
+            Library forgeLibrary = new Library(installProfile.getInstall().getPath());
             File forgeFile = dependencyManager.getGameRepository().getLibraryFile(version, forgeLibrary);
             if (!FileUtils.makeFile(forgeFile))
                 throw new IOException("Cannot make directory " + forgeFile.getParent());
@@ -76,15 +84,10 @@ public class ForgeOldInstallTask extends TaskResult<Version> {
                 IOUtils.copyTo(is, os);
             }
 
-            // resolve the version
-            SimpleVersionProvider provider = new SimpleVersionProvider();
-            provider.addVersion(version);
-
             setResult(installProfile.getVersionInfo()
-                    .setInheritsFrom(version.getId())
-                    .resolve(provider).setJar(null)
-                    .setId(version.getId()).setLogging(Collections.emptyMap()));
-
+                    .setPriority(30000)
+                    .setId(LibraryAnalyzer.LibraryType.FORGE.getPatchId())
+                    .setVersion(selfVersion));
             dependencies.add(dependencyManager.checkLibraryCompletionAsync(installProfile.getVersionInfo()));
         }
     }

HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeRemoteVersion.java

@@ -17,7 +17,10 @@
  */
 package org.jackhuang.hmcl.download.forge;
 
+import org.jackhuang.hmcl.download.DefaultDependencyManager;
 import org.jackhuang.hmcl.download.RemoteVersion;
+import org.jackhuang.hmcl.game.Version;
+import org.jackhuang.hmcl.task.Task;
 
 public class ForgeRemoteVersion extends RemoteVersion {
     /**
@@ -30,4 +33,9 @@ public class ForgeRemoteVersion extends RemoteVersion {
     public ForgeRemoteVersion(String gameVersion, String selfVersion, String url) {
         super(gameVersion, selfVersion, url);
     }
+
+    @Override
+    public Task<Version> getInstallTask(DefaultDependencyManager dependencyManager, Version baseVersion) {
+        return new ForgeInstallTask(dependencyManager, baseVersion, this);
+    }
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeVersionList.java

@@ -45,12 +45,12 @@ public final class ForgeVersionList extends VersionList<ForgeRemoteVersion> {
     }
 
     @Override
-    public Task refreshAsync(DownloadProvider downloadProvider) {
+    public Task<?> refreshAsync(DownloadProvider downloadProvider) {
         final GetTask task = new GetTask(NetworkUtils.toURL(downloadProvider.injectURL(FORGE_LIST)));
-        return new Task() {
+        return new Task<Void>() {
 
             @Override
-            public Collection<Task> getDependents() {
+            public Collection<Task<?>> getDependents() {
                 return Collections.singleton(task);
             }
 

HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameAssetDownloadTask.java

@@ -38,38 +38,38 @@ import java.util.List;
  *
  * @author huangyuhui
  */
-public final class GameAssetDownloadTask extends Task {
+public final class GameAssetDownloadTask extends Task<Void> {
     
     private final AbstractDependencyManager dependencyManager;
     private final Version version;
     private final AssetIndexInfo assetIndexInfo;
     private final File assetIndexFile;
-    private final List<Task> dependents = new LinkedList<>();
-    private final List<Task> dependencies = new LinkedList<>();
+    private final List<Task<?>> dependents = new LinkedList<>();
+    private final List<Task<?>> dependencies = new LinkedList<>();
 
     /**
      * Constructor.
      *
      * @param dependencyManager the dependency manager that can provides {@link org.jackhuang.hmcl.game.GameRepository}
-     * @param version the <b>resolved</b> version
+     * @param version the game version
      */
     public GameAssetDownloadTask(AbstractDependencyManager dependencyManager, Version version, boolean forceDownloadingIndex) {
         this.dependencyManager = dependencyManager;
-        this.version = version;
-        this.assetIndexInfo = version.getAssetIndex();
+        this.version = version.resolve(dependencyManager.getGameRepository());
+        this.assetIndexInfo = this.version.getAssetIndex();
         this.assetIndexFile = dependencyManager.getGameRepository().getIndexFile(version.getId(), assetIndexInfo.getId());
 
         if (!assetIndexFile.exists() || forceDownloadingIndex)
-            dependents.add(new GameAssetIndexDownloadTask(dependencyManager, version));
+            dependents.add(new GameAssetIndexDownloadTask(dependencyManager, this.version));
     }
 
     @Override
-    public Collection<Task> getDependents() {
+    public Collection<Task<?>> getDependents() {
         return dependents;
     }
 
     @Override
-    public Collection<Task> getDependencies() {
+    public Collection<Task<?>> getDependencies() {
         return dependencies;
     }
     
@@ -89,7 +89,6 @@ public final class GameAssetDownloadTask extends Task {
                     String url = dependencyManager.getDownloadProvider().getAssetBaseURL() + assetObject.getLocation();
                     FileDownloadTask task = new FileDownloadTask(NetworkUtils.toURL(url), file, new FileDownloadTask.IntegrityCheck("SHA-1", assetObject.getHash()));
                     task.setName(assetObject.getHash());
-                    task.setCaching(true);
                     dependencies.add(task
                             .setCacheRepository(dependencyManager.getCacheRepository())
                             .setCaching(true)

HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameAssetIndexDownloadTask.java

@@ -22,7 +22,6 @@ import org.jackhuang.hmcl.game.AssetIndexInfo;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.task.FileDownloadTask;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.util.CacheRepository;
 import org.jackhuang.hmcl.util.io.NetworkUtils;
 
 import java.io.File;
@@ -34,11 +33,11 @@ import java.util.List;
  *
  * @author huangyuhui
  */
-public final class GameAssetIndexDownloadTask extends Task {
+public final class GameAssetIndexDownloadTask extends Task<Void> {
 
     private final AbstractDependencyManager dependencyManager;
     private final Version version;
-    private final List<Task> dependencies = new LinkedList<>();
+    private final List<Task<?>> dependencies = new LinkedList<>();
 
     /**
      * Constructor.
@@ -53,7 +52,7 @@ public final class GameAssetIndexDownloadTask extends Task {
     }
 
     @Override
-    public List<Task> getDependencies() {
+    public List<Task<?>> getDependencies() {
         return dependencies;
     }
 

HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameDownloadTask.java

@@ -26,6 +26,7 @@ import org.jackhuang.hmcl.util.CacheRepository;
 import org.jackhuang.hmcl.util.io.NetworkUtils;
 
 import java.io.File;
+import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -33,22 +34,22 @@ import java.util.List;
  *
  * @author huangyuhui
  */
-public final class GameDownloadTask extends Task {
+public final class GameDownloadTask extends Task<Void> {
     private final DefaultDependencyManager dependencyManager;
     private final String gameVersion;
     private final Version version;
-    private final List<Task> dependencies = new LinkedList<>();
+    private final List<Task<?>> dependencies = new LinkedList<>();
 
     public GameDownloadTask(DefaultDependencyManager dependencyManager, String gameVersion, Version version) {
         this.dependencyManager = dependencyManager;
         this.gameVersion = gameVersion;
-        this.version = version;
+        this.version = version.resolve(dependencyManager.getGameRepository());
 
         setSignificance(TaskSignificance.MODERATE);
     }
 
     @Override
-    public List<Task> getDependencies() {
+    public Collection<Task<?>> getDependencies() {
         return dependencies;
     }
 

HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameInstallTask.java

@@ -0,0 +1,79 @@
+/*
+ * 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.download.game;
+
+import org.jackhuang.hmcl.download.DefaultDependencyManager;
+import org.jackhuang.hmcl.game.DefaultGameRepository;
+import org.jackhuang.hmcl.game.Version;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import static org.jackhuang.hmcl.download.LibraryAnalyzer.LibraryType.MINECRAFT;
+
+public class GameInstallTask extends Task<Version> {
+
+    private final DefaultGameRepository gameRepository;
+    private final DefaultDependencyManager dependencyManager;
+    private final Version version;
+    private final GameRemoteVersion remote;
+    private final VersionJsonDownloadTask downloadTask;
+    private final List<Task<?>> dependencies = new LinkedList<>();
+
+    public GameInstallTask(DefaultDependencyManager dependencyManager, Version version, GameRemoteVersion remoteVersion) {
+        this.dependencyManager = dependencyManager;
+        this.gameRepository = dependencyManager.getGameRepository();
+        this.version = version;
+        this.remote = remoteVersion;
+        this.downloadTask = new VersionJsonDownloadTask(remoteVersion.getGameVersion(), dependencyManager);
+    }
+
+    @Override
+    public Collection<Task<?>> getDependents() {
+        return Collections.singleton(downloadTask);
+    }
+
+    @Override
+    public Collection<Task<?>> getDependencies() {
+        return dependencies;
+    }
+
+    @Override
+    public boolean isRelyingOnDependencies() {
+        return false;
+    }
+
+    @Override
+    public void execute() throws Exception {
+        Version patch = JsonUtils.GSON.fromJson(downloadTask.getResult(), Version.class)
+                .setId(MINECRAFT.getPatchId()).setVersion(remote.getGameVersion()).setJar(null).setPriority(0);
+        setResult(patch);
+
+        Version version = new Version(this.version.getId()).addPatch(patch);
+        dependencies.add(new GameDownloadTask(dependencyManager, remote.getGameVersion(), version)
+                .thenComposeAsync(Task.allOf(
+                        new GameAssetDownloadTask(dependencyManager, version, GameAssetDownloadTask.DOWNLOAD_INDEX_FORCIBLY),
+                        new GameLibrariesTask(dependencyManager, version)
+                ).withComposeAsync(gameRepository.save(version))));
+    }
+
+}

HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameLibrariesTask.java

@@ -32,28 +32,28 @@ import java.util.List;
  *
  * @author huangyuhui
  */
-public final class GameLibrariesTask extends Task {
+public final class GameLibrariesTask extends Task<Void> {
 
     private final AbstractDependencyManager dependencyManager;
     private final Version version;
     private final List<Library> libraries;
-    private final List<Task> dependencies = new LinkedList<>();
+    private final List<Task<?>> dependencies = new LinkedList<>();
 
     /**
      * Constructor.
      *
      * @param dependencyManager the dependency manager that can provides {@link org.jackhuang.hmcl.game.GameRepository}
-     * @param version the <b>resolved</b> version
+     * @param version the game version
      */
     public GameLibrariesTask(AbstractDependencyManager dependencyManager, Version version) {
-        this(dependencyManager, version, version.getLibraries());
+        this(dependencyManager, version, version.resolve(dependencyManager.getGameRepository()).getLibraries());
     }
 
     /**
      * Constructor.
      *
      * @param dependencyManager the dependency manager that can provides {@link org.jackhuang.hmcl.game.GameRepository}
-     * @param version the <b>resolved</b> version
+     * @param version the game version
      */
     public GameLibrariesTask(AbstractDependencyManager dependencyManager, Version version, List<Library> libraries) {
         this.dependencyManager = dependencyManager;
@@ -64,7 +64,7 @@ public final class GameLibrariesTask extends Task {
     }
 
     @Override
-    public List<Task> getDependencies() {
+    public List<Task<?>> getDependencies() {
         return dependencies;
     }
 

HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameRemoteVersion.java

@@ -17,8 +17,11 @@
  */
 package org.jackhuang.hmcl.download.game;
 
+import org.jackhuang.hmcl.download.DefaultDependencyManager;
 import org.jackhuang.hmcl.download.RemoteVersion;
 import org.jackhuang.hmcl.game.ReleaseType;
+import org.jackhuang.hmcl.game.Version;
+import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.util.Immutable;
 
 import java.util.Date;
@@ -47,6 +50,11 @@ public final class GameRemoteVersion extends RemoteVersion {
         return type;
     }
 
+    @Override
+    public Task<Version> getInstallTask(DefaultDependencyManager dependencyManager, Version baseVersion) {
+        return new GameInstallTask(dependencyManager, baseVersion, this);
+    }
+
     @Override
     public int compareTo(RemoteVersion o) {
         if (!(o instanceof GameRemoteVersion))

HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameVersionList.java

@@ -21,7 +21,6 @@ import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.download.VersionList;
 import org.jackhuang.hmcl.task.GetTask;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.NetworkUtils;
 
@@ -48,18 +47,18 @@ public final class GameVersionList extends VersionList<GameRemoteVersion> {
     protected Collection<GameRemoteVersion> getVersionsImpl(String gameVersion) {
         lock.readLock().lock();
         try {
-            return StringUtils.isBlank(gameVersion) ? versions.values() : versions.get(gameVersion);
+            return versions.values();
         } finally {
             lock.readLock().unlock();
         }
     }
 
     @Override
-    public Task refreshAsync(DownloadProvider downloadProvider) {
+    public Task<?> refreshAsync(DownloadProvider downloadProvider) {
         GetTask task = new GetTask(NetworkUtils.toURL(downloadProvider.getVersionListURL()));
-        return new Task() {
+        return new Task<Void>() {
             @Override
-            public Collection<Task> getDependents() {
+            public Collection<Task<?>> getDependents() {
                 return Collections.singleton(task);
             }
 

HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/LibrariesUniqueTask.java

@@ -1,96 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.download.game;
-
-import org.jackhuang.hmcl.game.CompatibilityRule;
-import org.jackhuang.hmcl.game.Library;
-import org.jackhuang.hmcl.game.Version;
-import org.jackhuang.hmcl.task.TaskResult;
-import org.jackhuang.hmcl.util.SimpleMultimap;
-import org.jackhuang.hmcl.util.gson.JsonUtils;
-import org.jackhuang.hmcl.util.versioning.VersionNumber;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class LibrariesUniqueTask extends TaskResult<Version> {
-    private final Version version;
-
-    public LibrariesUniqueTask(Version version) {
-        this.version = version;
-    }
-
-    @Override
-    public void execute() {
-        List<Library> libraries = new ArrayList<>(version.getLibraries());
-
-        SimpleMultimap<String, Library> multimap = new SimpleMultimap<String, Library>(HashMap::new, LinkedList::new);
-
-        for (Library library : libraries) {
-            String id = library.getGroupId() + ":" + library.getArtifactId();
-            VersionNumber number = VersionNumber.asVersion(library.getVersion());
-            String serialized = JsonUtils.GSON.toJson(library);
-
-            if (multimap.containsKey(id)) {
-                boolean duplicate = false;
-                for (Library otherLibrary : multimap.get(id)) {
-                    VersionNumber otherNumber = VersionNumber.asVersion(otherLibrary.getVersion());
-                    if (CompatibilityRule.equals(library.getRules(), otherLibrary.getRules())) { // rules equal, ignore older version.
-                        boolean flag = true;
-                        if (number.compareTo(otherNumber) > 0) { // if this library is newer
-                            multimap.removeValue(otherLibrary);
-                            multimap.put(id, library);
-                            break;
-                        } else if (number.compareTo(otherNumber) == 0) { // same library id.
-                            // prevent from duplicated libraries
-                            if (library.equals(otherLibrary)) {
-                                String otherSerialized = JsonUtils.GSON.toJson(otherLibrary);
-                                // A trick, the library that has more information is better, which can be
-                                // considered whose serialized JSON text will be longer.
-                                if (serialized.length() > otherSerialized.length()) {
-                                    multimap.removeValue(id, otherLibrary);
-                                    multimap.put(id, library);
-                                    break;
-                                }
-                            } else {
-                                // for text2speech, which have same library id as well as version number,
-                                // but its library and native library does not equal
-                                flag = false;
-                            }
-                        }
-                        if (flag) {
-                            duplicate = true;
-                            break;
-                        }
-                    }
-                }
-
-                if (!duplicate) {
-                    multimap.put(id, library);
-                }
-            } else {
-                multimap.put(id, library);
-            }
-        }
-
-        setResult(version.setLibraries(multimap.values().stream().sorted().collect(Collectors.toList())));
-    }
-}

HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/LibraryDownloadTask.java

@@ -45,7 +45,7 @@ import java.util.logging.Level;
 import static org.jackhuang.hmcl.util.DigestUtils.digest;
 import static org.jackhuang.hmcl.util.Hex.encodeHex;
 
-public class LibraryDownloadTask extends Task {
+public class LibraryDownloadTask extends Task<Void> {
     private FileDownloadTask task;
     protected final File jar;
     protected final DefaultCacheRepository cacheRepository;
@@ -74,7 +74,7 @@ public class LibraryDownloadTask extends Task {
     }
 
     @Override
-    public Collection<? extends Task> getDependents() {
+    public Collection<Task<?>> getDependents() {
         if (cached) return Collections.emptyList();
         else return Collections.singleton(task);
     }
@@ -91,7 +91,7 @@ public class LibraryDownloadTask extends Task {
         if (!isDependentsSucceeded()) {
             // Since FileDownloadTask wraps the actual exception with DownloadException.
             // We should extract it letting the error message clearer.
-            Throwable t = task.getLastException();
+            Exception t = task.getException();
             if (t instanceof DownloadException)
                 throw new LibraryDownloadException(library, t.getCause());
             else
@@ -128,12 +128,16 @@ public class LibraryDownloadTask extends Task {
         try {
             URL packXz = NetworkUtils.toURL(url + ".pack.xz");
             if (NetworkUtils.urlExists(packXz)) {
-                task = new FileDownloadTask(packXz, xzFile, null).setCaching(true);
+                task = new FileDownloadTask(packXz, xzFile, null)
+                        .setCacheRepository(cacheRepository)
+                        .setCaching(true);
                 xz = true;
             } else {
                 task = new FileDownloadTask(NetworkUtils.toURL(url),
                         jar,
-                        library.getDownload().getSha1() != null ? new IntegrityCheck("SHA-1", library.getDownload().getSha1()) : null).setCaching(true);
+                        library.getDownload().getSha1() != null ? new IntegrityCheck("SHA-1", library.getDownload().getSha1()) : null)
+                        .setCacheRepository(cacheRepository)
+                        .setCaching(true);
                 xz = false;
             }
         } catch (IOException e) {