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

fix: game crash when Forge, OptiFine are both installed.

Browse Source
This commit is contained in:
huanghongxun
2020-04-25 16:46:53 +08:00
parent fec5c9a5ce
commit 4bac9380d1
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,6 +106,7 @@ public class MaintainTask extends Task<Version> {
// If forge or LiteLoader installed, OptiFine Forge Tweaker is needed. // If forge or LiteLoader installed, OptiFine Forge Tweaker is needed.
builder.replaceTweakClass("optifine", "optifine.OptiFineForgeTweaker", !reorderTweakClass); builder.replaceTweakClass("optifine", "optifine.OptiFineForgeTweaker", !reorderTweakClass);
} }
} }
} else { } else {
builder.removeTweakClass("optifine"); builder.removeTweakClass("optifine");
@@ -123,7 +124,7 @@ public class MaintainTask extends Task<Version> {
if (libraryAnalyzer.has(LITELOADER) || libraryAnalyzer.has(FORGE)) { if (libraryAnalyzer.has(LITELOADER) || libraryAnalyzer.has(FORGE)) {
// If forge or LiteLoader installed, OptiFine Forge Tweaker is needed. // If forge or LiteLoader installed, OptiFine Forge Tweaker is needed.
// And we should load the installer jar instead of patch jar. // And we should load the installer jar instead of patch jar.
if (repository != null) if (repository != null) {
for (int i = 0; i < version.getLibraries().size(); ++i) { for (int i = 0; i < version.getLibraries().size(); ++i) {
Library library = libraries.get(i); Library library = libraries.get(i);
if (library.is("optifine", "OptiFine")) { if (library.is("optifine", "OptiFine")) {
@@ -137,7 +138,15 @@ public class MaintainTask extends Task<Version> {
libraries.add(newLibrary); libraries.add(newLibrary);
} }
} }
if (library.is("optifine", "launchwrapper-of")) {
// With MinecraftForge installed, the custom launchwrapper installed by OptiFine will conflicts
// with the one installed by MinecraftForge or LiteLoader or ModLoader.
// Simply removing it works.
libraries.set(i, null);
}
} }
}
} }
} }