From b69404ea03cbe70c610eb60b5d49500ded3bcb6e Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sat, 22 Jan 2022 23:29:51 +0000 Subject: [PATCH] Fix DecompilerOptions.getClasspath() I was blind and looking for this on the fork options... --- .../java/net/fabricmc/loom/task/GenerateSourcesTask.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java b/src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java index 38e743f..9c93e89 100644 --- a/src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java +++ b/src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java @@ -160,15 +160,17 @@ public abstract class GenerateSourcesTask extends AbstractLoomTask { private WorkQueue createWorkQueue(String jvmMarkerValue) { if (!useProcessIsolation()) { - return getWorkerExecutor().noIsolation(); + return getWorkerExecutor().classLoaderIsolation(spec -> { + spec.getClasspath().from(decompilerOptions.getClasspath()); + }); } return getWorkerExecutor().processIsolation(spec -> { spec.forkOptions(forkOptions -> { forkOptions.setMaxHeapSize("%dm".formatted(decompilerOptions.getMemory().get())); forkOptions.systemProperty(WorkerDaemonClientsManagerHelper.MARKER_PROP, jvmMarkerValue); - forkOptions.bootstrapClasspath(decompilerOptions.getClasspath()); }); + spec.getClasspath().from(decompilerOptions.getClasspath()); }); }