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

Fix Library resolve bug

Browse Source
This commit is contained in:
南宫临风
2016-07-12 14:17:17 +08:00
parent c0ef592f72
commit 1a3c31a141
2 changed files with 112 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/DynamicDownloadProvider.java
View File

@@ -118,7 +118,7 @@ public class DynamicDownloadProvider extends MojangDownloadProvider {
if (StrUtils.isNotBlank(launcherMetaAddr)) { if (StrUtils.isNotBlank(launcherMetaAddr)) {
str = str.replace("https://launchermeta.mojang.com", launcherMetaAddr); str = str.replace("https://launchermeta.mojang.com", launcherMetaAddr);
} }
if (StrUtils.isNotBlank(launcherMetaAddr)) { if (StrUtils.isNotBlank(launcherAddr)) {
str = str.replace("https://launcher.mojang.com", launcherAddr); str = str.replace("https://launcher.mojang.com", launcherAddr);
} }
return super.getParsedDownloadURL(str); return super.getParsedDownloadURL(str);

8
HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java
View File

@@ -59,11 +59,12 @@ public class MinecraftLibrary extends IMinecraftLibrary {
if (rules != null) { if (rules != null) {
boolean flag = false; boolean flag = false;
for (Rules r : rules) { for (Rules r : rules) {
if ("disallow".equals(r.action())) if ("disallow".equals(r.action())) {
return false; return false;
else if ("allow".equals(r.action())) } else if ("allow".equals(r.action())) {
flag = true; flag = true;
} }
}
return flag; return flag;
} }
return true; return true;
@@ -126,13 +127,12 @@ public class MinecraftLibrary extends IMinecraftLibrary {
if (natives != null) { if (natives != null) {
if (downloads.classifiers == null) { if (downloads.classifiers == null) {
downloads.classifiers = new HashMap<>(); downloads.classifiers = new HashMap<>();
} else { }
if (!downloads.classifiers.containsKey(getNative())) { if (!downloads.classifiers.containsKey(getNative())) {
downloads.classifiers.put(getNative(), info = new LibraryDownloadInfo()); downloads.classifiers.put(getNative(), info = new LibraryDownloadInfo());
} else { } else {
info = downloads.classifiers.get(getNative()); info = downloads.classifiers.get(getNative());
} }
}
} else if (downloads.artifact == null) { } else if (downloads.artifact == null) {
downloads.artifact = info = new LibraryDownloadInfo(); downloads.artifact = info = new LibraryDownloadInfo();
} else { } else {