Skip to content

Commit e86abc0

Browse files
committed
Prefer toolchain jvm for reobfJar
1 parent 38df9d9 commit e86abc0

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

src/main/groovy/net/minecraftforge/forgedev/ForgeDevExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ private void setup(ForgeDevPlugin plugin, Project project) {
196196

197197
var reobfJar = tasks.register("reobfJar", LegacyReobfuscateJar.class, task -> {
198198
task.getInput().set(jar.flatMap(Jar::getArchiveFile));
199-
// TODO Optimize this to use a detached configuraiton
199+
// TODO Optimize this to use a detached configuration
200200
task.getLibraries().from(project.getConfigurations().named(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME));
201201
task.getOutput().convention(task.getDefaultOutputFile());
202202
});

src/main/groovy/net/minecraftforge/forgedev/tasks/obfuscation/LegacyRenameJar.groovy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ abstract class LegacyRenameJar extends ToolExec {
5151
LegacyRenameJar() {
5252
super(Tools.FART)
5353

54+
this.preferToolchainJvm.set(true)
55+
5456
this.workerActionClasspath.from(
5557
this.getTool(Tools.SRGUTILS).classpath
5658
)

src/main/groovy/net/minecraftforge/forgedev/tasks/obfuscation/LegacyReobfuscateJar.groovy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ abstract class LegacyReobfuscateJar extends ToolExec {
5555
LegacyReobfuscateJar() {
5656
super(Tools.FART)
5757

58+
this.preferToolchainJvm.set(true)
59+
5860
this.workerActionClasspath.from(
5961
this.getTool(Tools.SRGUTILS).classpath
6062
)

0 commit comments

Comments
 (0)