From 8b1268abe741d9c578a654c6a82b9b7788c43bb9 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 26 Aug 2020 20:15:21 +0100 Subject: [PATCH] Fix and improve error handling around access widener remapping with shared caches --- src/main/java/net/fabricmc/loom/task/RemapJarTask.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java index 74ea11e..5611362 100644 --- a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java +++ b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java @@ -32,6 +32,7 @@ import java.nio.file.Path; import java.util.LinkedHashSet; import java.util.Set; +import com.google.common.base.Preconditions; import org.gradle.api.Project; import org.gradle.api.file.RegularFileProperty; import org.gradle.api.provider.Property; @@ -212,7 +213,10 @@ public class RemapJarTask extends Jar { throw new RuntimeException("Failed to remap access widener"); } - return Pair.of(accessWidenerJarProcessor.getAccessWidenerPath(remapData.output), data); + String awPath = accessWidenerJarProcessor.getAccessWidenerPath(remapData.input); + Preconditions.checkNotNull(awPath, "Failed to find accessWidener in fabric.mod.json: " + remapData.input); + + return Pair.of(awPath, data); } return null; @@ -233,7 +237,8 @@ public class RemapJarTask extends Jar { } if (accessWidener != null) { - ZipUtil.replaceEntry(data.output.toFile(), accessWidener.getLeft(), accessWidener.getRight()); + boolean replaced = ZipUtil.replaceEntry(data.output.toFile(), accessWidener.getLeft(), accessWidener.getRight()); + Preconditions.checkArgument(replaced, "Failed to remap access widener"); } }); }