Fix not downloading the correct game version

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

@@ -47,7 +47,7 @@ public final class VersionsPage extends StackPane implements WizardPage, Refresh
     private final DownloadProvider downloadProvider;
     private final String libraryId;
     private final String title;
-    private final Runnable callback;
+    private final WizardController controller;
 
     @FXML
     private JFXListView<VersionsPageItem> list;
@@ -77,7 +77,7 @@ public final class VersionsPage extends StackPane implements WizardPage, Refresh
         this.gameVersion = gameVersion;
         this.downloadProvider = downloadProvider;
         this.libraryId = libraryId;
-        this.callback = callback;
+        this.controller = controller;
         this.versionList = downloadProvider.getVersionListById(libraryId);
 
         FXUtils.loadFXML(this, "/assets/fxml/download/versions.fxml");
@@ -160,5 +160,5 @@ public final class VersionsPage extends StackPane implements WizardPage, Refresh
     }
 
     @FXML
-    private void onBack() { callback.run(); }
+    private void onBack() { controller.onPrev(true); }
 }

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

@@ -70,7 +70,7 @@ public abstract class VersionList<T extends RemoteVersion> {
         });
     }
 
-    private Collection<T> getVersionsImpl(String gameVersion) {
+    protected Collection<T> getVersionsImpl(String gameVersion) {
         lock.readLock().lock();
         try {
             return versions.get(gameVersion);

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

@@ -24,6 +24,7 @@ import org.jackhuang.hmcl.task.GetTask;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.util.Constants;
 import org.jackhuang.hmcl.util.NetworkUtils;
+import org.jackhuang.hmcl.util.StringUtils;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -44,6 +45,16 @@ public final class GameVersionList extends VersionList<GameRemoteVersion> {
         return true;
     }
 
+    @Override
+    protected Collection<GameRemoteVersion> getVersionsImpl(String gameVersion) {
+        lock.readLock().lock();
+        try {
+            return StringUtils.isBlank(gameVersion) ? versions.values() : versions.get(gameVersion);
+        } finally {
+            lock.readLock().unlock();
+        }
+    }
+
     @Override
     public Task refreshAsync(DownloadProvider downloadProvider) {
         GetTask task = new GetTask(NetworkUtils.toURL(downloadProvider.getVersionListURL()));

HMCLCore/src/main/java/org/jackhuang/hmcl/download/liteloader/LiteLoaderInstallTask.java

@@ -19,10 +19,7 @@ package org.jackhuang.hmcl.download.liteloader;
 
 import org.jackhuang.hmcl.download.DefaultDependencyManager;
 import org.jackhuang.hmcl.download.game.GameLibrariesTask;
-import org.jackhuang.hmcl.game.LibrariesDownloadInfo;
-import org.jackhuang.hmcl.game.Library;
-import org.jackhuang.hmcl.game.LibraryDownloadInfo;
-import org.jackhuang.hmcl.game.Version;
+import org.jackhuang.hmcl.game.*;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskResult;
 import org.jackhuang.hmcl.util.Lang;
@@ -76,16 +73,10 @@ public final class LiteLoaderInstallTask extends TaskResult<Version> {
 
         Version tempVersion = version.setLibraries(Lang.merge(remote.getLibraries(), Collections.singleton(library)));
 
-        String mcArg = version.getMinecraftArguments().orElse("");
-        if (mcArg.contains("--tweakClass optifine.OptiFineTweaker"))
-            mcArg = mcArg.replace("--tweakClass optifine.OptiFineTweaker", "");
-
         setResult(version
                 .setMainClass("net.minecraft.launchwrapper.Launch")
                 .setLibraries(Lang.merge(tempVersion.getLibraries(), version.getLibraries()))
                 .setLogging(Collections.emptyMap())
-                .setMinecraftArguments(mcArg + " --tweakClass " + remote.getTweakClass())
-                //.setArguments(Arguments.addGameArguments(Lang.get(version.getArguments()), "--tweakClass", remote.getTag().getTweakClass()))
         );
 
         dependencies.add(new GameLibrariesTask(dependencyManager, tempVersion));

HMCLCore/src/main/java/org/jackhuang/hmcl/download/optifine/OptiFineInstallTask.java

@@ -25,7 +25,6 @@ import org.jackhuang.hmcl.task.TaskResult;
 import org.jackhuang.hmcl.util.Lang;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -82,34 +81,12 @@ public final class OptiFineInstallTask extends TaskResult<Version> {
         List<Library> libraries = new LinkedList<>();
         libraries.add(library);
 
-        boolean hasFMLTweaker = false;
-        if (version.getMinecraftArguments().isPresent() && version.getMinecraftArguments().get().contains("FMLTweaker"))
-            hasFMLTweaker = true;
-        if (version.getArguments().isPresent()) {
-            List<Argument> game = version.getArguments().get().getGame();
-            if (game.stream().anyMatch(arg -> arg.toString(Collections.emptyMap(), Collections.emptyMap()).contains("FMLTweaker")))
-                hasFMLTweaker = true;
-        }
-
-        /*Arguments arguments = Lang.get(version.getArguments());
-
-        if (!hasFMLTweaker)
-            arguments = Arguments.addGameArguments(arguments, "--tweakClass", "optifine.OptiFineTweaker");
-            */
-        String minecraftArguments = version.getMinecraftArguments().orElse("");
-        if (!hasFMLTweaker)
-            minecraftArguments = minecraftArguments + " --tweakClass optifine.OptiFineTweaker";
-        else
-            minecraftArguments = minecraftArguments + " --tweakClass optifine.OptiFineForgeTweaker";
-
         if (version.getMainClass() == null || !version.getMainClass().startsWith("net.minecraft.launchwrapper."))
             libraries.add(0, new Library("net.minecraft", "launchwrapper", "1.12"));
 
         setResult(version
-                        .setLibraries(Lang.merge(version.getLibraries(), libraries))
-                        .setMainClass("net.minecraft.launchwrapper.Launch")
-                        .setMinecraftArguments(minecraftArguments)
-                //.setArguments(arguments)
+                .setLibraries(Lang.merge(version.getLibraries(), libraries))
+                .setMainClass("net.minecraft.launchwrapper.Launch")
         );
 
         dependencies.add(new GameLibrariesTask(dependencyManager, version.setLibraries(libraries)));

HMCLCore/src/main/java/org/jackhuang/hmcl/game/Version.java

@@ -139,10 +139,6 @@ public class Version implements Comparable<Version>, Validation {
         return CompatibilityRule.appliesToCurrentEnvironment(compatibilityRules);
     }
 
-    public boolean install(String id) {
-        return false;
-    }
-
     /**
      * Resolve given version
      */