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

Unique duplicated libraries in minecraft json file

Browse Source
This commit is contained in:
huangyuhui
2018-02-26 11:21:34 +08:00
parent 30b276ec1a
commit cbb2a1b575
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java
View File

@@ -62,7 +62,7 @@ public final class LauncherHelper {
if (account == null) if (account == null)
throw new IllegalStateException("No account"); throw new IllegalStateException("No account");
Version version = repository.getVersion(selectedVersion); Version version = repository.getResolvedVersion(selectedVersion);
VersionSetting setting = profile.getVersionSetting(selectedVersion); VersionSetting setting = profile.getVersionSetting(selectedVersion);
Platform.runLater(() -> { Platform.runLater(() -> {

12
HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/LibrariesUniqueTask.java
View File

@@ -56,8 +56,16 @@ public class LibrariesUniqueTask extends TaskResult<Version> {
multimap.removeKey(id); multimap.removeKey(id);
versionMap.put(id, number); versionMap.put(id, number);
multimap.put(id, library); multimap.put(id, library);
} else if (number.compareTo(otherNumber) == 0) { } else if (number.compareTo(otherNumber) == 0) { // same library id.
multimap.put(id, library); boolean flag = false;
// prevent from duplicated libraries
for (Library otherLibrary : multimap.get(id))
if (library.equals(otherLibrary)) {
flag = true;
break;
}
if (!flag)
multimap.put(id, library);
} }
} else { } else {
versionMap.put(id, number); versionMap.put(id, number);