imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-02 05:27:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix common mods not being remapped

Browse Source
This commit is contained in:
Juuz
2022-10-30 12:01:22 +02:00
parent 1dc04a7b3a
commit d4cc730f5d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/fabricmc/loom/configuration/mods/ModConfigurationRemapper.java
View File

@@ -88,7 +88,7 @@ public class ModConfigurationRemapper {
final List<ModDependency> 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;
}

6
src/main/java/net/fabricmc/loom/util/ModUtils.java
View File

@@ -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;
}