diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-04-14 08:40:11 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-04-14 08:45:26 +0800 |
| commit | aa009c2b2daac03b7ad4d9041fce5440c7183d08 (patch) | |
| tree | 3a5b6ec3090c93aa1ddd009aa461c13132742231 /src/main/java/net/fabricmc/loom/configuration | |
| parent | e3a446965d5b49a942347859b3e8c051dcb211ae (diff) | |
| download | architectury-loom-aa009c2b2daac03b7ad4d9041fce5440c7183d08.tar.gz architectury-loom-aa009c2b2daac03b7ad4d9041fce5440c7183d08.tar.bz2 architectury-loom-aa009c2b2daac03b7ad4d9041fce5440c7183d08.zip | |
Add "loom.forge.include" for include configuration on forge
Diffstat (limited to 'src/main/java/net/fabricmc/loom/configuration')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java | 2 | ||||
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index 078a777d..ad591f76 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -99,7 +99,7 @@ public final class CompileConfiguration { extendsFrom(Constants.Configurations.MINECRAFT_DEPENDENCIES, Constants.Configurations.FORGE_DEPENDENCIES, project); } - if (!project.getExtensions().getByType(LoomGradleExtension.class).isForge()) { + if (project.getExtensions().getByType(LoomGradleExtension.class).supportsInclude()) { Configuration includeConfig = project.getConfigurations().maybeCreate(Constants.Configurations.INCLUDE); includeConfig.setTransitive(false); // Dont get transitive deps } diff --git a/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java index e4044a68..7e1a1f3f 100644 --- a/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java @@ -95,7 +95,7 @@ public class RemapConfiguration { // TODO this might be wrong? project.getTasks().withType(RemapJarTask.class).forEach(task -> { - if (!extension.isForge() && task.getAddNestedDependencies().getOrElse(false)) { + if (extension.supportsInclude() && task.getAddNestedDependencies().getOrElse(false)) { NestedDependencyProvider.getRequiredTasks(project).forEach(task::dependsOn); } }); |