From d4cc730f5d83f28b587aaf48903d8d4f63be05b0 Mon Sep 17 00:00:00 2001 From: Juuz <6596629+Juuxel@users.noreply.github.com> Date: Sun, 30 Oct 2022 12:01:22 +0200 Subject: [PATCH] Fix common mods not being remapped --- .../loom/configuration/mods/ModConfigurationRemapper.java | 2 +- src/main/java/net/fabricmc/loom/util/ModUtils.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/configuration/mods/ModConfigurationRemapper.java b/src/main/java/net/fabricmc/loom/configuration/mods/ModConfigurationRemapper.java index af962d04..d3434a8c 100644 --- a/src/main/java/net/fabricmc/loom/configuration/mods/ModConfigurationRemapper.java +++ b/src/main/java/net/fabricmc/loom/configuration/mods/ModConfigurationRemapper.java @@ -88,7 +88,7 @@ public class ModConfigurationRemapper { final List modDependencies = new ArrayList<>(); for (ArtifactRef artifact : resolveArtifacts(project, sourceConfig)) { - if (!ModUtils.isMod(artifact.path(), extension.getPlatform().get())) { + if (!ModUtils.shouldRemapMod(project.getLogger(), artifact.path(), extension.getPlatform().get(), sourceConfig.getName())) { artifact.applyToConfiguration(project, targetConfig); continue; } diff --git a/src/main/java/net/fabricmc/loom/util/ModUtils.java b/src/main/java/net/fabricmc/loom/util/ModUtils.java index 40c8ac81..a6a8d54d 100644 --- a/src/main/java/net/fabricmc/loom/util/ModUtils.java +++ b/src/main/java/net/fabricmc/loom/util/ModUtils.java @@ -60,12 +60,12 @@ 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; + public static boolean shouldRemapMod(Logger logger, Path input, ModPlatform platform, String config) { + if (ZipUtils.contains(input, "architectury.common.marker")) return true; if (isMod(input, platform)) return true; if (platform == ModPlatform.FORGE) { - logger.lifecycle(":could not find forge mod in " + config + " but forcing: {}", id); + logger.lifecycle(":could not find forge mod in " + config + " but forcing: {}", input.getFileName()); return true; }