diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-01-19 21:51:19 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-01-19 21:51:19 +0800 |
| commit | b57e5a82270b9c001ad2b8442ab4a6f8e0570398 (patch) | |
| tree | e27a1d70c43e1d7a64bfe3ba452bf60cdd722324 /src/main/java/net/fabricmc/loom/decompilers | |
| parent | 4ece44daadc4e07e47895a7c8651169187031560 (diff) | |
| download | architectury-loom-b57e5a82270b9c001ad2b8442ab4a6f8e0570398.tar.gz architectury-loom-b57e5a82270b9c001ad2b8442ab4a6f8e0570398.tar.bz2 architectury-loom-b57e5a82270b9c001ad2b8442ab4a6f8e0570398.zip | |
Make genSources work in sub-projects without loom on the classpath (the root project can apply the plugin without adding it to the classpath!)
Diffstat (limited to 'src/main/java/net/fabricmc/loom/decompilers')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/decompilers/fernflower/AbstractFernFlowerDecompiler.java | 2 | ||||
| -rw-r--r-- | src/main/java/net/fabricmc/loom/decompilers/fernflower/ForkingJavaExec.java | 3 |
2 files changed, 3 insertions, 2 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..7135df03 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.getRootProject().getPlugins().hasPlugin("forgified-fabric-loom") ? project.getRootProject() : 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..e4b61b02 100644 --- a/src/main/java/net/fabricmc/loom/decompilers/fernflower/ForkingJavaExec.java +++ b/src/main/java/net/fabricmc/loom/decompilers/fernflower/ForkingJavaExec.java @@ -42,7 +42,8 @@ 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")// + FileCollection classpath = project.getBuildscript().getConfigurations().getByName("classpath") + .plus(project.getRootProject().getBuildscript().getConfigurations().getByName("classpath")) .plus(configurations.detachedConfiguration(handler.localGroovy())); return project.javaexec(spec -> { |