From 2695b5c42f0574cd0957070a71a57fe6fc124e04 Mon Sep 17 00:00:00 2001 From: Glavo Date: Fri, 21 Nov 2025 22:02:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=20EdgeOne=20=E5=88=86?= =?UTF-8?q?=E5=8F=91=20HMCL=20=E5=85=83=E6=95=B0=E6=8D=AE=20(#4830)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hmcl/download/BMCLAPIDownloadProvider.java | 4 ++-- .../cleanroom/CleanroomVersionList.java | 4 ++-- .../hmcl/download/forge/ForgeVersionList.java | 2 +- .../hmcl/download/game/GameLibrariesTask.java | 17 ++++++++++------- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java index 77a347b61..ef16b02b0 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java @@ -82,8 +82,8 @@ public final class BMCLAPIDownloadProvider implements DownloadProvider { pair("https://authlib-injector.yushi.moe", apiRoot + "/mirrors/authlib-injector"), pair("https://repo1.maven.org/maven2", "https://mirrors.cloud.tencent.com/nexus/repository/maven-public"), pair("https://repo.maven.apache.org/maven2", "https://mirrors.cloud.tencent.com/nexus/repository/maven-public"), - pair("https://hmcl-dev.github.io/metadata/cleanroom", "https://alist.8mi.tech/d/mirror/HMCL-Metadata/Auto/cleanroom"), - pair("https://hmcl-dev.github.io/metadata/fmllibs", "https://alist.8mi.tech/d/mirror/HMCL-Metadata/Auto/fmllibs"), + pair("https://hmcl.glavo.site/metadata/cleanroom", "https://alist.8mi.tech/d/mirror/HMCL-Metadata/Auto/cleanroom"), + pair("https://hmcl.glavo.site/metadata/fmllibs", "https://alist.8mi.tech/d/mirror/HMCL-Metadata/Auto/fmllibs"), pair("https://zkitefly.github.io/unlisted-versions-of-minecraft", "https://alist.8mi.tech/d/mirror/unlisted-versions-of-minecraft/Auto") // // https://github.com/mcmod-info-mirror/mcim-rust-api // pair("https://api.modrinth.com", "https://mod.mcimirror.top/modrinth"), diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/cleanroom/CleanroomVersionList.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/cleanroom/CleanroomVersionList.java index cb5fc5c39..6495a130b 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/cleanroom/CleanroomVersionList.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/cleanroom/CleanroomVersionList.java @@ -27,8 +27,8 @@ import java.util.Collections; public final class CleanroomVersionList extends VersionList { private final DownloadProvider downloadProvider; - private static final String LOADER_LIST_URL = "https://hmcl-dev.github.io/metadata/cleanroom/index.json"; - private static final String INSTALLER_URL = "https://hmcl-dev.github.io/metadata/cleanroom/files/cleanroom-%s-installer.jar"; + private static final String LOADER_LIST_URL = "https://hmcl.glavo.site/metadata/cleanroom/index.json"; + private static final String INSTALLER_URL = "https://hmcl.glavo.site/metadata/cleanroom/files/cleanroom-%s-installer.jar"; public CleanroomVersionList(DownloadProvider downloadProvider) { this.downloadProvider = downloadProvider; diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeVersionList.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeVersionList.java index cf58b60cf..9d0941b2b 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeVersionList.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeVersionList.java @@ -96,5 +96,5 @@ public final class ForgeVersionList extends VersionList { }); } - public static final URI FORGE_LIST = URI.create("https://hmcl-dev.github.io/metadata/forge/"); + public static final URI FORGE_LIST = URI.create("https://hmcl.glavo.site/metadata/forge/"); } diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameLibrariesTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameLibrariesTask.java index 700c47428..eda938b35 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameLibrariesTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameLibrariesTask.java @@ -149,7 +149,7 @@ public final class GameLibrariesTask extends Task { Path file = libDir.resolve(fmlLib.name); if (shouldDownloadFMLLib(fmlLib, file)) { List uris = dependencyManager.getDownloadProvider() - .injectURLWithCandidates(fmlLib.getDownloadURI()); + .injectURLWithCandidates(fmlLib.downloadUrl()); dependencies.add(new FileDownloadTask(uris, file) .withCounter("hmcl.install.libraries")); } @@ -193,9 +193,12 @@ public final class GameLibrariesTask extends Task { if (forgeVersion.startsWith("7.8.1.")) { return List.of( new FMLLib("argo-small-3.2.jar", "58912ea2858d168c50781f956fa5b59f0f7c6b51"), - new FMLLib("guava-14.0-rc3.jar", "931ae21fa8014c3ce686aaa621eae565fefb1a6a"), - new FMLLib("asm-all-4.1.jar", "054986e962b88d8660ae4566475658469595ef58"), - new FMLLib("bcprov-jdk15on-148.jar", "960dea7c9181ba0b17e8bab0c06a43f0a5f04e65"), + new FMLLib("guava-14.0-rc3.jar", "931ae21fa8014c3ce686aaa621eae565fefb1a6a", + "https://repo1.maven.org/maven2/com/google/guava/guava/14.0-rc3/guava-14.0-rc3.jar"), + new FMLLib("asm-all-4.1.jar", "054986e962b88d8660ae4566475658469595ef58", + "https://repo1.maven.org/maven2/org/ow2/asm/asm-all/4.1/asm-all-4.1.jar"), + new FMLLib("bcprov-jdk15on-148.jar", "960dea7c9181ba0b17e8bab0c06a43f0a5f04e65", + "https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.jar"), new FMLLib("deobfuscation_data_1.5.2.zip", "446e55cd986582c70fcf12cb27bc00114c5adfd9"), new FMLLib("scala-library.jar", "458d046151ad179c85429ed7420ffb1eaf6ddf85") ); @@ -204,9 +207,9 @@ public final class GameLibrariesTask extends Task { return null; } - private record FMLLib(String name, String sha1) { - public String getDownloadURI() { - return "https://hmcl-dev.github.io/metadata/fmllibs/" + name; + private record FMLLib(String name, String sha1, String downloadUrl) { + FMLLib(String name, String sha1) { + this(name, sha1, "https://hmcl.glavo.site/metadata/fmllibs/" + name); } } }