From d95f6a2a4cca13a1bac88b216943d41a1584a996 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Wed, 8 Dec 2021 22:03:21 +0800 Subject: Patch ModDependencyInfo for fabric.mod.json check Signed-off-by: shedaniel --- .../processors/dependency/ModDependencyInfo.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/net/fabricmc/loom/configuration/processors/dependency/ModDependencyInfo.java b/src/main/java/net/fabricmc/loom/configuration/processors/dependency/ModDependencyInfo.java index 10aa256a..5f6d0377 100644 --- a/src/main/java/net/fabricmc/loom/configuration/processors/dependency/ModDependencyInfo.java +++ b/src/main/java/net/fabricmc/loom/configuration/processors/dependency/ModDependencyInfo.java @@ -192,7 +192,18 @@ public class ModDependencyInfo { } private static AccessWidenerData tryReadAccessWidenerData(Path inputJar) throws IOException { - byte[] modJsonBytes = ZipUtils.unpack(inputJar, "fabric.mod.json"); + byte[] modJsonBytes = ZipUtils.unpackNullable(inputJar, "fabric.mod.json"); + + if (modJsonBytes == null) { + modJsonBytes = ZipUtils.unpackNullable(inputJar, "architectury.common.json"); + + if (modJsonBytes == null) { + // No access widener data + // We can just ignore in architectury + return null; + } + } + JsonObject jsonObject = LoomGradlePlugin.GSON.fromJson(new String(modJsonBytes, StandardCharsets.UTF_8), JsonObject.class); if (!jsonObject.has("accessWidener")) { -- cgit