From 3dd421a2bfb7719819caf86450ffcc622917749b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=97=E5=AE=AB=E4=B8=B4=E9=A3=8E?= Date: Wed, 29 Jun 2016 16:54:29 +0800 Subject: [PATCH] fix library url parse --- .../launcher/core/download/DynamicDownloadProvider.java | 4 ++-- .../launcher/core/version/LibraryDownloadInfo.java | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/DynamicDownloadProvider.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/DynamicDownloadProvider.java index 29523ab00..cb772d9e2 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/DynamicDownloadProvider.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/DynamicDownloadProvider.java @@ -30,13 +30,13 @@ import org.jackhuang.hellominecraft.util.StrUtils; */ public class DynamicDownloadProvider extends MojangDownloadProvider { - private static final String PROVIDER_ADDR = "http://localhost/provider.php"; + private static final String PROVIDER_ADDR = "http://client.api.mcgogogo.com:81/provider.php"; private volatile static DynamicDownloadProvider instance; private String librariesAddr = null; private String assetsAddr = null; - private String name = "MCHost"; + private String name = "精灵"; public void setName(String name) { this.name = name; diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibraryDownloadInfo.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibraryDownloadInfo.java index c91090ea6..2182af377 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibraryDownloadInfo.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibraryDownloadInfo.java @@ -40,7 +40,7 @@ public class LibraryDownloadInfo extends GameDownloadInfo { String downloadUrl = (forgeURL == null ? provider.getLibraryDownloadURL() : forgeURL); if (StrUtils.isNotBlank(url) && allowSelf) { downloadUrl = url; - } + } // forced replace: Let different download sources into force return provider.getParsedDownloadURL(getUrlWithBaseUrl(downloadUrl)); } @@ -57,7 +57,12 @@ public class LibraryDownloadInfo extends GameDownloadInfo { return null; } - return provider.getParsedDownloadURL(getUrlWithBaseUrl(downloadUrl)); + downloadUrl = getUrlWithBaseUrl(downloadUrl); + if (downloadUrl.contains("minecraftforge")) { // fix forge url + downloadUrl = provider.getParsedDownloadURL(downloadUrl); + } + + return downloadUrl; } private String getUrlWithBaseUrl(String baseUrl) {