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

Fix remapping forge dependencies

Browse Source
This commit is contained in:
shedaniel
2020-12-25 16:19:24 +08:00
parent d325274e4f
commit 43cef2e5a4
4 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/net/fabricmc/loom/util/ModCompileRemapper.java
View File

@@ -73,7 +73,7 @@ public class ModCompileRemapper {
String version = artifact.getModuleVersion().getId().getVersion();
String classifierSuffix = artifact.getClassifier() == null ? "" : (":" + artifact.getClassifier());
if (!isFabricMod(logger, artifact)) {
if (!shouldRemapMod(logger, artifact, extension.isForge())) {
addToRegularCompile(project, regularConfig, artifact);
continue;
}
@@ -112,13 +112,20 @@ public class ModCompileRemapper {
/**
* Checks if an artifact is a fabric mod, according to the presence of a fabric.mod.json.
*/
private static boolean isFabricMod(Logger logger, ResolvedArtifact artifact) {
private static boolean shouldRemapMod(Logger logger, ResolvedArtifact artifact, boolean forge) {
File input = artifact.getFile();
try (ZipFile zipFile = new ZipFile(input)) {
if (zipFile.getEntry("fabric.mod.json") != null) {
logger.info("Found Fabric mod in modCompile: {}", artifact.getId());
return true;
if (forge) {
if (zipFile.getEntry("META-INF/mods.toml") != null) {
logger.info("Found Forge mod in modCompile: {}", artifact.getId());
return true;
}
} else {
if (zipFile.getEntry("fabric.mod.json") != null) {
logger.info("Found Fabric mod in modCompile: {}", artifact.getId());
return true;
}
}
return false;