feat: 支持 1.1~1.6 版本安装 Forge

.gitignore

@@ -33,6 +33,8 @@ language-subtag-registry
 /HMCLBoot/build/
 /minecraft/libraries/HMCLTransformerDiscoveryService/build/
 /minecraft/libraries/HMCLMultiMCBootstrap/build/
+/minecraft/libraries/HMCLLegacyForgeHelper/build/
+/minecraft/libraries/HMCLModLoaderHelper/build/
 /buildSrc/build/
 
 # idea
@@ -42,6 +44,8 @@ language-subtag-registry
 /HMCLCore/out/
 /minecraft/libraries/HMCLTransformerDiscoveryService/out/
 /minecraft/libraries/HMCLMultiMCBootstrap/out/
+/minecraft/libraries/HMCLLegacyForgeHelper/out/
+/minecraft/libraries/HMCLModLoaderHelper/out/
 
 # eclipse
 /bin/
@@ -50,6 +54,8 @@ language-subtag-registry
 /HMCLCore/bin/
 /minecraft/libraries/HMCLTransformerDiscoveryService/bin/
 /minecraft/libraries/HMCLMultiMCBootstrap/bin/
+/minecraft/libraries/HMCLLegacyForgeHelper/bin/
+/minecraft/libraries/HMCLModLoaderHelper/bin/
 .classpath
 .project
 .settings

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

@@ -31,8 +31,11 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.file.*;
-import java.util.*;
+import java.nio.file.FileVisitOption;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Locale;
+import java.util.Map;
 import java.util.stream.Stream;
 
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
@@ -169,9 +172,27 @@ public void makeLaunchScript(Path scriptFile) throws IOException {
     protected void appendJvmArgs(CommandBuilder result) {
         super.appendJvmArgs(result);
 
-        if (options.isAllowAutoAgent()
-                && !options.isNoGeneratedJVMArgs()
-                && !options.isNoGeneratedOptimizingJVMArgs()
+        if (this.instance.getVersion().compareTo("1.6") < 0 && this.instance.hasComponent(GameComponentType.FORGE)) {
+            LOG.info("Attempting to patch game with legacy-forge-helper");
+            try {
+                result.add("-javaagent:" + extractLegacyForgeHelper());
+            } catch (Exception e) {
+                LOG.warning("Failed to extract legacy-forge-helper", e);
+            }
+        }
+
+        if (this.instance.getVersion().compareTo("1.2") < 0 && this.instance.hasComponent(GameComponentType.FORGE)) {
+            LOG.info("Attempting to patch game with modloader-helper");
+            try {
+                result.add("-javaagent:" + extractModLoaderHelper());
+            } catch (Exception e) {
+                LOG.warning("Failed to extract modloader-helper", e);
+            }
+        }
+
+        if (!options.isAllowAutoAgent() && !options.isNoGeneratedJVMArgs()) return;
+
+        if (!options.isNoGeneratedOptimizingJVMArgs()
                 && NativePatcher.needPatchMemoryUtil(manifest, options.getJava().getParsedVersion())) {
             LOG.info("Attempting to patch game with lwjgl-unsafe-agent");
             try {
@@ -220,4 +241,69 @@ private Path extractLwjglUnsafeAgent() throws IOException {
         return agentPath;
     }
 
+    private Path extractLegacyForgeHelper() throws IOException {
+        Library library = new Library(new Artifact("org.jackhuang.hmcl", "legacy-forge-helper", "1.0"));
+        String fileName = "HMCLLegacyForgeHelper-1.0.jar";
+
+        Path agentPath = instance.getLayout().getLibraryFile(instance.getId(), library).toAbsolutePath().normalize();
+        if (agentPath.toString().contains("=")) {
+            throw new IOException("Invalid library path: " + agentPath);
+        }
+
+        byte[] bytes;
+        try (InputStream input = DefaultLauncher.class.getResourceAsStream("/assets/game/" + fileName)) {
+            if (input == null) {
+                throw new IOException("/assets/game/" + fileName + " not found");
+            }
+
+            bytes = input.readAllBytes();
+        }
+
+        if (Files.isRegularFile(agentPath)) {
+            try {
+                if (Files.size(agentPath) == bytes.length) {
+                    return agentPath;
+                }
+            } catch (IOException e) {
+                LOG.warning("Failed to check size of " + agentPath, e);
+            }
+        }
+
+        Files.createDirectories(agentPath.getParent());
+        FileUtils.saveSafely(agentPath, output -> output.write(bytes));
+        return agentPath;
+    }
+
+    private Path extractModLoaderHelper() throws IOException {
+        Library library = new Library(new Artifact("org.jackhuang.hmcl", "modloader-helper", "1.0"));
+        String fileName = "HMCLModLoaderHelper-1.0.jar";
+
+        Path agentPath = instance.getLayout().getLibraryFile(instance.getId(), library).toAbsolutePath().normalize();
+        if (agentPath.toString().contains("=")) {
+            throw new IOException("Invalid library path: " + agentPath);
+        }
+
+        byte[] bytes;
+        try (InputStream input = DefaultLauncher.class.getResourceAsStream("/assets/game/" + fileName)) {
+            if (input == null) {
+                throw new IOException("/assets/game/" + fileName + " not found");
+            }
+
+            bytes = input.readAllBytes();
+        }
+
+        if (Files.isRegularFile(agentPath)) {
+            try {
+                if (Files.size(agentPath) == bytes.length) {
+                    return agentPath;
+                }
+            } catch (IOException e) {
+                LOG.warning("Failed to check size of " + agentPath, e);
+            }
+        }
+
+        Files.createDirectories(agentPath.getParent());
+        FileUtils.saveSafely(agentPath, output -> output.write(bytes));
+        return agentPath;
+    }
 }

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

@@ -215,7 +215,7 @@ private void launch0() {
                             })
                     );
                 }).withStage("launch.state.dependencies")
