diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/download/HMCLDownloadProvider.java b/HMCL/src/main/java/org/jackhuang/hmcl/download/HMCLDownloadProvider.java index a7e5293849..63e530fa9d 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/download/HMCLDownloadProvider.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/download/HMCLDownloadProvider.java @@ -140,6 +140,9 @@ public final class HMCLDownloadProvider extends DownloadProvider { new SimpleRule("https://libraries.minecraft.net", Metadata.getClientFileApi() + "/libraries", "https://bmclapi2.bangbang93.com/libraries"), new SimpleRule("https://maven.minecraftforge.net", Metadata.getClientFileApi() + "/forge-maven", "https://bmclapi2.bangbang93.com/maven"), new SimpleRule("https://launcher.mojang.com", Metadata.getClientFileApi() + "/launcher-mojang", "https://bmclapi2.bangbang93.com"), + // Forge 1.7.10 installer URLs from the version list point at files.minecraftforge.net. + new SimpleRule("https://files.minecraftforge.net/maven", Metadata.getClientFileApi() + "/forge-maven", "https://bmclapi2.bangbang93.com/maven"), + new SimpleRule("http://files.minecraftforge.net/maven", Metadata.getClientFileApi() + "/forge-maven", "https://bmclapi2.bangbang93.com/maven"), new MultiRootRule("https://bmclapi2.bangbang93.com", Function.identity()), new MultiRootRule("https://bmclapi.bangbang93.com", Function.identity()), new MultiRootRule("https://launchermeta.mojang.com", Function.identity()), @@ -230,7 +233,11 @@ public final class HMCLDownloadProvider extends DownloadProvider { Task> fetchBMCL = ForgeRemoteVersion.fetchBMCLAsync(this, bmclRoot, gameVersion); if (preferMirror(source)) { - return new FallbackTask<>(fetchBMCL, fetchOfficial); + // The client mirror serves the pack's Forge version list in BMCLAPI's format + // (/forge/minecraft/); BMCLAPI itself is unreachable on many mainland networks. + Task> fetchClientMirror = + ForgeRemoteVersion.fetchBMCLAsync(this, Metadata.getClientFileApi(), gameVersion); + return new FallbackTask<>(fetchClientMirror, new FallbackTask<>(fetchBMCL, fetchOfficial)); } else { return new FallbackTask<>(fetchOfficial, fetchBMCL); }