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 1a04f5a556..a7e5293849 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/download/HMCLDownloadProvider.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/download/HMCLDownloadProvider.java @@ -133,6 +133,13 @@ public final class HMCLDownloadProvider extends DownloadProvider { public HMCLDownloadProvider(Supplier<@Unmodifiable List> mirrorRoots) { this.mirrorRoots = Objects.requireNonNull(mirrorRoots); this.rules = List.of( + // The self-hosted client mirror carries the pack's full dependency set. BMCLAPI's + // redirect CDNs (sakura.sld.tw, cernet) and the Mojang/Forge origins are TLS-blocked + // on many mainland networks, so the VPS must be tried before any of them. + new SimpleRule("https://piston-meta.mojang.com", Metadata.getClientFileApi() + "/piston-meta", "https://bmclapi2.bangbang93.com"), + 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"), new MultiRootRule("https://bmclapi2.bangbang93.com", Function.identity()), new MultiRootRule("https://bmclapi.bangbang93.com", Function.identity()), new MultiRootRule("https://launchermeta.mojang.com", Function.identity()), @@ -301,11 +308,18 @@ public final class HMCLDownloadProvider extends DownloadProvider { @Override public DownloadCandidates getAssetObjectCandidates(AssetObject assetObject) { String location = assetObject.getLocation(); - return getCandidates( - fileSource, - WebURL.parse("https://resources.download.minecraft.net/" + location), - mirrorUrls("/assets/" + location) - ); + WebURL officialUrl = WebURL.parse("https://resources.download.minecraft.net/" + location); + List mirrors = mirrorUrls("/assets/" + location); + if (preferMirror(fileSource)) { + // Keep the VPS strictly first: spreadPrimary would otherwise rotate BMCLAPI ahead of + // it, and BMCLAPI's asset CDN is unreachable on blocked networks (per-file timeouts). + var candidates = new ArrayList(mirrors.size() + 2); + candidates.add(DownloadCandidate.of(WebURL.parse(Metadata.getClientFileApi() + "/assets/" + location))); + candidates.addAll(spreadPrimary(mirrors.stream().map(DownloadCandidate::of).toList(), officialUrl.href())); + candidates.add(DownloadCandidate.of(officialUrl)); + return DownloadCandidates.of(List.copyOf(candidates)); + } + return getCandidates(fileSource, officialUrl, mirrors); } @NotNullByDefault