diff options
| author | Jonas Herzig <jonas@spark-squared.com> | 2022-01-06 16:31:13 +0100 |
|---|---|---|
| committer | Jonas Herzig <jonas@spark-squared.com> | 2022-01-10 14:23:17 +0100 |
| commit | f0cafe844107eb484e9d769dd0cad7c7e5f27e9d (patch) | |
| tree | 518da54517f5bdaca4fbf0d43a1a07760974d02e /src/main/java/net/fabricmc/loom/build | |
| parent | 64a1aba1db539ea854fdc832b1a8e53ac7428263 (diff) | |
| download | architectury-loom-f0cafe844107eb484e9d769dd0cad7c7e5f27e9d.tar.gz architectury-loom-f0cafe844107eb484e9d769dd0cad7c7e5f27e9d.tar.bz2 architectury-loom-f0cafe844107eb484e9d769dd0cad7c7e5f27e9d.zip | |
Support for FG2-era Forge
Diffstat (limited to 'src/main/java/net/fabricmc/loom/build')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java | 2 | ||||
| -rw-r--r-- | src/main/java/net/fabricmc/loom/build/mixin/AnnotationProcessorInvoker.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java b/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java index 76475caa..6fe72b18 100644 --- a/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java +++ b/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java @@ -181,7 +181,7 @@ public class ModCompileRemapper { } if (forge) { - if (zipFile.getEntry("META-INF/mods.toml") != null) { + if (zipFile.getEntry("META-INF/mods.toml") != null || zipFile.getEntry("mcmod.info") != null) { logger.info("Found Forge mod in " + config + ": {}", id); return true; } diff --git a/src/main/java/net/fabricmc/loom/build/mixin/AnnotationProcessorInvoker.java b/src/main/java/net/fabricmc/loom/build/mixin/AnnotationProcessorInvoker.java index 33fec4e6..1793ca72 100644 --- a/src/main/java/net/fabricmc/loom/build/mixin/AnnotationProcessorInvoker.java +++ b/src/main/java/net/fabricmc/loom/build/mixin/AnnotationProcessorInvoker.java @@ -101,7 +101,7 @@ public abstract class AnnotationProcessorInvoker<T extends Task> { ConfigurationContainer configs = project.getConfigurations(); LoomGradleExtension extension = LoomGradleExtension.get(project); - if (!extension.ideSync()) { + if (!extension.ideSync() || extension.isLegacyForge()) { for (Configuration processorConfig : apConfigurations) { project.getLogger().info("Adding mixin to classpath of AP config: " + processorConfig.getName()); // Pass named MC classpath to mixin AP classpath |