Skip to content

[Bugfix] 修复低版本无法安装 forge 等加载器等问题 #6751

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ToobLac wants to merge 1 commit into from
Closed

[Bugfix] 修复低版本无法安装 forge 等加载器等问题 #6751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 39 additions & 14 deletions HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeBMCLVersionList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.function.Consumer;

import static org.jackhuang.hmcl.util.Lang.mapOf;
import static org.jackhuang.hmcl.util.Pair.pair;
Expand Down Expand Up @@ -89,26 +90,35 @@ public Task<?> refreshAsync(String gameVersion) {
for (ForgeVersion version : forgeVersions) {
if (version == null)
continue;
List<String> urls = new ArrayList<>();
for (ForgeVersion.File file : version.getFiles())
if ("installer".equals(file.getCategory()) && "jar".equals(file.getFormat())) {
String branch = toLookupBranch(gameVersion, version.getBranch());

String classifier = lookupVersion + "-" + version.getVersion() + (branch.isEmpty() ? "" : '-' + branch);
String fileName1 = "forge-" + classifier + "-" + file.getCategory() + "." + file.getFormat();
String fileName2 = "forge-" + classifier + "-" + lookupVersion + "-" + file.getCategory() + "." + file.getFormat();
urls.add("https://files.minecraftforge.net/maven/net/minecraftforge/forge/" + classifier + "/" + fileName1);
urls.add("https://files.minecraftforge.net/maven/net/minecraftforge/forge/" + classifier + "-" + lookupVersion + "/" + fileName2);
urls.add(NetworkUtils.withQuery("https://bmclapi2.bangbang93.com/forge/download", mapOf(
List<String> installerUrls = new ArrayList<>();
List<String> universalUrls = new ArrayList<>();
for (ForgeVersion.File file : version.getFiles()) {
String branch = toLookupBranch(gameVersion, version.getBranch());

String classifier = lookupVersion + "-" + version.getVersion() + (branch.isEmpty() ? "" : '-' + branch);
String fileName1 = "forge-" + classifier + "-" + file.getCategory() + "." + file.getFormat();
String fileName2 = "forge-" + classifier + "-" + lookupVersion + "-" + file.getCategory() + "." + file.getFormat();

Consumer<List<String>> addUrls = urlList -> {
urlList.add("https://files.minecraftforge.net/maven/net/minecraftforge/forge/" + classifier + "/" + fileName1);
urlList.add("https://files.minecraftforge.net/maven/net/minecraftforge/forge/" + classifier + "-" + lookupVersion + "/" + fileName2);
urlList.add(NetworkUtils.withQuery("https://bmclapi2.bangbang93.com/forge/download", mapOf(
pair("mcversion", version.getGameVersion()),
pair("version", version.getVersion()),
pair("branch", branch),
pair("category", file.getCategory()),
pair("format", file.getFormat())
)));
};

if ("installer".equals(file.getCategory()) && "jar".equals(file.getFormat())) {
addUrls.accept(installerUrls);
} else if ("universal".equals(file.getCategory())) {
addUrls.accept(universalUrls);
}
}

if (urls.isEmpty())
if (installerUrls.isEmpty() && universalUrls.isEmpty())
continue;

Instant releaseDate = null;
Expand All @@ -120,8 +130,23 @@ public Task<?> refreshAsync(String gameVersion) {
}
}

versions.put(gameVersion, new ForgeRemoteVersion(
fromLookupVersion(version.getGameVersion()), version.getVersion(), releaseDate, urls));
if (!installerUrls.isEmpty()) {
versions.put(gameVersion, new ForgeRemoteVersion(
fromLookupVersion(version.getGameVersion()),
version.getVersion(),
releaseDate,
installerUrls,
ForgeRemoteVersion.FileType.INSTALLER
));
} else {
versions.put(gameVersion, new ForgeRemoteVersion(
fromLookupVersion(version.getGameVersion()),
version.getVersion(),
releaseDate,
universalUrls,
ForgeRemoteVersion.FileType.UNIVERSAL
));
}
}
} finally {
lock.writeLock().unlock();
Expand Down
76 changes: 47 additions & 29 deletions HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeInstallTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,14 @@
import org.jackhuang.hmcl.util.versioning.GameVersionNumber;

import java.io.IOException;
import java.io.StringReader;
import java.nio.file.FileSystem;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.Properties;

import static org.jackhuang.hmcl.download.UnsupportedInstallationException.CLEANROOM_NOT_COMPATIBLE_WITH_FORGE;
import static org.jackhuang.hmcl.download.UnsupportedInstallationException.UNSUPPORTED_LAUNCH_WRAPPER;
Expand All @@ -50,7 +52,7 @@ public final class ForgeInstallTask extends Task<GameInstancePatch> {

private final DefaultDependencyManager dependencyManager;
private final GameInstanceManifest manifest;
private Path installer;
private Path jar;
private final ForgeRemoteVersion remote;
private FileDownloadTask dependent;
private Task<GameInstancePatch> dependency;
Expand All @@ -69,11 +71,13 @@ public boolean doPreExecute() {

@Override
public void preExecute() throws Exception {
installer = Files.createTempFile("forge-installer", ".jar");
jar = remote.getFileType() == ForgeRemoteVersion.FileType.INSTALLER
? Files.createTempFile("forge-installer", ".jar")
: Files.createTempFile("forge-universal", ".zip");

dependent = new FileDownloadTask(
dependencyManager.getDownloadProvider().injectURLsWithCandidates(remote.getUrls()),
installer, null);
jar, null);
dependent.setCacheRepository(dependencyManager.getCacheRepository());
dependent.setCaching(true);
dependent.addIntegrityCheckHandler(FileDownloadTask.ZIP_INTEGRITY_CHECK_HANDLER);
Expand All @@ -86,7 +90,7 @@ public boolean doPostExecute() {

@Override
public void postExecute() throws Exception {
Files.deleteIfExists(installer);
Files.deleteIfExists(jar);
setResult(dependency.getResult());
}

Expand All @@ -109,16 +113,18 @@ public void execute() throws IOException, VersionMismatchException, UnsupportedI
throw new UnsupportedInstallationException(UNSUPPORTED_LAUNCH_WRAPPER);
}

if (detectForgeInstallerType(remote.getGameVersion(), installer)) {
if (remote.getFileType() == ForgeRemoteVersion.FileType.UNIVERSAL) {
dependency = new ForgeUniversalInstallTask(dependencyManager, manifest, remote.getSelfVersion(), jar);
} else if (detectForgeInstallerType(remote.getGameVersion(), jar)) {
dependency = new GameDownloadTask(dependencyManager, manifest)
.thenComposeAsync(minecraftJar -> new ForgeNewInstallTask(
dependencyManager,
manifest,
minecraftJar,
remote.getSelfVersion(),
installer));
jar));
} else {
dependency = new ForgeOldInstallTask(dependencyManager, manifest, remote.getSelfVersion(), installer);
dependency = new ForgeOldInstallTask(dependencyManager, manifest, remote.getSelfVersion(), jar);
}
}

Expand Down Expand Up @@ -170,30 +176,42 @@ public static Task<GameInstancePatch> install(
String gameVersion,
Path installer) throws IOException, VersionMismatchException, UnsupportedInstallationException {
try (FileSystem fs = CompressingUtils.createReadOnlyZipFileSystem(installer)) {
String installProfileText = Files.readString(fs.getPath("install_profile.json"));
Map<?, ?> installProfile = JsonUtils.fromNonNullJson(installProfileText, Map.class);
if (installProfile.containsKey("spec")) {
checkCleanroomCompatibility(dependencyManager, manifest, gameVersion);
ForgeNewInstallProfile profile = JsonUtils.fromNonNullJson(installProfileText, ForgeNewInstallProfile.class);
if (!gameVersion.equals(profile.getMinecraft()))
throw new VersionMismatchException(profile.getMinecraft(), gameVersion);
return new GameDownloadTask(dependencyManager, manifest)
.thenComposeAsync(minecraftJar -> new ForgeNewInstallTask(
dependencyManager,
manifest,
minecraftJar,
modifyVersion(gameVersion, profile.getVersion()),
installer));
} else if (installProfile.containsKey("install") && installProfile.containsKey("versionInfo")) {
checkCleanroomCompatibility(dependencyManager, manifest, gameVersion);
ForgeInstallProfile profile = JsonUtils.fromNonNullJson(installProfileText, ForgeInstallProfile.class);
if (!gameVersion.equals(profile.install().getMinecraft()))
throw new VersionMismatchException(profile.install().getMinecraft(), gameVersion);
return new ForgeOldInstallTask(dependencyManager, manifest, modifyVersion(gameVersion, profile.install().getPath().getVersion().replaceAll("(?i)forge", "")), installer);
} else {
throw new IOException();
Path installProfilePath = fs.getPath("install_profile.json");
Path versionPropertiesPath = fs.getPath("forgeversion.properties");
if (Files.isRegularFile(installProfilePath)) {
String installProfileText = Files.readString(installProfilePath);
Map<?, ?> installProfile = JsonUtils.fromNonNullJson(installProfileText, Map.class);
if (installProfile.containsKey("spec")) {
checkCleanroomCompatibility(dependencyManager, manifest, gameVersion);
ForgeNewInstallProfile profile = JsonUtils.fromNonNullJson(installProfileText, ForgeNewInstallProfile.class);
if (!gameVersion.equals(profile.getMinecraft()))
throw new VersionMismatchException(profile.getMinecraft(), gameVersion);
return new GameDownloadTask(dependencyManager, manifest)
.thenComposeAsync(minecraftJar -> new ForgeNewInstallTask(
dependencyManager,
manifest,
minecraftJar,
modifyVersion(gameVersion, profile.getVersion()),
installer));
} else if (installProfile.containsKey("install") && installProfile.containsKey("versionInfo")) {
checkCleanroomCompatibility(dependencyManager, manifest, gameVersion);
ForgeInstallProfile profile = JsonUtils.fromNonNullJson(installProfileText, ForgeInstallProfile.class);
if (!gameVersion.equals(profile.install().getMinecraft()))
throw new VersionMismatchException(profile.install().getMinecraft(), gameVersion);
return new ForgeOldInstallTask(dependencyManager, manifest, modifyVersion(gameVersion, profile.install().getPath().getVersion().replaceAll("(?i)forge", "")), installer);
}
} else if (Files.isRegularFile(versionPropertiesPath)) {
Properties prop = new Properties();
prop.load(new StringReader(Files.readString(versionPropertiesPath)));
String major = prop.getProperty("forge.major.number");
String minor = prop.getProperty("forge.minor.number");
String revision = prop.getProperty("forge.revision.number");
String build = prop.getProperty("forge.build.number");
if (major != null && minor != null && revision != null && build != null)
return new ForgeUniversalInstallTask(dependencyManager, manifest, "%s.%s.%s.%s".formatted(major, minor, revision, build), installer);
}
}
throw new IOException();
}

/// Rejects Forge installation when the manifest already contains Cleanroom.
Expand Down
16 changes: 15 additions & 1 deletion HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeRemoteVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,33 @@
import java.util.List;

public class ForgeRemoteVersion extends RemoteVersion {

private final FileType fileType;

/**
* Constructor.
*
* @param gameVersion the Minecraft version that this remote version suits.
* @param selfVersion the version string of the remote version.
* @param url the installer or universal jar original URL.
* @param fileType the type of the file.
*/
public ForgeRemoteVersion(String gameVersion, String selfVersion, Instant releaseDate, List<String> url) {
public ForgeRemoteVersion(String gameVersion, String selfVersion, Instant releaseDate, List<String> url, FileType fileType) {
super(GameComponentType.FORGE, gameVersion, selfVersion, releaseDate, url);
this.fileType = fileType;
}

@Override
public Task<GameInstancePatch> getInstallTask(DefaultDependencyManager dependencyManager, GameInstanceManifest baseVersion) {
return new ForgeInstallTask(dependencyManager, baseVersion, this);
}

public FileType getFileType() {
return fileType;
}

public enum FileType {
INSTALLER,
UNIVERSAL
}
}
74 changes: 74 additions & 0 deletions HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeUniversalInstallTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
/*
* Hello Minecraft! Launcher
* Copyright (C) 2026 huangyuhui <huanghongxun2008@126.com> and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package org.jackhuang.hmcl.download.forge;

import org.jackhuang.hmcl.download.DefaultDependencyManager;
import org.jackhuang.hmcl.game.*;
import org.jackhuang.hmcl.task.Task;
import org.jackhuang.hmcl.util.DigestUtils;
import org.jackhuang.hmcl.util.io.FileUtils;

import java.nio.file.Path;
import java.util.List;

public class ForgeUniversalInstallTask extends Task<GameInstancePatch> {

private final DefaultDependencyManager dependencyManager;
private final GameInstanceManifest manifest;
private final Path universal;
private final String selfVersion;

ForgeUniversalInstallTask(DefaultDependencyManager dependencyManager, GameInstanceManifest manifest, String selfVersion, Path universal) {
this.dependencyManager = dependencyManager;
this.manifest = manifest;
this.universal = universal;
this.selfVersion = selfVersion;

setSignificance(TaskSignificance.MAJOR);
}

@Override
public void execute() throws Exception {
var lib = new Library(
new Artifact(
"net.minecraftforge",
"minecraftforge",
selfVersion,
null,
FileUtils.getExtension(universal)
),
null,
null,
List.of(DigestUtils.digestToString("SHA-1", universal)),
null,
null,
null,
null,
null
);
Path target = dependencyManager.getGameRepository().getLayout().getLibraryFile(manifest.id(), lib);
FileUtils.copyFile(universal, target);

setResult(GameInstancePatch.fromLibraries(
List.of(lib),
GameComponentType.FORGE.getPatchId(),
selfVersion,
GameInstancePatch.PRIORITY_LOADER
));
}
}
9 changes: 5 additions & 4 deletions HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeVersionList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,23 +70,24 @@ public Task<?> refreshAsync() {
ForgeVersion version = root.getNumber().get(v);
if (version == null)
continue;
String jar = null;
String installerJar = null;
for (String[] file : version.getFiles())
if (file.length > 1 && "installer".equals(file[1])) {
String classifier = version.getGameVersion() + "-" + version.getVersion()
+ (StringUtils.isNotBlank(version.getBranch()) ? "-" + version.getBranch() : "");
String fileName = root.getArtifact() + "-" + classifier + "-" + file[1] + "." + file[0];
jar = root.getWebPath() + classifier + "/" + fileName;
installerJar = root.getWebPath() + classifier + "/" + fileName;
}

if (jar == null)
if (installerJar == null)
continue;

versions.put(gameVersion, new ForgeRemoteVersion(
toLookupVersion(version.getGameVersion()),
version.getVersion(),
version.getModified() > 0 ? Instant.ofEpochSecond(version.getModified()) : null,
Collections.singletonList(jar)
Collections.singletonList(installerJar),
ForgeRemoteVersion.FileType.INSTALLER
));
}
}
Expand Down
Loading