Merge remote-tracking branch 'architectury/dev/0.6-forge' into dev/0.7-forge

# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
This commit is contained in:
shedaniel
2021-05-10 23:13:25 +08:00

View File

@@ -129,6 +129,11 @@ public class ModCompileRemapper {
File input = artifact.getFile();
try (ZipFile zipFile = new ZipFile(input)) {
if (zipFile.getEntry("architectury.common.marker") != null) {
logger.info("Found architectury common mod in " + config + ": {}", artifact.getId());
return true;
}
if (forge) {
if (zipFile.getEntry("META-INF/mods.toml") != null) {
logger.info("Found Forge mod in " + config + ": {}", artifact.getId());