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

Fixed crash when launching 1.7.10 forge version

Browse Source
This commit is contained in:
huanghongxun
2018-02-23 11:36:44 +08:00
parent 506c409303
commit a52cc8c093
5 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
HMCLCore/src/main/java/org/jackhuang/hmcl/download/DefaultDependencyManager.java
View File

@@ -84,17 +84,17 @@ public class DefaultDependencyManager extends AbstractDependencyManager {
case "forge":
return new ForgeInstallTask(this, gameVersion, version, libraryVersion)
.then(variables -> new LibrariesUniqueTask(variables.get("version")))
.then(variables -> new MaintainTask(repository, variables.get("version")))
.then(variables -> new MaintainTask(variables.get("version")))
.then(variables -> new VersionJsonSaveTask(repository, variables.get("version")));
case "liteloader":
return new LiteLoaderInstallTask(this, gameVersion, version, libraryVersion)
.then(variables -> new LibrariesUniqueTask(variables.get("version")))
.then(variables -> new MaintainTask(repository, variables.get("version")))
.then(variables -> new MaintainTask(variables.get("version")))
.then(variables -> new VersionJsonSaveTask(repository, variables.get("version")));
case "optifine":
return new OptiFineInstallTask(this, gameVersion, version, libraryVersion)
.then(variables -> new LibrariesUniqueTask(variables.get("version")))
.then(variables -> new MaintainTask(repository, variables.get("version")))
.then(variables -> new MaintainTask(variables.get("version")))
.then(variables -> new VersionJsonSaveTask(repository, variables.get("version")));
default:
throw new IllegalArgumentException("Library id " + libraryId + " is unrecognized.");

8
HMCLCore/src/main/java/org/jackhuang/hmcl/download/MaintainTask.java
View File

@@ -28,16 +28,14 @@ import java.util.List;
public class MaintainTask extends TaskResult<Version> {
private final GameRepository repository;
private final Version version;
private final String id;
public MaintainTask(GameRepository repository, Version version) {
this(repository, version, ID);
public MaintainTask(Version version) {
this(version, ID);
}
public MaintainTask(GameRepository repository, Version version, String id) {
this.repository = repository;
public MaintainTask(Version version, String id) {
this.version = version;
this.id = id;
}

2
HMCLCore/src/main/java/org/jackhuang/hmcl/game/Version.java
View File

@@ -167,7 +167,7 @@ public class Version implements Comparable<Version>, Validation {
jar == null ? parent.jar : jar,
assetIndex == null ? parent.assetIndex : assetIndex,
assets == null ? parent.assets : assets,
Lang.merge(parent.libraries, this.libraries),
Lang.merge(this.libraries, parent.libraries),
Lang.merge(parent.compatibilityRules, this.compatibilityRules),
downloads == null ? parent.downloads : downloads,
logging == null ? parent.logging : logging,