Merge remote-tracking branch 'upstream/dev/1.1' into dev/1.1

# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/mods/AccessWidenerUtils.java
This commit is contained in:
Juuz
2023-03-17 19:02:31 +02:00

View File

@@ -57,13 +57,11 @@ public class AccessWidenerUtils {
}
public static AccessWidenerData readAccessWidenerData(Path inputJar) throws IOException {
final FabricModJson fabricModJson = FabricModJsonFactory.createFromZipNullable(inputJar);
// ARCH: Having no mod metadata is just fine.
if (fabricModJson == null) {
if (!FabricModJsonFactory.isModJar(inputJar)) {
return null;
}
final FabricModJson fabricModJson = FabricModJsonFactory.createFromZip(inputJar);
final List<String> classTweakers = List.copyOf(fabricModJson.getClassTweakers().keySet());
if (classTweakers.isEmpty()) {