-                .thenComposeAsync(() -> new GameVerificationFixTask(gameInstance, gameInstance.getVersion(), launchManifest.get()))
+                .thenComposeAsync(() -> new GameVerificationFixTask(gameInstance, gameInstance.getVersion()))
                 .thenComposeAsync(() -> {
                     if (setting.getInheritable(GameSettings::allowAutoAgentProperty)
                             || setting.getInheritable(GameSettings::noJVMOptionsProperty)

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

@@ -36,6 +36,7 @@
 import org.jackhuang.hmcl.download.cleanroom.CleanroomInstallTask;
 import org.jackhuang.hmcl.download.fabric.FabricAPIInstallTask;
 import org.jackhuang.hmcl.download.fabric.FabricInstallTask;
+import org.jackhuang.hmcl.download.forge.ForgeLegacyInstallTask;
 import org.jackhuang.hmcl.download.forge.ForgeNewInstallTask;
 import org.jackhuang.hmcl.download.forge.ForgeOldInstallTask;
 import org.jackhuang.hmcl.download.game.GameAssetDownloadTask;
@@ -172,7 +173,7 @@ public void onRunning(Task<?> task) {
                     task.setName(i18n("install.installer.install", i18n("install.installer.cleanroom")));
                 } else if (task instanceof LegacyFabricInstallTask) {
                     task.setName(i18n("install.installer.install", i18n("install.installer.legacyfabric")));
-                } else if (task instanceof ForgeNewInstallTask || task instanceof ForgeOldInstallTask) {
+                } else if (task instanceof ForgeNewInstallTask || task instanceof ForgeOldInstallTask || task instanceof ForgeLegacyInstallTask) {
                     task.setName(i18n("install.installer.install", i18n("install.installer.forge")));
                 } else if (task instanceof NeoForgeInstallTask || task instanceof NeoForgeOldInstallTask) {
                     task.setName(i18n("install.installer.install", i18n("install.installer.neoforge")));

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

@@ -143,7 +143,7 @@ private void reloadCurrentInstance() {
 
     public void installOffline() {
         FileChooser chooser = new FileChooser();
-        chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("extension.modloader.installer"), "*.jar", "*.exe"));
+        chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("extension.modloader.installer"), "*.jar", "*.exe", "*.zip"));
         Path file = Controllers.showOpenDialog(chooser);
         if (file != null) doInstallOffline(file);
     }

HMCLCore/build.gradle.kts

@@ -44,7 +44,9 @@ dependencies {
 tasks.processResources {
     listOf(
         "HMCLTransformerDiscoveryService",
-        "HMCLMultiMCBootstrap"
+        "HMCLMultiMCBootstrap",
+        "HMCLModLoaderHelper",
+        "HMCLLegacyForgeHelper"
     ).map { project(":$it").tasks["jar"] as Jar }.forEach { task ->
         dependsOn(task)
 

HMCLCore/src/main/java/org/jackhuang/hmcl/addon/meta/ForgeOldModMetadata.java

@@ -30,6 +30,7 @@
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.tree.ZipFileTree;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -124,8 +125,12 @@ public String[] getAuthors() {
         return authors;
     }
 
-    public static LocalModFile fromFile(ModManager modManager, Path modFile, ZipFileTree tree) throws IOException, JsonParseException {
-        ZipArchiveEntry mcmod = tree.getEntry("mcmod.info");
+    public static LocalModFile fromFile(@Nullable ModManager modManager, Path modFile, ZipFileTree tree) throws IOException, JsonParseException {
+        return fromFile(modManager, modFile, tree, "mcmod.info");
+    }
+
+    public static LocalModFile fromFile(@Nullable ModManager modManager, Path modFile, ZipFileTree tree, String infoFileName) throws IOException, JsonParseException {
+        ZipArchiveEntry mcmod = tree.getEntry(infoFileName);
         if (mcmod == null)
             throw new IOException("File " + modFile + " is not a Forge mod.");
 
@@ -157,7 +162,7 @@ else if (firstToken == JsonToken.BEGIN_OBJECT) {
             authors = String.join(", ", metadata.getAuthorList());
         if (StringUtils.isBlank(authors))
             authors = metadata.getCredits();
-        return new LocalModFile(modManager, modManager.getLocalMod(metadata.getModId(), ModLoaderType.FORGE), modFile, metadata.getName(), new LocalAddonFile.Description(metadata.getDescription()),
+        return new LocalModFile(modManager, modManager == null ? null : modManager.getLocalMod(metadata.getModId(), ModLoaderType.FORGE), modFile, metadata.getName(), new LocalAddonFile.Description(metadata.getDescription()),
                 authors, metadata.getVersion(), metadata.getGameVersion(),
                 StringUtils.isBlank(metadata.getUrl()) ? metadata.getUpdateUrl() : metadata.url,
                 metadata.getLogoFile());

HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/LocalModFile.java

@@ -25,11 +25,15 @@
 import org.jackhuang.hmcl.addon.RemoteAddonRepository;
 import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.*;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 
@@ -40,7 +44,9 @@
 public final class LocalModFile extends LocalAddonFile implements Comparable<LocalModFile> {
 
     private Path file;
+    @Nullable
     private final ModManager modManager;
+    @Nullable
     private final LocalMod mod;
     private final String name;
     private final Description description;
@@ -52,11 +58,11 @@ public final class LocalModFile extends LocalAddonFile implements Comparable<Loc
     private final String logoPath;
     private final BooleanProperty activeProperty;
 
-    public LocalModFile(ModManager modManager, LocalMod mod, Path file, String name, Description description) {
+    public LocalModFile(@Nullable ModManager modManager, @Nullable LocalMod mod, Path file, String name, Description description) {
         this(modManager, mod, file, name, description, "", "", "", "", "");
     }
 
-    public LocalModFile(ModManager modManager, LocalMod mod, Path file, String name, Description description, String authors, String version, String gameVersion, String url, String logoPath) {
+    public LocalModFile(@Nullable ModManager modManager, @Nullable LocalMod mod, Path file, String name, Description description, String authors, String version, String gameVersion, String url, String logoPath) {
         super();
         this.modManager = modManager;
         this.mod = mod;
@@ -69,10 +75,11 @@ public LocalModFile(ModManager modManager, LocalMod mod, Path file, String name,
         this.url = url;
         this.logoPath = logoPath;
 
-        activeProperty = new SimpleBooleanProperty(this, "active", !modManager.isDisabled(file)) {
+        activeProperty = new SimpleBooleanProperty(this, "active", modManager != null && !modManager.isDisabled(file)) {
             @Override
             protected void invalidated() {
                 if (isOld()) return;
+                if (modManager == null) throw new IllegalStateException();
 
                 Path path = LocalModFile.this.file.toAbsolutePath();
 
@@ -89,17 +96,22 @@ protected void invalidated() {
 
         fileName = FileUtils.getNameWithoutExtension(LocalAddonManager.getLocalAddonName(file));
 
-        if (isOld()) {
-            mod.getOldFiles().add(this);
-        } else {
-            mod.getFiles().add(this);
+
+        if (mod != null) {
+            if (isOld()) {
+                mod.getOldFiles().add(this);
+            } else {
+                mod.getFiles().add(this);
+            }
         }
     }
 
+    @Nullable
     public ModManager getModManager() {
         return modManager;
     }
 
+    @Nullable
     public LocalMod getMod() {
         return mod;
     }
@@ -110,10 +122,14 @@ public Path getFile() {
     }
 
     public ModLoaderType getModLoaderType() {
+        if (mod == null) throw new IllegalStateException();
+
         return mod.getModLoaderType();
     }
 
     public String getId() {
+        if (mod == null) throw new IllegalStateException();
+
         return mod.getId();
     }
 
@@ -163,11 +179,16 @@ public String getFileName() {
     }
 
     public boolean isOld() {
+        if (modManager == null) throw new IllegalStateException();
+
         return modManager.isOld(file);
     }
 
     @Override
     public void setOld(boolean old) throws IOException {
+        if (modManager == null) throw new IllegalStateException();
+        if (mod == null) throw new IllegalStateException();
+
         file = modManager.setOld(this, old);
 
         if (old) {
@@ -186,6 +207,8 @@ public boolean keepOldFiles() {
 
     @Override
     public void markDisabled() throws IOException {
+        if (modManager == null) throw new IllegalStateException();
+
         file = modManager.disableMod(file);
     }
 

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

@@ -18,7 +18,7 @@
 package org.jackhuang.hmcl.download;
 
 import org.jackhuang.hmcl.download.cleanroom.CleanroomInstallTask;
-import org.jackhuang.hmcl.download.forge.ForgeInstallTask;
+import org.jackhuang.hmcl.download.forge.ForgeInstallation;
 import org.jackhuang.hmcl.download.game.GameAssetDownloadTask;
 import org.jackhuang.hmcl.download.game.GameDownloadTask;
 import org.jackhuang.hmcl.download.game.GameLibrariesTask;
@@ -385,7 +385,7 @@ public Task<GameInstanceManifest> installComponentLocalAsync(GameInstance instan
                     }
 
                     try {
-                        return ForgeInstallTask.install(this, baseManifest, gameVersion, installer);
+                        return ForgeInstallation.install(this, baseManifest, gameVersion, installer);
                     } catch (IOException ignore) {
                     }
 

HMCLCore/src/main/java/org/jackhuang/hmcl/download/cleanroom/CleanroomInstallTask.java

@@ -186,13 +186,13 @@ public static Task<GameInstancePatch> install(
                 }
 
                 ForgeNewInstallProfile profile = JsonUtils.fromNonNullJson(installProfileText, ForgeNewInstallProfile.class);
-                if (!gameVersion.equals(profile.getMinecraft()))
-                    throw new VersionMismatchException(profile.getMinecraft(), gameVersion);
+                if (!gameVersion.equals(profile.minecraft()))
+                    throw new VersionMismatchException(profile.minecraft(), gameVersion);
                 return new CleanroomInstallTask(
                         dependencyManager,
                         manifest,
                         gameVersion,
-                        modifyVersion(profile.getVersion()),
+                        modifyVersion(profile.version()),
                         installer);
             } else {
                 throw new IOException();