lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正library补全Bug

Browse Source
This commit is contained in:
南宫临风
2016-06-29 15:47:40 +08:00
parent 94b6cda86e
commit 4537f9e48f
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibraryDownloadInfo.java
View File

@@ -39,33 +39,35 @@ public class LibraryDownloadInfo extends GameDownloadInfo {
IDownloadProvider provider = dt.getProvider();
String downloadUrl = (forgeURL == null ? provider.getLibraryDownloadURL() : forgeURL);
if (StrUtils.isNotBlank(url) && allowSelf) {
downloadUrl = provider.getParsedDownloadURL(url);
downloadUrl = url;
}
return getUrlWithBaseUrl(downloadUrl);
}
public String getUrlWithBaseUrl(String baseUrl) {
if (!baseUrl.endsWith(".jar")) {
if (path == null)
return null;
else
baseUrl = IOUtils.addURLSeparator(baseUrl) + path.replace('\\', '/');
}
return baseUrl;
return provider.getParsedDownloadURL(getUrlWithBaseUrl(downloadUrl));
}
public String getRetryUrl(DownloadType dt) {
IDownloadProvider provider = dt.getProvider();
String retryBaseUrl = provider.getRetryLibraryDownloadURL();
if (StrUtils.isBlank(retryBaseUrl)) {
return null;
}
String downloadUrl = (forgeURL == null ? retryBaseUrl : forgeURL);
if (StrUtils.isNotBlank(url) && provider.isAllowedToUseSelfURL()) {
downloadUrl = url;
}
return getUrlWithBaseUrl(downloadUrl);
if (StrUtils.isBlank(downloadUrl)) {
return null;
}
return provider.getParsedDownloadURL(getUrlWithBaseUrl(downloadUrl));
}
private String getUrlWithBaseUrl(String baseUrl) {
if (!baseUrl.endsWith(".jar")) {
if (path == null) {
return null;
} else {
baseUrl = IOUtils.addURLSeparator(baseUrl) + path.replace('\\', '/');
}
}
return baseUrl;
}
}