Try and fix fernflower forking for the final time. Hopefully helps with #355

2 files changed, 4 insertions, 10 deletions

diff --git a/src/main/java/net/fabricmc/loom/decompilers/fernflower/AbstractFernFlowerDecompiler.java b/src/main/java/net/fabricmc/loom/decompilers/fernflower/AbstractFernFlowerDecompiler.java
index 61dbaf07..ecc13866 100644
--- a/src/main/java/net/fabricmc/loom/decompilers/fernflower/AbstractFernFlowerDecompiler.java
+++ b/src/main/java/net/fabricmc/loom/decompilers/fernflower/AbstractFernFlowerDecompiler.java
@@ -100,7 +100,7 @@ public abstract class AbstractFernFlowerDecompiler implements LoomDecompiler {
 
 		progressGroup.started();
 		ExecResult result = ForkingJavaExec.javaexec(
-				project.getRootProject().getPlugins().hasPlugin("fabric-loom") ? project.getRootProject() : project,
+				project,
 				spec -> {
 					spec.setMain(fernFlowerExecutor().getName());
 					spec.jvmArgs("-Xms200m", "-Xmx3G");
diff --git a/src/main/java/net/fabricmc/loom/decompilers/fernflower/ForkingJavaExec.java b/src/main/java/net/fabricmc/loom/decompilers/fernflower/ForkingJavaExec.java
index 8b5f5f60..b62784fb 100644
--- a/src/main/java/net/fabricmc/loom/decompilers/fernflower/ForkingJavaExec.java
+++ b/src/main/java/net/fabricmc/loom/decompilers/fernflower/ForkingJavaExec.java
@@ -24,11 +24,10 @@
 
 package net.fabricmc.loom.decompilers.fernflower;
 
+import java.net.URLClassLoader;
+
 import org.gradle.api.Action;
 import org.gradle.api.Project;
-import org.gradle.api.artifacts.ConfigurationContainer;
-import org.gradle.api.artifacts.dsl.DependencyHandler;
-import org.gradle.api.file.FileCollection;
 import org.gradle.process.ExecResult;
 import org.gradle.process.JavaExecSpec;
 
@@ -40,13 +39,8 @@ import org.gradle.process.JavaExecSpec;
  */
 public class ForkingJavaExec {
 	public static ExecResult javaexec(Project project, Action<? super JavaExecSpec> action) {
-		ConfigurationContainer configurations = project.getBuildscript().getConfigurations();
-		DependencyHandler handler = project.getDependencies();
-		FileCollection classpath = configurations.getByName("classpath")//
-						.plus(configurations.detachedConfiguration(handler.localGroovy()));
-
 		return project.javaexec(spec -> {
-			spec.classpath(classpath);
+			spec.classpath((Object[]) ((URLClassLoader) ForkingJavaExec.class.getClassLoader()).getURLs());
 			action.execute(spec);
 		});
 	}