diff --git a/src/main/java/net/fabricmc/loom/build/nesting/JarNester.java b/src/main/java/net/fabricmc/loom/build/nesting/JarNester.java index 795223fa..10990203 100644 --- a/src/main/java/net/fabricmc/loom/build/nesting/JarNester.java +++ b/src/main/java/net/fabricmc/loom/build/nesting/JarNester.java @@ -107,7 +107,7 @@ public class JarNester { for (File file : jars) { String nestedJarPath = "META-INF/jars/" + file.getName(); - Preconditions.checkArgument(ModUtils.isMod(file, platform) || ModUtils.isMod(file, ModPlatform.FABRIC), "Cannot nest none mod jar: " + file.getName()); + Preconditions.checkArgument(ModUtils.isMod(file, platform), "Cannot nest none mod jar: " + file.getName()); for (JsonElement nestedJar : nestedJars) { String nestedJarString = nestedJar.getAsString(); diff --git a/src/main/java/net/fabricmc/loom/util/ModUtils.java b/src/main/java/net/fabricmc/loom/util/ModUtils.java index 44fff99f..c36ff887 100644 --- a/src/main/java/net/fabricmc/loom/util/ModUtils.java +++ b/src/main/java/net/fabricmc/loom/util/ModUtils.java @@ -48,7 +48,7 @@ public final class ModUtils { if (platform == ModPlatform.FORGE) { return ZipUtils.contains(input, "META-INF/mods.toml"); } else if (platform == ModPlatform.QUILT) { - return ZipUtils.contains(input, "quilt.mod.json"); + return ZipUtils.contains(input, "quilt.mod.json") || isMod(input, ModPlatform.FABRIC); } return ZipUtils.contains(input, "fabric.mod.json"); @@ -73,18 +73,13 @@ public final class ModUtils { public static boolean shouldRemapMod(Logger logger, File input, Object id, ModPlatform platform, String config) { if (ZipUtils.contains(input.toPath(), "architectury.common.marker")) return true; - if (isMod(input, platform)) return true; + if (isMod(input.toPath(), platform)) return true; if (platform == ModPlatform.FORGE) { logger.lifecycle(":could not find forge mod in " + config + " but forcing: {}", id); return true; } - if (platform == ModPlatform.QUILT && isMod(input, ModPlatform.FABRIC)) { - logger.lifecycle(":found fabric mod on quilt {} in {}", id, config); - return true; - } - return false; } }