Fix merge conflicts, it compiles, but shouldn't work

Signed-off-by: shedaniel <daniel@shedaniel.me>
This commit is contained in:
shedaniel
2022-01-06 16:03:03 +08:00
parent 158185d374
commit 874671eb7f
24 changed files with 160 additions and 152 deletions

View File

@@ -26,6 +26,8 @@ package net.fabricmc.loom.util;
import java.io.File;
import org.gradle.api.logging.Logger;
public final class ModUtils {
private ModUtils() {
}
@@ -33,4 +35,17 @@ public final class ModUtils {
public static boolean isMod(File input) {
return ZipUtils.contains(input.toPath(), "fabric.mod.json");
}
public static boolean shouldRemapMod(Logger logger, File input, Object id, boolean forge, String config) {
if (ZipUtils.contains(input.toPath(), "architectury.common.marker")) return true;
if (forge && ZipUtils.contains(input.toPath(), "META-INF/mods.toml")) return true;
if (!forge && isMod(input)) return true;
if (forge) {
logger.lifecycle(":could not find forge mod in " + config + " but forcing: {}", id);
return true;
}
return false;
}
}