diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-12-08 22:03:21 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-12-08 22:03:21 +0800 |
| commit | d95f6a2a4cca13a1bac88b216943d41a1584a996 (patch) | |
| tree | 94883c33c7a508e6654b99308d54cfb6c567a4fd /src/main/java | |
| parent | d654bf69b4fd86061e1f398d2a46a6fa33702eb7 (diff) | |
| download | architectury-loom-d95f6a2a4cca13a1bac88b216943d41a1584a996.tar.gz architectury-loom-d95f6a2a4cca13a1bac88b216943d41a1584a996.tar.bz2 architectury-loom-d95f6a2a4cca13a1bac88b216943d41a1584a996.zip | |
Patch ModDependencyInfo for fabric.mod.json check
Signed-off-by: shedaniel <daniel@shedaniel.me>
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/processors/dependency/ModDependencyInfo.java | 13 |
1 files changed, 12 insertions, 1 deletions
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")) { |