Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for update to Forge installer #21

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ repositories {
dependencies {
compileOnly "com.google.code.gson:gson:2.8.7"
compileOnly "cpw.mods:modlauncher:8.0.9"
compileOnly "net.minecraftforge:installer:2.1.9"
compileOnly "net.minecraftforge:installer:2.2.7"
compileOnly "net.sf.jopt-simple:jopt-simple:5.0.4"

provided project(":common")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package io.github.zekerzhayard.forgewrapper.installer.util;

import java.io.File;
import java.util.function.Predicate;
import java.lang.reflect.Method;

import net.minecraftforge.installer.actions.ClientInstall;
import net.minecraftforge.installer.actions.PostProcessors;
import net.minecraftforge.installer.actions.ProgressCallback;
import net.minecraftforge.installer.json.Install;
import net.minecraftforge.installer.json.InstallV1;
Expand All @@ -16,23 +16,22 @@ public Install loadInstallProfile() {
}

@Override
public boolean runClientInstall(Install profile, ProgressCallback monitor, File libraryDir, File minecraftJar, File installerJar) {
return new ClientInstall4MultiMC(profile, monitor, libraryDir, minecraftJar).run(null, input -> true, installerJar);
}
public boolean runClientInstall(Install profile, ProgressCallback monitor, File libraryDir, File minecraftJar,
File installerJar) {
PostProcessors processors = new PostProcessors(
profile instanceof InstallV1 ? (InstallV1) profile : new InstallV1(profile), true, monitor);

public static class ClientInstall4MultiMC extends ClientInstall {
protected File libraryDir;
protected File minecraftJar;
try {
Method method = processors.getClass().getMethod("process", File.class, File.class, File.class, File.class);
Object result = method.invoke(processors, libraryDir, minecraftJar, libraryDir.getParentFile(),
installerJar);

public ClientInstall4MultiMC(Install profile, ProgressCallback monitor, File libraryDir, File minecraftJar) {
super(profile instanceof InstallV1 ? (InstallV1) profile : new InstallV1(profile), monitor);
this.libraryDir = libraryDir;
this.minecraftJar = minecraftJar;
}
if (method.getReturnType() == boolean.class)
return (boolean) result;

@Override
public boolean run(File target, Predicate<String> optionals, File installer) {
return this.processors.process(this.libraryDir, this.minecraftJar, this.libraryDir.getParentFile(), installer);
return result != null;
} catch (ReflectiveOperationException e) {
throw new RuntimeException(e);
}
}
}
Loading