From 4f88afa0ff1d1a6f01303424383efad02e0c9483 Mon Sep 17 00:00:00 2001 From: shartte Date: Sat, 4 Jan 2025 01:16:45 +0100 Subject: [PATCH] Fix RemapJar producing broken jars if any copy spec is provided to the underlying Jar task (#219) --- .../moddevgradle/legacyforge/tasks/RemapJar.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/legacy/java/net/neoforged/moddevgradle/legacyforge/tasks/RemapJar.java b/src/legacy/java/net/neoforged/moddevgradle/legacyforge/tasks/RemapJar.java index 93bf695..39469da 100644 --- a/src/legacy/java/net/neoforged/moddevgradle/legacyforge/tasks/RemapJar.java +++ b/src/legacy/java/net/neoforged/moddevgradle/legacyforge/tasks/RemapJar.java @@ -1,6 +1,8 @@ package net.neoforged.moddevgradle.legacyforge.tasks; +import java.io.File; import java.io.IOException; +import java.io.UncheckedIOException; import javax.inject.Inject; import org.gradle.api.file.ConfigurableFileCollection; import org.gradle.api.file.RegularFileProperty; @@ -33,10 +35,17 @@ public abstract class RemapJar extends Jar { protected abstract ExecOperations getExecOperations(); @Inject - public RemapJar() {} + public RemapJar() { + getRemapOperation().getLogFile().set(new File(getTemporaryDir(), "console.log")); + } @TaskAction - public void remap() throws IOException { - getRemapOperation().execute(getExecOperations(), getInput().getAsFile().get(), getArchiveFile().get().getAsFile(), getLibraries()); + @Override + public void copy() { + try { + getRemapOperation().execute(getExecOperations(), getInput().getAsFile().get(), getArchiveFile().get().getAsFile(), getLibraries()); + } catch (IOException e) { + throw new UncheckedIOException(e); + } } }