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

fix: forbids OptiFine and Fabric coexistence

Browse Source
This commit is contained in:
huanghongxun
2020-03-11 00:18:29 +08:00
parent 2b9f070279
commit 8fd500e931
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeNewInstallTask.java
View File

@@ -131,7 +131,8 @@ public class ForgeNewInstallTask extends Task<Version> {
@Override @Override
public void execute() throws Exception { public void execute() throws Exception {
if ("net.minecraft.launchwrapper.Launch".equals(version.resolve(dependencyManager.getGameRepository()).getMainClass())) String originalMainClass = version.resolve(dependencyManager.getGameRepository()).getMainClass();
if (!"net.minecraft.client.main.Main".equals(originalMainClass) && !"cpw.mods.modlauncher.Launcher".equals(originalMainClass))
throw new OptiFineInstallTask.UnsupportedOptiFineInstallationException(); throw new OptiFineInstallTask.UnsupportedOptiFineInstallationException();
Path temp = Files.createTempDirectory("forge_installer"); Path temp = Files.createTempDirectory("forge_installer");

3
HMCLCore/src/main/java/org/jackhuang/hmcl/download/optifine/OptiFineInstallTask.java
View File

@@ -122,7 +122,8 @@ public final class OptiFineInstallTask extends Task<Version> {
@Override @Override
public void execute() throws Exception { public void execute() throws Exception {
if ("cpw.mods.modlauncher.Launcher".equals(version.resolve(dependencyManager.getGameRepository()).getMainClass())) String originalMainClass = version.resolve(dependencyManager.getGameRepository()).getMainClass();
if (!"net.minecraft.client.main.Main".equals(originalMainClass) && !"net.minecraft.launchwrapper.Launch".equals(originalMainClass))
throw new OptiFineInstallTask.UnsupportedOptiFineInstallationException(); throw new OptiFineInstallTask.UnsupportedOptiFineInstallationException();
List<Library> libraries = new LinkedList<>(); List<Library> libraries = new LinkedList<>();