Add some task test

HMCL/build.gradle

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

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

@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hmcl;
 
+import com.jfoenix.utils.JFXUtilities;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.stage.Stage;
@@ -24,9 +25,7 @@ import org.jackhuang.hmcl.setting.ConfigHolder;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.upgrade.UpdateChecker;
-import org.jackhuang.hmcl.util.CrashReporter;
-import org.jackhuang.hmcl.util.Lang;
-import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.*;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 
 import java.io.File;
@@ -40,7 +39,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.Logging.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
@@ -99,7 +97,7 @@ public final class Launcher extends Application {
     public static void stopApplication() {
         LOG.info("Stopping application.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
 
-        runInFX(() -> {
+        JFXUtilities.runInFX(() -> {
             if (Controllers.getStage() == null)
                 return;
             Controllers.getStage().close();
@@ -113,7 +111,7 @@ public final class Launcher extends Application {
     public static void stopWithoutPlatform() {
         LOG.info("Stopping application without JavaFX Toolkit.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
 
-        runInFX(() -> {
+        JFXUtilities.runInFX(() -> {
             if (Controllers.getStage() == null)
                 return;
             Controllers.getStage().close();

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

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

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

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

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

@@ -30,7 +30,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;

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

@@ -36,13 +36,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 +77,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;
     }
 

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

@@ -18,7 +18,6 @@
 package org.jackhuang.hmcl.game;
 
 import javafx.application.Platform;
-import javafx.stage.Stage;
 import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.AuthInfo;
@@ -103,7 +102,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) {
             }
@@ -122,15 +121,15 @@ public final class LauncherHelper {
         Version version = MaintainTask.maintain(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))
+                .thenCompose(() -> {
                     if (setting.isNotCheckGame())
                         return null;
                     else
                         return dependencyManager.checkGameCompletionAsync(version);
                 })
-                .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.MODS)))
-                .then(() -> {
+                .thenRun(Schedulers.javafx(), () -> emitStatus(LoadingState.MODS))
+                .thenCompose(() -> {
                     try {
                         ModpackConfiguration<?> configuration = ModpackHelper.readModpackConfiguration(repository.getModpackConfiguration(selectedVersion));
                         if ("Curse".equals(configuration.getType()))
@@ -141,8 +140,8 @@ public final class LauncherHelper {
                         return null;
                     }
                 })
-                .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.LOGGING_IN)))
-                .thenCompose(() -> Task.ofResult(i18n("account.methods"), () -> {
+                .thenRun(Schedulers.javafx(), () -> emitStatus(LoadingState.LOGGING_IN))
+                .thenSupply(i18n("account.methods"), () -> {
                     try {
                         return account.logIn();
                     } catch (CredentialExpiredException e) {
@@ -152,7 +151,7 @@ public final class LauncherHelper {
                         LOG.warning("Authentication failed, try playing offline: " + e);
                         return account.playOffline().orElseThrow(() -> e);
                     }
-                }))
+                })
                 .thenApply(Schedulers.javafx(), authInfo -> {
                     emitStatus(LoadingState.LAUNCHING);
                     return authInfo;
@@ -164,7 +163,7 @@ public final class LauncherHelper {
                         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
                     if (scriptFile == null) {
@@ -200,7 +199,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 +213,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) {
@@ -399,10 +398,7 @@ public final class LauncherHelper {
     private void checkExit() {
         switch (launcherVisibility) {
             case HIDE_AND_REOPEN:
-                Platform.runLater(() -> {
-                    Optional.ofNullable(Controllers.getStage())
-                            .ifPresent(Stage::show);
-                });
+                Platform.runLater(Controllers.getStage()::show);
                 break;
             case KEEP:
                 // No operations here
@@ -420,7 +416,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 +436,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 +444,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

@@ -86,7 +86,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 +117,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));
+                    .thenCompose(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

@@ -20,13 +20,12 @@ package org.jackhuang.hmcl.game;
 import org.jackhuang.hmcl.mod.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/game/TexturesLoader.java

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

HMCL/src/main/java/org/jackhuang/hmcl/setting/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

@@ -19,6 +19,7 @@ package org.jackhuang.hmcl.setting;
 
 import com.google.gson.*;
 import com.google.gson.annotations.JsonAdapter;
+import com.jfoenix.utils.JFXUtilities;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
@@ -31,7 +32,7 @@ import org.jackhuang.hmcl.game.HMCLCacheRepository;
 import org.jackhuang.hmcl.game.HMCLGameRepository;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.ui.WeakListenerHolder;
-import org.jackhuang.hmcl.util.ToStringBuilder;
+import org.jackhuang.hmcl.util.*;
 import org.jackhuang.hmcl.util.javafx.ObservableHelper;
 
 import java.io.File;
@@ -39,7 +40,6 @@ import java.lang.reflect.Type;
 import java.util.Optional;
 
 import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
-import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 
 /**
  *
@@ -144,7 +144,7 @@ public final class Profile implements Observable {
     }
 
     private void checkSelectedVersion() {
-        runInFX(() -> {
+        JFXUtilities.runInFX(() -> {
             if (!repository.isLoaded()) return;
             String newValue = selectedVersion.get();
             if (!repository.hasVersion(newValue)) {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -17,7 +17,9 @@
  */
 package org.jackhuang.hmcl.ui;
 
+import com.jfoenix.utils.JFXUtilities;
 import javafx.application.Platform;
+import javafx.scene.image.Image;
 import javafx.scene.layout.Region;
 import org.jackhuang.hmcl.event.EventBus;
 import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
@@ -41,8 +43,6 @@ import org.jackhuang.hmcl.util.io.CompressingUtils;
 import java.io.File;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static org.jackhuang.hmcl.ui.FXUtils.newImage;
-import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class LeftPaneController extends AdvancedListBox {
@@ -70,12 +70,12 @@ public final class LeftPaneController extends AdvancedListBox {
         profileListItem.profileProperty().bind(Profiles.selectedProfileProperty());
 
         AdvancedListItem gameItem = new AdvancedListItem();
-        gameItem.setImage(newImage("/assets/img/bookshelf.png"));
+        gameItem.setImage(new Image("/assets/img/bookshelf.png"));
         gameItem.setTitle(i18n("version.manage"));
         gameItem.setOnAction(e -> Controllers.navigate(Controllers.getGameListPage()));
 
         AdvancedListItem launcherSettingsItem = new AdvancedListItem();
-        launcherSettingsItem.setImage(newImage("/assets/img/command.png"));
+        launcherSettingsItem.setImage(new Image("/assets/img/command.png"));
         launcherSettingsItem.setTitle(i18n("settings.launcher"));
         launcherSettingsItem.setOnAction(e -> Controllers.navigate(Controllers.getSettingsPage()));
 
@@ -111,19 +111,20 @@ public final class LeftPaneController extends AdvancedListBox {
     private boolean checkedModpack = false;
 
     private void onRefreshedVersions(HMCLGameRepository repository) {
-        runInFX(() -> {
+        JFXUtilities.runInFX(() -> {
             if (!checkedModpack) {
                 checkedModpack = true;
 
                 if (repository.getVersionCount() == 0) {
                     File modpackFile = new File("modpack.zip").getAbsoluteFile();
                     if (modpackFile.exists()) {
-                        Task.ofResult(() -> CompressingUtils.findSuitableEncoding(modpackFile.toPath()))
+                        Task.supplyAsync(() -> 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 -> {
-                                    Controllers.taskDialog(executor, i18n("modpack.installing"));
+                                .thenAccept(modpack -> {
+                                    AtomicReference<Region> region = new AtomicReference<>();
+                                    TaskExecutor executor = ModpackHelper.getInstallTask(repository.getProfile(), modpackFile, modpack.getName(), modpack)
+                                            .withRun(Schedulers.javafx(), this::checkAccount).executor();
+                                    region.set(Controllers.taskDialog(executor, i18n("modpack.installing")));
                                     executor.start();
                                 }).start();
                     }

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

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

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

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

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

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

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

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

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

@@ -33,7 +33,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;

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

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

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

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

HMCL/src/main/java/org/jackhuang/hmcl/ui/ToolbarListPageSkin.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.ui;
-
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXScrollPane;
-import com.jfoenix.effects.JFXDepthManager;
-import javafx.beans.binding.Bindings;
-import javafx.geometry.Insets;
-import javafx.scene.Node;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.control.SkinBase;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.setting.Theme;
-import org.jackhuang.hmcl.ui.construct.SpinnerPane;
-
-import java.util.List;
-
-public abstract class ToolbarListPageSkin<T extends ListPageBase<? extends Node>> extends SkinBase<T> {
-
-    public ToolbarListPageSkin(T skinnable) {
-        super(skinnable);
-
-        SpinnerPane spinnerPane = new SpinnerPane();
-        spinnerPane.getStyleClass().add("large-spinner-pane");
-
-        BorderPane root = new BorderPane();
-
-        {
-            HBox toolbar = new HBox();
-            toolbar.getStyleClass().add("jfx-tool-bar-second");
-            JFXDepthManager.setDepth(toolbar, 1);
-            toolbar.setPickOnBounds(false);
-            toolbar.getChildren().setAll(initializeToolbar(skinnable));
-            root.setTop(toolbar);
-        }
-
-        {
-            ScrollPane scrollPane = new ScrollPane();
-            scrollPane.setFitToWidth(true);
-
-            VBox content = new VBox();
-            content.setSpacing(10);
-            content.setPadding(new Insets(10));
-
-            Bindings.bindContent(content.getChildren(), skinnable.itemsProperty());
-
-            scrollPane.setContent(content);
-            JFXScrollPane.smoothScrolling(scrollPane);
-
-            root.setCenter(scrollPane);
-        }
-
-        spinnerPane.loadingProperty().bind(skinnable.loadingProperty());
-        spinnerPane.setContent(root);
-
-        getChildren().setAll(spinnerPane);
-    }
-
-    public static Node wrap(Node node) {
-        StackPane stackPane = new StackPane();
-        stackPane.setPadding(new Insets(0, 5, 0, 2));
-        stackPane.getChildren().setAll(node);
-        return stackPane;
-    }
-
-    public static JFXButton createToolbarButton(String text, SVG.SVGIcon creator, Runnable onClick) {
-        JFXButton ret = new JFXButton();
-        ret.getStyleClass().add("jfx-tool-bar-button");
-        ret.textFillProperty().bind(Theme.foregroundFillBinding());
-        ret.setGraphic(wrap(creator.createIcon(Theme.foregroundFillBinding(), -1, -1)));
-        ret.setText(text);
-        ret.setOnMouseClicked(e -> onClick.run());
-        return ret;
-    }
-
-    protected abstract List<Node> initializeToolbar(T skinnable);
-}

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

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

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

@@ -18,11 +18,11 @@
 package org.jackhuang.hmcl.ui;
 
 import javafx.scene.Scene;
+import javafx.scene.image.Image;
 import javafx.scene.web.WebView;
 import javafx.stage.Stage;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
-import static org.jackhuang.hmcl.ui.FXUtils.newImage;
 
 public class WebStage extends Stage {
     private final WebView webView = new WebView();
@@ -30,7 +30,7 @@ public class WebStage extends Stage {
     public WebStage() {
         setScene(new Scene(webView, 800, 480));
         getScene().getStylesheets().addAll(config().getTheme().getStylesheets());
-        getIcons().add(newImage("/assets/img/icon.png"));
+        getIcons().add(new Image("/assets/img/icon.png"));
     }
 
     public WebView getWebView() {

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

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

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

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

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

@@ -17,10 +17,9 @@
  */
 package org.jackhuang.hmcl.ui.account;
 
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXComboBox;
-import com.jfoenix.controls.JFXPasswordField;
-import com.jfoenix.controls.JFXTextField;
+import com.jfoenix.utils.JFXUtilities;
+import com.jfoenix.controls.*;
+
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.ListProperty;
@@ -54,7 +53,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
-
 import static java.util.Collections.emptyList;
 import static java.util.Collections.unmodifiableList;
 import static java.util.Objects.requireNonNull;
@@ -197,7 +195,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) {
@@ -295,7 +293,7 @@ public class AddAccountPane extends StackPane {
             } catch (InterruptedException ignore) {
                 throw new NoSelectedCharacterException();
             } finally {
-                runInFX(() -> Selector.this.fireEvent(new DialogCloseEvent()));
+                JFXUtilities.runInFX(() -> Selector.this.fireEvent(new DialogCloseEvent()));
             }
         }
     }

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

@@ -27,7 +27,6 @@ import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.ui.Controllers;
-import org.jackhuang.hmcl.ui.ListPage;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
 import org.jackhuang.hmcl.util.javafx.MappedObservableList;
 
@@ -36,14 +35,21 @@ 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 {
+public class AuthlibInjectorServersPage extends StackPane implements DecoratorPage {
     private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper(this, "title", i18n("account.injector.manage.title"));
 
-    private final ObservableList<AuthlibInjectorServerItem> serverItems;
+    @FXML private ScrollPane scrollPane;
+    @FXML private VBox listPane;
+    @FXML private StackPane contentPane;
+
+    private ObservableList<AuthlibInjectorServerItem> serverItems;
 
     public AuthlibInjectorServersPage() {
+        loadFXML(this, "/assets/fxml/authlib-injector-servers.fxml");
+        smoothScrolling(scrollPane);
+
         serverItems = MappedObservableList.create(config().getAuthlibInjectorServers(), this::createServerItem);
-        Bindings.bindContent(itemsProperty(), serverItems);
+        Bindings.bindContent(listPane.getChildren(), serverItems);
     }
 
     private AuthlibInjectorServerItem createServerItem(AuthlibInjectorServer server) {
@@ -51,8 +57,8 @@ public class AuthlibInjectorServersPage extends ListPage<AuthlibInjectorServerIt
                 item -> config().getAuthlibInjectorServers().remove(item.getServer()));
     }
 
-    @Override
-    public void add() {
+    @FXML
+    private void onAdd() {
         Controllers.dialog(new AddAuthlibInjectorServerPane());
     }
 

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

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

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

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

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

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

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

@@ -42,7 +42,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,12 +72,12 @@ 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;
 
@@ -113,7 +113,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 +125,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 +142,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/DecoratorController.java

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

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.

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

@@ -21,27 +21,20 @@ 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;
 import org.jackhuang.hmcl.ui.wizard.WizardProvider;
 import org.jackhuang.hmcl.util.StringUtils;
-import org.jackhuang.hmcl.util.i18n.I18n;
-import org.jackhuang.hmcl.util.io.ResponseCodeException;
 
-import java.net.SocketTimeoutException;
 import java.util.Map;
 
-import static org.jackhuang.hmcl.download.LibraryAnalyzer.LibraryType.*;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class InstallerWizardProvider implements WizardProvider {
@@ -58,9 +51,9 @@ public final class InstallerWizardProvider implements WizardProvider {
         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);
+        forge = analyzer.getForge().map(Library::getVersion).orElse(null);
+        liteLoader = analyzer.getLiteLoader().map(Library::getVersion).orElse(null);
+        optiFine = analyzer.getOptiFine().map(Library::getVersion).orElse(null);
     }
 
     public Profile getProfile() {
@@ -96,7 +89,7 @@ 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")));
@@ -107,7 +100,7 @@ public final class InstallerWizardProvider implements WizardProvider {
         if (settings.containsKey("optifine"))
             ret = ret.thenCompose(profile.getDependency().installLibraryAsync((RemoteVersion) settings.get("optifine")));
 
-        return ret.then(profile.getRepository().refreshVersionsAsync());
+        return ret.thenCompose(profile.getRepository().refreshVersionsAsync());
     }
 
     @Override
@@ -130,25 +123,7 @@ public final class InstallerWizardProvider implements WizardProvider {
         if (exception instanceof LibraryDownloadException) {
             Controllers.dialog(i18n("launch.failed.download_library", ((LibraryDownloadException) exception).getLibrary().getName()) + "\n" + StringUtils.getStackTrace(exception.getCause()), i18n("install.failed.downloading"), MessageType.ERROR, next);
         } else if (exception instanceof DownloadException) {
-            if (exception.getCause() instanceof SocketTimeoutException) {
-                Controllers.dialog(i18n("install.failed.downloading.timeout", ((DownloadException) exception).getUrl()), i18n("install.failed.downloading"), MessageType.ERROR, next);
-            } else if (exception.getCause() instanceof ResponseCodeException) {
-                ResponseCodeException responseCodeException = (ResponseCodeException) exception.getCause();
-                if (I18n.hasKey("download.code." + responseCodeException.getResponseCode())) {
-                    Controllers.dialog(i18n("download.code." + responseCodeException.getResponseCode()) + ", " + ((DownloadException) exception).getUrl() + "\n" + StringUtils.getStackTrace(exception.getCause()), i18n("install.failed.downloading"), MessageType.ERROR, next);
-                } else {
-                    Controllers.dialog(i18n("install.failed.downloading.detail", ((DownloadException) exception).getUrl()) + "\n" + StringUtils.getStackTrace(exception.getCause()), i18n("install.failed.downloading"), MessageType.ERROR, next);
-                }
-            } else {
-                Controllers.dialog(i18n("install.failed.downloading.detail", ((DownloadException) exception).getUrl()) + "\n" + StringUtils.getStackTrace(exception.getCause()), i18n("install.failed.downloading"), MessageType.ERROR, next);
-            }
-        } else if (exception instanceof OptiFineInstallTask.UnsupportedOptiFineInstallationException) {
-            Controllers.dialog(i18n("install.failed.optifine_conflict"), i18n("install.failed"), MessageType.ERROR, next);
-        } else if (exception instanceof UnsupportedOperationException) {
-            Controllers.dialog(i18n("install.failed.install_online"), i18n("install.failed"), MessageType.ERROR, next);
-        } else if (exception instanceof VersionMismatchException) {
-            VersionMismatchException e = ((VersionMismatchException) exception);
-            Controllers.dialog(i18n("install.failed.version_mismatch", e.getExpect(), e.getActual()), i18n("install.failed"), MessageType.ERROR, next);
+            Controllers.dialog(i18n("install.failed.downloading.detail", ((DownloadException) exception).getUrl()) + "\n" + StringUtils.getStackTrace(exception.getCause()), i18n("install.failed.downloading"), MessageType.ERROR, next);
         } else {
             Controllers.dialog(StringUtils.getStackTrace(exception), i18n("install.failed"), MessageType.ERROR, next);
         }

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

@@ -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)));
+                    .thenRun(Schedulers.javafx(), () -> profile.setSelectedVersion(name));
         }
     }
 

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

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

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

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

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

@@ -43,7 +43,7 @@ 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");
@@ -59,8 +59,8 @@ public final class VanillaInstallWizardProvider implements WizardProvider {
         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())
+                .thenRun(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

@@ -60,8 +60,8 @@ public final class ExportWizardProvider implements WizardProvider {
         List<File> launcherJar = Launcher.getCurrentJarFiles();
         boolean includeLauncher = (Boolean) settings.get(ModpackInfoPage.MODPACK_INCLUDE_LAUNCHER) && launcherJar != null;
 
-        return new Task() {
-            Task dependency = null;
+        return new Task<Void>() {
+            Task<?> dependency = null;
 
             @Override
             public void execute() throws Exception {
@@ -80,7 +80,7 @@ public final class ExportWizardProvider implements WizardProvider {
                         ), tempModpack);
 
                 if (includeLauncher) {
-                    dependency = dependency.then(Task.of(() -> {
+                    dependency = dependency.thenRun(() -> {
                         try (Zipper zip = new Zipper(modpackFile.toPath())) {
                             Config exported = new Config();
 
@@ -109,12 +109,12 @@ 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);
             }
         };

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

@@ -73,9 +73,9 @@ public final class ModpackFileSelectionPage extends StackPane implements WizardP
         ModAdviser.ModSuggestion state = ModAdviser.ModSuggestion.SUGGESTED;
         if (basePath.length() > "minecraft/".length()) {
             state = adviser.advise(StringUtils.substringAfter(basePath, "minecraft/") + (file.isDirectory() ? "/" : ""), file.isDirectory());
-            if (file.isFile() && Objects.equals(FileUtils.getNameWithoutExtension(file), version)) // Ignore <version>.json, <version>.jar
+            if (file.isFile() && Objects.equals(FileUtils.getNameWithoutExtension(file), version))
                 state = ModAdviser.ModSuggestion.HIDDEN;
-            if (file.isDirectory() && Objects.equals(file.getName(), version + "-natives")) // Ignore <version>-natives
+            if (file.isDirectory() && Objects.equals(file.getName(), version + "-natives"))
                 state = ModAdviser.ModSuggestion.HIDDEN;
             if (state == ModAdviser.ModSuggestion.HIDDEN)
                 return null;

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -26,7 +26,6 @@ import org.jackhuang.hmcl.download.LibraryAnalyzer;
 import org.jackhuang.hmcl.game.GameVersion;
 import org.jackhuang.hmcl.setting.Profile;
 
-import static org.jackhuang.hmcl.download.LibraryAnalyzer.LibraryType.*;
 import static org.jackhuang.hmcl.util.Lang.handleUncaught;
 import static org.jackhuang.hmcl.util.Lang.threadPool;
 import static org.jackhuang.hmcl.util.StringUtils.removePrefix;
@@ -56,9 +55,9 @@ public class GameItem extends Control {
                 .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", ""))));
+                    analyzer.getForge().ifPresent(library -> libraries.append(", ").append(i18n("install.installer.forge")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)forge", ""))));
+                    analyzer.getLiteLoader().ifPresent(library -> libraries.append(", ").append(i18n("install.installer.liteloader")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)liteloader", ""))));
+                    analyzer.getOptiFine().ifPresent(library -> libraries.append(", ").append(i18n("install.installer.optifine")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)optifine", ""))));
                     subtitle.set(libraries.toString());
                 }, Platform::runLater)
                 .exceptionally(handleUncaught);

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

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

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

@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hmcl.ui.versions;
 
+import com.jfoenix.utils.JFXUtilities;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXPopup;
 import com.jfoenix.controls.JFXRadioButton;
@@ -32,7 +33,6 @@ import org.jackhuang.hmcl.ui.construct.IconedMenuItem;
 import org.jackhuang.hmcl.ui.construct.MenuSeparator;
 import org.jackhuang.hmcl.ui.construct.PopupMenu;
 
-import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public class GameListItemSkin extends SkinBase<GameListItem> {
@@ -73,7 +73,7 @@ public class GameListItemSkin extends SkinBase<GameListItem> {
             btnUpgrade.setOnMouseClicked(e -> skinnable.update());
             btnUpgrade.getStyleClass().add("toggle-icon4");
             btnUpgrade.setGraphic(SVG.update(Theme.blackFillBinding(), -1, -1));
-            runInFX(() -> FXUtils.installFastTooltip(btnUpgrade, i18n("version.update")));
+            JFXUtilities.runInFX(() -> FXUtils.installFastTooltip(btnUpgrade, i18n("version.update")));
             right.getChildren().add(btnUpgrade);
         }
 
@@ -87,7 +87,7 @@ public class GameListItemSkin extends SkinBase<GameListItem> {
         right.getChildren().add(btnManage);
         root.setRight(right);
 
-        root.setStyle("-fx-background-color: white; -fx-padding: 8 8 8 0;");
+        root.setStyle("-fx-background-color: white; -fx-padding: 8 8 8 12;");
         JFXDepthManager.setDepth(root, 1);
 
         getChildren().setAll(root);

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

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

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

@@ -17,9 +17,6 @@
  */
 package org.jackhuang.hmcl.ui.versions;
 
-import javafx.scene.Node;
-import javafx.scene.control.Skin;
-import javafx.stage.FileChooser;
 import org.jackhuang.hmcl.download.LibraryAnalyzer;
 import org.jackhuang.hmcl.download.MaintainTask;
 import org.jackhuang.hmcl.download.game.VersionJsonSaveTask;
@@ -28,129 +25,53 @@ 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.InstallerItem;
+import org.jackhuang.hmcl.ui.ListPage;
 import org.jackhuang.hmcl.ui.download.InstallerWizardProvider;
-import org.jackhuang.hmcl.ui.download.UpdateInstallerWizardProvider;
-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.Optional;
 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;
 
-public class InstallerListPage extends ListPageBase<InstallerItem> {
+public class InstallerListPage extends ListPage<InstallerItem> {
     private Profile profile;
     private String versionId;
     private Version version;
-    private String gameVersion;
-
-    {
-        FXUtils.applyDragListener(this, it -> Arrays.asList("jar", "exe").contains(FileUtils.getExtension(it)), mods -> {
-            if (!mods.isEmpty())
-                doInstallOffline(mods.get(0));
-        });
-    }
-
-    @Override
-    protected Skin<?> createDefaultSkin() {
-        return new InstallerListPageSkin();
-    }
 
     public void loadVersion(Profile profile, String versionId) {
         this.profile = profile;
         this.versionId = versionId;
         this.version = profile.getRepository().getResolvedVersion(versionId);
-        this.gameVersion = null;
 
-        Task.ofResult(() -> {
-            gameVersion = GameVersion.minecraftVersion(profile.getRepository().getVersionJar(version)).orElse(null);
+        LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(version);
 
-            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)))
-                        .start();
-            };
+        Function<Library, Consumer<InstallerItem>> removeAction = library -> x -> {
+            LinkedList<Library> newList = new LinkedList<>(version.getLibraries());
+            newList.remove(library);
+            new MaintainTask(version.setLibraries(newList))
+                    .thenCompose(maintainedVersion -> new VersionJsonSaveTask(profile.getRepository(), maintainedVersion))
+                    .withCompose(profile.getRepository().refreshVersionsAsync())
+                    .withRun(Schedulers.javafx(), () -> loadVersion(this.profile, this.versionId))
+                    .start();
+        };
 
-            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)));
-        }).start();
+        itemsProperty().clear();
+        analyzer.getForge().ifPresent(library -> itemsProperty().add(new InstallerItem("Forge", library.getVersion(), removeAction.apply(library))));
+        analyzer.getLiteLoader().ifPresent(library -> itemsProperty().add(new InstallerItem("LiteLoader", library.getVersion(), removeAction.apply(library))));
+        analyzer.getOptiFine().ifPresent(library -> itemsProperty().add(new InstallerItem("OptiFine", library.getVersion(), removeAction.apply(library))));
     }
 
-    public void installOnline() {
-        if (gameVersion == null)
+    @Override
+    public void add() {
+        Optional<String> gameVersion = GameVersion.minecraftVersion(profile.getRepository().getVersionJar(version));
+
+        if (!gameVersion.isPresent())
             Controllers.dialog(i18n("version.cannot_read"));
         else
-            Controllers.getDecorator().startWizard(new InstallerWizardProvider(profile, gameVersion, version));
-    }
-
-    public void installOffline() {
-        FileChooser chooser = new FileChooser();
-        chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("install.installer.install_offline.extension"), "*.jar", "*.exe"));
-        File file = chooser.showOpenDialog(Controllers.getStage());
-        if (file != null) doInstallOffline(file);
-    }
-
-    private void doInstallOffline(File file) {
-        Task task = profile.getDependency().installLibraryAsync(version, file.toPath())
-                .then(profile.getRepository().refreshVersionsAsync());
-        task.setName(i18n("install.installer.install_offline"));
-        TaskExecutor executor = task.executor(new TaskListener() {
-            @Override
-            public void onStop(boolean success, TaskExecutor executor) {
-                runInFX(() -> {
-                    if (success) {
-                        loadVersion(profile, versionId);
-                        Controllers.dialog(i18n("install.success"));
-                    } else {
-                        if (executor.getLastException() == null)
-                            return;
-                        InstallerWizardProvider.alertFailureMessage(executor.getLastException(), null);
-                    }
-                });
-            }
-        });
-        Controllers.taskDialog(executor, i18n("install.installer.install_offline"));
-        executor.start();
-    }
-
-    private class InstallerListPageSkin extends ToolbarListPageSkin<InstallerListPage> {
-
-        InstallerListPageSkin() {
-            super(InstallerListPage.this);
-        }
-
-        @Override
-        protected List<Node> initializeToolbar(InstallerListPage skinnable) {
-            return Arrays.asList(
-                    createToolbarButton(i18n("install.installer.install_online"), SVG::plus, skinnable::installOnline),
-                    createToolbarButton(i18n("install.installer.install_offline"), SVG::plus, skinnable::installOffline));
-        }
+            Controllers.getDecorator().startWizard(new InstallerWizardProvider(profile, gameVersion.get(), version));
     }
 }

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

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

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

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

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

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

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

@@ -19,7 +19,6 @@ 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;
@@ -50,7 +49,9 @@ public class Versions {
                 isMovingToTrashSupported ? i18n("version.manage.remove.confirm.trash", version, version + "_removed") :
                         i18n("version.manage.remove.confirm", version);
         Controllers.confirmDialog(message, i18n("message.confirm"), () -> {
-            profile.getRepository().removeVersionFromDisk(version);
+            if (profile.getRepository().removeVersionFromDisk(version)) {
+                profile.getRepository().refreshVersionsAsync().start();
+            }
         }, null);
     }
 

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

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

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

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

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

@@ -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.withRun(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

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

@@ -83,12 +83,7 @@ public class WizardController implements Navigation {
     @Override
     public void onPrev(boolean cleanUp) {
         if (!canPrev()) {
-            if (provider.cancelIfCannotGoBack()) {
-                onCancel();
-                return;
-            } else {
-                throw new IllegalStateException("Cannot go backward since this is the back page. Pages: " + pages);
-            }
+            throw new IllegalStateException("Cannot go backward since this is the back page. Pages: " + pages);
         }
 
         Node page = pages.pop();
@@ -111,7 +106,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/ui/wizard/WizardProvider.java

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

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

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

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

@@ -20,13 +20,12 @@ 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;
 import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.ui.Controllers;
-import org.jackhuang.hmcl.ui.UpgradeDialog;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
@@ -92,42 +91,41 @@ public final class UpdateHandler {
     public static void updateFrom(RemoteVersion version) {
         checkFxUserThread();
 
-        Controllers.dialog(new UpgradeDialog(() -> {
-            Path downloaded;
-            try {
-                downloaded = Files.createTempFile("hmcl-update-", ".jar");
-            } catch (IOException e) {
-                LOG.log(Level.WARNING, "Failed to create temp file", e);
-                return;
-            }
+        Path downloaded;
+        try {
+            downloaded = Files.createTempFile("hmcl-update-", ".jar");
+        } catch (IOException e) {
+            LOG.log(Level.WARNING, "Failed to create temp file", e);
+            return;
+        }
 
-            Task task = new HMCLDownloadTask(version, downloaded);
+        Task<?> task = new HMCLDownloadTask(version, downloaded);
 
-            TaskExecutor executor = task.executor();
-            Controllers.taskDialog(executor, i18n("message.downloading"));
-            thread(() -> {
-                boolean success = executor.test();
+        TaskExecutor executor = task.executor();
+        Controllers.taskDialog(executor, i18n("message.downloading"));
+        thread(() -> {
+            boolean success = executor.test();
 
-                if (success) {
-                    try {
-                        if (!IntegrityChecker.isSelfVerified()) {
-                            throw new IOException("Current JAR is not verified");
-                        }
-
-                        requestUpdate(downloaded, getCurrentLocation());
-                        System.exit(0);
-                    } catch (IOException e) {
-                        LOG.log(Level.WARNING, "Failed to update to " + version, e);
-                        Platform.runLater(() -> Controllers.dialog(StringUtils.getStackTrace(e), i18n("update.failed"), MessageType.ERROR));
+            if (success) {
+                try {
+                    if (!IntegrityChecker.isSelfVerified()) {
+                        throw new IOException("Current JAR is not verified");
                     }
 
-                } else {
-                    Throwable e = executor.getLastException();
+                    requestUpdate(downloaded, getCurrentLocation());
+                    System.exit(0);
+                } catch (IOException e) {
                     LOG.log(Level.WARNING, "Failed to update to " + version, e);
-                    Platform.runLater(() -> Controllers.dialog(e.toString(), i18n("update.failed"), MessageType.ERROR));
+                    Platform.runLater(() -> Controllers.dialog(StringUtils.getStackTrace(e), i18n("update.failed"), MessageType.ERROR));
+                    return;
                 }
-            });
-        }));
+
+            } else {
+                Exception e = executor.getException();
+                LOG.log(Level.WARNING, "Failed to update to " + version, e);
+                Platform.runLater(() -> Controllers.dialog(e.toString(), i18n("update.failed"), MessageType.ERROR));
+            }
+        });
     }
 
     private static void applyUpdate(Path target) throws IOException {

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

@@ -20,6 +20,7 @@ package org.jackhuang.hmcl.util;
 import javafx.application.Platform;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
+
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.ui.CrashWindow;
 import org.jackhuang.hmcl.upgrade.IntegrityChecker;
@@ -51,7 +52,6 @@ public class CrashReporter implements Thread.UncaughtExceptionHandler {
             put("Location is not set", i18n("crash.NoClassDefFound"));
             put("UnsatisfiedLinkError", i18n("crash.user_fault"));
             put("java.lang.NoClassDefFoundError", i18n("crash.NoClassDefFound"));
-            put("org.jackhuang.hmcl.util.ResourceNotFoundError", i18n("crash.NoClassDefFound"));
             put("java.lang.VerifyError", i18n("crash.NoClassDefFound"));
             put("java.lang.NoSuchMethodError", i18n("crash.NoClassDefFound"));
             put("java.lang.NoSuchFieldError", i18n("crash.NoClassDefFound"));

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

@@ -1,41 +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.util;
-
-import java.io.InputStream;
-
-/**
- * Suppress the throwable when we make sure the resource cannot miss.
- * @see CrashReporter
- */
-public class ResourceNotFoundError extends Error {
-    public ResourceNotFoundError(String message) {
-        super(message);
-    }
-
-    public ResourceNotFoundError(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public static InputStream getResourceAsStream(String url) {
-        InputStream stream = ResourceNotFoundError.class.getResourceAsStream(url);
-        if (stream == null)
-            throw new ResourceNotFoundError("Resource not found: " + url);
-        return stream;
-    }
-}

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

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

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

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

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

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

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

@@ -19,7 +19,7 @@
                     <graphic>
                         <BorderPane mouseTransparent="true">
                             <left>
-                                <Label fx:id="lblForge"/>
+                                <Label fx:id="lblForge">Install Forge</Label>
                             </left>
                             <right>
                                 <fx:include source="/assets/svg/arrow-right.fxml"/>
@@ -31,7 +31,7 @@
                     <graphic>
                         <BorderPane mouseTransparent="true">
                             <left>
-                                <Label fx:id="lblLiteLoader"/>
+                                <Label fx:id="lblLiteLoader">Install LiteLoader</Label>
                             </left>
                             <right>
                                 <fx:include source="/assets/svg/arrow-right.fxml"/>
@@ -43,7 +43,7 @@
                     <graphic>
                         <BorderPane mouseTransparent="true">
                             <left>
-                                <Label fx:id="lblOptiFine"/>
+                                <Label fx:id="lblOptiFine">Install OptiFine</Label>
                             </left>
                             <right>
                                 <fx:include source="/assets/svg/arrow-right.fxml"/>

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

@@ -19,7 +19,7 @@
                     <graphic>
                         <BorderPane mouseTransparent="true">
                             <left>
-                                <Label fx:id="lblForge"/>
+                                <Label fx:id="lblForge">Install Forge</Label>
                             </left>
                             <right>
                                 <fx:include source="/assets/svg/arrow-right.fxml"/>
@@ -31,7 +31,7 @@
                     <graphic>
                         <BorderPane mouseTransparent="true">
                             <left>
-                                <Label fx:id="lblLiteLoader"/>
+                                <Label fx:id="lblLiteLoader">Install LiteLoader</Label>
                             </left>
                             <right>
                                 <fx:include source="/assets/svg/arrow-right.fxml"/>
@@ -43,7 +43,7 @@
                     <graphic>
                         <BorderPane mouseTransparent="true">
                             <left>
-                                <Label fx:id="lblOptiFine"/>
+                                <Label fx:id="lblOptiFine">Install OptiFine</Label>
                             </left>
                             <right>
                                 <fx:include source="/assets/svg/arrow-right.fxml"/>

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

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

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

@@ -91,12 +91,11 @@ crash.NoClassDefFound=Please check "HMCL" software is complete.
 crash.user_fault=Your OS or Java environment may not be properly installed resulting in crashing of this software, please check your Java Environment or your computer!
 
 download=Download
-download.code.404=File does not found in remote server
 download.failed=Failed to download
 download.failed.empty=No candidates. Click here to return.
 download.failed.refresh=Unable to load version list. Click here to retry.
 download.provider.bmclapi=BMCLAPI (bangbang93, https://bmclapi2.bangbang93.com/)
-download.provider.mojang=Mojang (Forge and OptiFine installation being downloaded from BMCLAPI)
+download.provider.mojang=Mojang
 
 extension.bat=Windows Bat file
 extension.mod=Mod file
@@ -125,24 +124,13 @@ input.not_empty=Required field
 input.url=Must be a valid URL.
 
 install=Install New Game
-install.change_version=Change version
-install.change_version.confirm=Sure to update %s from verison %s to %s?
 install.failed=Failed to install
 install.failed.downloading=Failed to install due to some files not downloaded successfully
 install.failed.downloading.detail=Failed to download file: %s
-install.failed.downloading.timeout=Download timed out: %s
-install.failed.install_online=Unable to recognize what you provided installer file is
-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.forge=Forge
 install.installer.game=Game
-install.installer.install=Install %s
-install.installer.install_offline=Install/Upgrade from local file
-install.installer.install_offline.extension=Forge/OptiFine installer
-install.installer.install_offline.tooltip=Support importing Forge/OptiFine installer jar file
-install.installer.install_online=Install Online
-install.installer.install_online.tooltip=Support Forge, OptiFine, LiteLoader installation.
+install.installer.install=
 install.installer.liteloader=LiteLoader
 install.installer.not_installed=%s not Installed
 install.installer.optifine=OptiFine
@@ -270,7 +258,6 @@ 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)
 
 datapack=Data packs
 datapack.add=Add data pack
@@ -280,7 +267,6 @@ datapack.title=World %s - Datapacks
 datapack.remove=Remove
 
 world=Worlds/Datapacks
-world.add=Add world(.zip)
 world.datapack=Manage data packs
 world.datapack.1_13=Only Minecraft 1.13 and later versions support data packs.
 world.description=%s. Last played time: %s. Game version: %s.
@@ -297,7 +283,6 @@ world.import.invalid=Not a valid world zip
 world.name=World Name
 world.name.enter=Enter the world name
 world.reveal=Reveal in Explorer
-world.show_all=Show all
 world.time=EEE, MMM d, yyyy HH:mm:ss
 
 profile=Game Directories
@@ -388,8 +373,6 @@ sponsor.bmclapi=To obtain a stable download service, please consider support BMC
 sponsor.hmcl=HMCL is a free, open source Minecraft launcher the enables users to easily manage multiple, separate installations of Minecraft. We're using Afdian so that we can continue to pay for our hosting and project development. Click here for more information.
 
 update=Update
-update.accept=Update
-update.changelog=Changelog
 update.channel.dev=Update to development version
 update.channel.stable=Update to stable version
 update.checking=Checking for updates

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

@@ -90,12 +90,11 @@ crash.NoClassDefFound=請確認 HMCL 本體是否完整，或更新您的 Java
 crash.user_fault=您的系統或 Java 環境可能安裝不當導致本軟體崩潰，請檢查您的 Java 環境或您的電腦！可以嘗試重新安裝 Java。
 
 download=下載
-download.code.404=遠程伺服器不包含需要下載的文件
 download.failed=下載失敗
 download.failed.empty=沒有可供安裝的版本，點擊此處返回。
 download.failed.refresh=載入版本列表失敗，點擊此處重試。
 download.provider.bmclapi=BMCLAPI（bangbang93，https://bmclapi2.bangbang93.com/）
-download.provider.mojang=官方伺服器（Forge 和 OptiFine 自動安裝的下載來源是 BMCLAPI）
+download.provider.mojang=官方伺服器（Mojang）
 
 extension.bat=Windows 腳本
 extension.mod=模組檔案
@@ -124,24 +123,13 @@ input.not_empty=必填
 input.url=必須為有效連結
 
 install=新增遊戲
-install.change_version=更換版本
-install.change_version.confirm=你確定要將 %s 從 %s 更新到 %s 嗎？
 install.failed=安裝失敗
 install.failed.downloading=安裝失敗，部分文件未能完成下載
 install.failed.downloading.detail=未能下載檔案：%s
-install.failed.downloading.timeout=下載超時：%s
-install.failed.install_online=無法識別要安裝的軟體
-install.failed.optifine_conflict=暫不支持 OptiFine 與 Forge 同時安裝在 Minecraft 1.13 上
-install.failed.version_mismatch=該軟體需要的遊戲版本為 %s，但實際的遊戲版本為 %s。
 install.installer.choose=選擇 %s 版本
 install.installer.forge=Forge
 install.installer.game=遊戲
 install.installer.install=安裝 %s
-install.installer.install_offline=從本地檔案安裝/升級
-install.installer.install_offline.extension=Forge/OptiFine 安裝器
-install.installer.install_offline.tooltip=支持導入已經下載好的 Forge/OptiFine 安裝器
-install.installer.install_online=在線安裝
-install.installer.install_online.tooltip=支持安裝 Forge、OptiFine、LiteLoader
 install.installer.liteloader=LiteLoader
 install.installer.not_installed=暫時不安裝 %s，可以點擊此處安裝
 install.installer.optifine=OptiFine
@@ -268,7 +256,6 @@ mods.choose_mod=選擇模組
 mods.enable=啟用
 mods.disable=禁用
 mods.remove=刪除
-mods.not_modded=你需要先在自動安裝頁面安裝 Forge 或 LiteLoader 才能進行模組管理。
 
 datapack=資料包
 datapack.add=添加資料包
@@ -278,7 +265,6 @@ datapack.title=世界 %s - 資料包
 datapack.remove=刪除
 
 world=世界/資料包
-world.add=添加世界
 world.datapack=管理資料包
 world.datapack.1_13=僅 Minecraft 1.13 及之後的版本支持資料包
 world.description=%s. 上一次遊戲時間: %s. 遊戲版本: %s
@@ -295,7 +281,6 @@ world.game_version=遊戲版本
 world.name=世界名稱
 world.name.enter=輸入世界名稱
 world.reveal=打開資料夾
-world.show_all=顯示全部
 world.time=yyyy 年 MM 月 dd 日 HH:mm:ss
 
 profile=遊戲目錄
@@ -386,8 +371,6 @@ sponsor.bmclapi=請贊助 BMCLAPI 從而獲得穩定高速的下載服務，點
 sponsor.hmcl=HMCL 是一個免費、開源的 Minecraft 啟動器，允許玩家方便快捷地安裝、管理、運行遊戲。您的贊助將幫助 HMCL 獲得更好的發展、支持穩定高速的遊戲安裝與文件下載服務。點擊此處查閱更多詳細訊息。
 
 update=啟動器更新
-update.accept=更新
-update.changelog=更新日誌
 update.channel.dev=更新到開發版
 update.channel.stable=更新到推薦版本
 update.checking=正在檢查更新

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

@@ -90,12 +90,11 @@ crash.NoClassDefFound=请确认 HMCL 本体是否完整，或更新您的 Java
 crash.user_fault=您的系统或 Java 环境可能安装不当导致本软件崩溃，请检查您的 Java 环境或您的电脑！可以尝试重新安装 Java。
 
 download=下载
-download.code.404=远程服务器不包含需要下载的文件
 download.failed=下载失败
 download.failed.empty=没有可供安装的版本，点击此处返回。
 download.failed.refresh=加载版本列表失败，点击此处重试。
 download.provider.bmclapi=BMCLAPI（bangbang93，https://bmclapi2.bangbang93.com/）
-download.provider.mojang=官方（Forge 和 OptiFine 自动安装使用 BMCLAPI 下载源）
+download.provider.mojang=官方（Mojang）
 
 extension.bat=Windows 脚本
 extension.mod=模组文件
@@ -124,24 +123,13 @@ input.not_empty=必填项
 input.url=必须是合法的链接
 
 install=添加游戏
-install.change_version=更换版本
-install.change_version.confirm=你确定要将 %s 从 %s 更新到 %s 吗？
 install.failed=安装失败
 install.failed.downloading=安装失败，部分文件未能完成下载
 install.failed.downloading.detail=未能下载文件：%s
-install.failed.downloading.timeout=下载超时：%s
-install.failed.install_online=无法识别要安装的软件
-install.failed.optifine_conflict=暂不支持 OptiFine 与 Forge 同时安装在 Minecraft 1.13 上
-install.failed.version_mismatch=该软件需要的游戏版本为 %s，但实际的游戏版本为 %s。
 install.installer.choose=选择 %s 版本
 install.installer.forge=Forge
 install.installer.game=游戏
 install.installer.install=安装 %s
-install.installer.install_offline=从本地文件安装/升级
-install.installer.install_offline.extension=Forge/OptiFine 安装器
-install.installer.install_offline.tooltip=支持导入已经下载好的 Forge/OptiFine 安装器
-install.installer.install_online=在线安装
-install.installer.install_online.tooltip=支持安装 Forge、OptiFine、LiteLoader
 install.installer.liteloader=LiteLoader
 install.installer.not_installed=暂不安装 %s，可以点击此处安装
 install.installer.optifine=OptiFine
@@ -268,7 +256,6 @@ mods.choose_mod=选择模组
 mods.enable=启用
 mods.disable=禁用
 mods.remove=删除
-mods.not_modded=你需要先在自动安装页面安装 Forge 或 LiteLoader 才能进行模组管理。
 
 datapack=数据包
 datapack.add=添加数据包
@@ -278,7 +265,6 @@ datapack.title=世界 %s - 数据包
 datapack.remove=删除
 
 world=世界/数据包
-world.add=添加世界
 world.datapack=管理数据包
 world.datapack.1_13=仅 Minecraft 1.13 及之后的版本支持数据包
 world.description=%s. 上一次游戏时间: %s. 游戏版本: %s
@@ -295,7 +281,6 @@ world.import.invalid=无法识别的存档压缩包
 world.name=世界名称
 world.name.enter=输入世界名称
 world.reveal=打开文件夹
-world.show_all=显示全部
 world.time=yyyy 年 MM 月 dd 日 HH:mm:ss
 
 profile=游戏目录
@@ -386,8 +371,6 @@ sponsor.bmclapi=请赞助 BMCLAPI 从而获得稳定高速的下载服务，点
 sponsor.hmcl=HMCL 是一个免费、开源的 Minecraft 启动器，允许玩家方便快捷地安装、管理、运行游戏。您的赞助将帮助 HMCL 获得更好的发展、支持稳定高速的游戏安装与文件下载服务。点击此处查阅更多详细信息。
 
 update=启动器更新
-update.accept=更新
-update.changelog=更新日志
 update.channel.dev=更新到开发版
 update.channel.stable=更新到推荐版本
 update.checking=正在检查更新

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

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

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

@@ -34,8 +34,6 @@ import org.jackhuang.hmcl.auth.NoCharacterException;
 import org.jackhuang.hmcl.auth.ServerResponseMalformedException;
 import org.jackhuang.hmcl.util.gson.UUIDTypeAdapter;
 
-import javafx.beans.binding.ObjectBinding;
-
 public class YggdrasilAccount extends Account {
 
     private final YggdrasilService service;
@@ -50,8 +48,6 @@ public class YggdrasilAccount extends Account {
         this.username = requireNonNull(username);
         this.characterUUID = requireNonNull(session.getSelectedProfile().getId());
         this.session = requireNonNull(session);
-
-        addProfilePropertiesListener();
     }
 
     protected YggdrasilAccount(YggdrasilService service, String username, String password, CharacterSelector selector) throws AuthenticationException {
@@ -77,17 +73,6 @@ public class YggdrasilAccount extends Account {
 
         characterUUID = session.getSelectedProfile().getId();
         authenticated = true;
-
-        addProfilePropertiesListener();
-    }
-
-    private ObjectBinding<Optional<CompleteGameProfile>> profilePropertiesBinding;
-    private void addProfilePropertiesListener() {
-        // binding() is thread-safe
-        // hold the binding so that it won't be garbage-collected
-        profilePropertiesBinding = service.getProfileRepository().binding(characterUUID, true);
-        // and it's safe to add a listener to an ObjectBinding which does not have any listener attached before (maybe tricky)
-        profilePropertiesBinding.addListener((a, b, c) -> this.invalidate());
     }
 
     @Override

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

@@ -20,11 +20,9 @@ package org.jackhuang.hmcl.auth.yggdrasil;
 import org.jackhuang.hmcl.auth.AccountFactory;
 import org.jackhuang.hmcl.auth.AuthenticationException;
 import org.jackhuang.hmcl.auth.CharacterSelector;
-import org.jackhuang.hmcl.util.javafx.ObservableOptionalCache;
 
 import java.util.Map;
 import java.util.Objects;
-import java.util.UUID;
 
 import static org.jackhuang.hmcl.util.Lang.tryCast;
 
@@ -65,9 +63,7 @@ public class YggdrasilAccountFactory extends AccountFactory<YggdrasilAccount> {
                     @SuppressWarnings("unchecked")
                     Map<String, String> properties = it;
                     GameProfile selected = session.getSelectedProfile();
-                    ObservableOptionalCache<UUID, CompleteGameProfile, AuthenticationException> profileRepository = service.getProfileRepository();
-                    profileRepository.put(selected.getId(), new CompleteGameProfile(selected, properties));
-                    profileRepository.invalidate(selected.getId());
+                    service.getProfileRepository().put(selected.getId(), new CompleteGameProfile(selected, properties));
                 });
 
         return new YggdrasilAccount(service, username, session);

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

@@ -165,13 +165,7 @@ public class YggdrasilService {
         String encodedTextures = profile.getProperties().get("textures");
 
         if (encodedTextures != null) {
-            byte[] decodedBinary;
-            try {
-                decodedBinary = Base64.getDecoder().decode(encodedTextures);
-            } catch (IllegalArgumentException e) {
-                throw new ServerResponseMalformedException(e);
-            }
-            TextureResponse texturePayload = fromJson(new String(decodedBinary, UTF_8), TextureResponse.class);
+            TextureResponse texturePayload = fromJson(new String(Base64.getDecoder().decode(encodedTextures), UTF_8), TextureResponse.class);
             return Optional.ofNullable(texturePayload.textures);
         } else {
             return Optional.empty();

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

@@ -26,14 +26,9 @@ 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;
-import java.nio.file.Path;
-
 /**
  * Note: This class has no state.
  *
@@ -72,9 +67,9 @@ public class DefaultDependencyManager extends AbstractDependencyManager {
     }
 
     @Override
-    public Task checkGameCompletionAsync(Version version) {
-        return new ParallelTask(
-                Task.ofThen(() -> {
+    public Task<?> checkGameCompletionAsync(Version version) {
+        return Task.allOf(
+                Task.composeAsync(() -> {
                     if (!repository.getVersionJar(version).exists())
                         return new GameDownloadTask(this, null, version);
                     else
@@ -86,12 +81,12 @@ 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 version, String libraryId, String libraryVersion) {
         VersionList<?> versionList = getVersionList(libraryId);
         return versionList.loadAsync(gameVersion, getDownloadProvider())
                 .thenCompose(() -> installLibraryAsync(version, versionList.getVersion(gameVersion, libraryVersion)
@@ -99,8 +94,8 @@ public class DefaultDependencyManager extends AbstractDependencyManager {
     }
 
     @Override
-    public TaskResult<Version> installLibraryAsync(Version oldVersion, RemoteVersion libraryVersion) {
-        TaskResult<Version> task;
+    public Task<Version> installLibraryAsync(Version oldVersion, RemoteVersion libraryVersion) {
+        Task<Version> task;
         if (libraryVersion instanceof ForgeRemoteVersion)
             task = new ForgeInstallTask(this, oldVersion, (ForgeRemoteVersion) libraryVersion);
         else if (libraryVersion instanceof LiteLoaderRemoteVersion)
@@ -115,29 +110,8 @@ public class DefaultDependencyManager extends AbstractDependencyManager {
                 .thenCompose(newVersion -> new VersionJsonSaveTask(repository, newVersion));
     }
 
-    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) {
-        return Task
-                .of(() -> {
-                })
-                .thenCompose(() -> {
-                    try {
-                        return ForgeInstallTask.install(this, oldVersion, installer);
-                    } catch (IOException ignore) {
-                    }
-
-                    try {
-                        return OptiFineInstallTask.install(this, oldVersion, installer);
-                    } catch (IOException ignore) {
-                    }
-
-                    throw new UnsupportedOperationException("Library cannot be recognized");
-                })
-                .thenCompose(LibrariesUniqueTask::new)
-                .thenCompose(MaintainTask::new)
-                .thenCompose(newVersion -> new VersionJsonSaveTask(repository, newVersion));
-    }
 }

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

@@ -19,9 +19,7 @@ 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;
 
@@ -48,16 +46,16 @@ public class DefaultGameBuilder extends GameBuilder {
     }
 
     @Override
-    public Task buildAsync() {
+    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(
+            Task<?> vanillaTask = downloadGameAsync(gameVersion, version).thenCompose(Task.allOf(
                     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.
+            ).withCompose(new VersionJsonSaveTask(dependencyManager.getGameRepository(), version))); // using [with] because download failure here are tolerant.
 
-            TaskResult<Version> libraryTask = vanillaTask.thenSupply(() -> version);
+            Task<Version> libraryTask = vanillaTask.thenSupply(() -> version);
 
             if (toolVersions.containsKey("forge"))
                 libraryTask = libraryTask.thenCompose(libraryTaskHelper(gameVersion, "forge"));
@@ -70,17 +68,17 @@ public class DefaultGameBuilder extends GameBuilder {
                 libraryTask = libraryTask.thenCompose(dependencyManager.installLibraryAsync(remoteVersion));
 
             return libraryTask;
-        }).whenComplete((isDependentSucceeded, exception) -> {
-            if (!isDependentSucceeded)
-                dependencyManager.getGameRepository().removeVersionFromDisk(name);
+        }).whenComplete(exception -> {
+            if (exception != null)
+                dependencyManager.getGameRepository().getVersionRoot(name).delete();
         });
     }
 
-    private ExceptionalFunction<Version, TaskResult<Version>, ?> libraryTaskHelper(String gameVersion, String libraryId) {
+    private ExceptionalFunction<Version, Task<Version>, ?> libraryTaskHelper(String gameVersion, String libraryId) {
         return version -> dependencyManager.installLibraryAsync(gameVersion, version, libraryId, toolVersions.get(libraryId));
     }
 
-    protected Task downloadGameAsync(String gameVersion, Version version) {
+    protected Task<Void> 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.
@@ -71,7 +71,7 @@ public interface DependencyManager {
      * @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 version, String libraryId, String libraryVersion);
 
     /**
      * Install a library to a version.
@@ -81,7 +81,7 @@ public interface DependencyManager {
      * @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 version, RemoteVersion libraryVersion);
 
     /**
      * Get registered version list.

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

@@ -20,68 +20,59 @@ package org.jackhuang.hmcl.download;
 import org.jackhuang.hmcl.game.Library;
 import org.jackhuang.hmcl.game.Version;
 
-import java.util.Arrays;
-import java.util.EnumMap;
-import java.util.Map;
 import java.util.Optional;
-import java.util.regex.Pattern;
 
 public final class LibraryAnalyzer {
-    private final Map<LibraryType, Library> libraries;
+    private final Library forge;
+    private final Library liteLoader;
+    private final Library optiFine;
 
-    private LibraryAnalyzer(Map<LibraryType, Library> libraries) {
-        this.libraries = libraries;
+    public LibraryAnalyzer(Library forge, Library liteLoader, Library optiFine) {
+        this.forge = forge;
+        this.liteLoader = liteLoader;
+        this.optiFine = optiFine;
     }
 
-    public Optional<Library> get(LibraryType type) {
-        return Optional.ofNullable(libraries.get(type));
+    public Optional<Library> getForge() {
+        return Optional.ofNullable(forge);
     }
 
-    public boolean has(LibraryType type) {
-        return libraries.containsKey(type);
+    public boolean hasForge() {
+        return forge != null;
     }
 
-    public boolean hasModLoader() {
-        return Arrays.stream(LibraryType.values())
-                .filter(LibraryType::isModLoader)
-                .anyMatch(this::has);
+    public Optional<Library> getLiteLoader() {
+        return Optional.ofNullable(liteLoader);
+    }
+
+    public boolean hasLiteLoader() {
+        return liteLoader != null;
+    }
+
+    public Optional<Library> getOptiFine() {
+        return Optional.ofNullable(optiFine);
+    }
+
+    public boolean hasOptiFine() {
+        return optiFine != null;
     }
 
     public static LibraryAnalyzer analyze(Version version) {
-        Map<LibraryType, Library> libraries = new EnumMap<>(LibraryType.class);
+        Library forge = null, liteLoader = null, optiFine = null;
 
         for (Library library : version.getLibraries()) {
             String groupId = library.getGroupId();
             String artifactId = library.getArtifactId();
+            if (groupId.equalsIgnoreCase("net.minecraftforge") && artifactId.equalsIgnoreCase("forge"))
+                forge = library;
 
-            for (LibraryType type : LibraryType.values()) {
-                if (type.group.matcher(groupId).matches() && type.artifact.matcher(artifactId).matches()) {
-                    libraries.put(type, library);
-                    break;
-                }
-            }
+            if (groupId.equalsIgnoreCase("com.mumfrey") && artifactId.equalsIgnoreCase("liteloader"))
+                liteLoader = library;
+
+            if ((groupId.equalsIgnoreCase("optifine") || groupId.equalsIgnoreCase("net.optifine")) && artifactId.equalsIgnoreCase("optifine"))
+                optiFine = library;
         }
 
-        return new LibraryAnalyzer(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"));
-
-        private final Pattern group, artifact;
-        private final boolean modLoader;
-
-        LibraryType(boolean modLoader, Pattern group, Pattern artifact) {
-            this.modLoader = modLoader;
-            this.group = group;
-            this.artifact = artifact;
-        }
-
-        public boolean isModLoader() {
-            return modLoader;
-        }
+        return new LibraryAnalyzer(forge, liteLoader, optiFine);
     }
 }

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

@@ -18,11 +18,9 @@
 package org.jackhuang.hmcl.download;
 
 import org.jackhuang.hmcl.game.*;
-import org.jackhuang.hmcl.task.TaskResult;
+import org.jackhuang.hmcl.task.Task;
 
-import static org.jackhuang.hmcl.download.LibraryAnalyzer.LibraryType.*;
-
-public class MaintainTask extends TaskResult<Version> {
+public class MaintainTask extends Task<Version> {
 
     private final Version version;
 
@@ -49,20 +47,20 @@ public class MaintainTask extends TaskResult<Version> {
         LibraryAnalyzer libraryAnalyzer = LibraryAnalyzer.analyze(version);
         VersionLibraryBuilder builder = new VersionLibraryBuilder(version);
 
-        if (!libraryAnalyzer.has(FORGE)) {
+        if (!libraryAnalyzer.hasForge()) {
             builder.removeTweakClass("forge");
         }
 
         // 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.hasLiteLoader()) {
             builder.addArgument("--tweakClass", "com.mumfrey.liteloader.launch.LiteLoaderTweaker");
         }
 
         builder.removeTweakClass("optifine");
-        if (libraryAnalyzer.has(OPTIFINE)) {
-            if (!libraryAnalyzer.has(LITELOADER) && !libraryAnalyzer.has(FORGE)) {
+        if (libraryAnalyzer.hasOptiFine()) {
+            if (!libraryAnalyzer.hasLiteLoader() && !libraryAnalyzer.hasForge()) {
                 builder.addArgument("--tweakClass", "optifine.OptiFineTweaker");
             } else {
                 // If forge or LiteLoader installed, OptiFine Forge Tweaker is needed.