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

Fix and improve error handling around access widener remapping with shared caches

Browse source
This commit is contained in:
modmuss50 2020-08-26 20:15:21 +01:00
parent c0ef536be4
commit 8b1268abe7
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/net/fabricmc/loom/task/RemapJarTask.java
View file

@ -32,6 +32,7 @@ import java.nio.file.Path;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import com.google.common.base.Preconditions;
import org.gradle.api.Project; import org.gradle.api.Project;
import org.gradle.api.file.RegularFileProperty; import org.gradle.api.file.RegularFileProperty;
import org.gradle.api.provider.Property; import org.gradle.api.provider.Property;
@ -212,7 +213,10 @@ public class RemapJarTask extends Jar {
throw new RuntimeException("Failed to remap access widener"); 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; return null;
@ -233,7 +237,8 @@ public class RemapJarTask extends Jar {
} }
if (accessWidener != null) { 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");
} }
}); });
} }