hibiscus-client/fabric-loom
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Another attempt at fixing issues with fernflower's classpath

Browse source
This commit is contained in:
modmuss50 2021-01-21 20:09:48 +00:00
parent 4a30993da7
commit d91b722c35
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/net/fabricmc/loom/decompilers/fernflower/AbstractFernFlowerDecompiler.java
View file

@ -100,7 +100,7 @@ public abstract class AbstractFernFlowerDecompiler implements LoomDecompiler {
progressGroup.started(); progressGroup.started();
ExecResult result = ForkingJavaExec.javaexec( ExecResult result = ForkingJavaExec.javaexec(
project.getRootProject().getPlugins().hasPlugin("fabric-loom") ? project.getRootProject() : project, project,
spec -> { spec -> {
spec.setMain(fernFlowerExecutor().getName()); spec.setMain(fernFlowerExecutor().getName());
spec.jvmArgs("-Xms200m", "-Xmx3G"); spec.jvmArgs("-Xms200m", "-Xmx3G");

13
src/main/java/net/fabricmc/loom/decompilers/fernflower/ForkingJavaExec.java
View file

@ -47,15 +47,14 @@ public class ForkingJavaExec {
}); });
} }
private static Set<Configuration> getForkedFernflowerClasspath(Project project) { private static Configuration[] getForkedFernflowerClasspath(Project project) {
Set<Configuration> allConfigurations = new HashSet<>(); Set<Configuration> allConfigurations = new HashSet<>();
Project p = project; allConfigurations.addAll(project.getBuildscript().getConfigurations());
do { if (project.getRootProject() != project) {
allConfigurations.addAll(p.getBuildscript().getConfigurations()); allConfigurations.addAll(project.getRootProject().getBuildscript().getConfigurations());
p = p.getRootProject(); }
} while (p != p.getRootProject());
return allConfigurations; return allConfigurations.toArray(new Configuration[0]);
} }
} }