diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-04-13 16:30:44 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-04-13 16:30:44 +0800 |
| commit | 58d1b066bd6e3f69211ebd5e7a84777a52801523 (patch) | |
| tree | a6c9746a6970da297b501030c415fc7660bd0929 /src/main/java/net/fabricmc/loom/configuration | |
| parent | 897806572e04b7e94f43e30fece01eef91507bfc (diff) | |
| download | architectury-loom-58d1b066bd6e3f69211ebd5e7a84777a52801523.tar.gz architectury-loom-58d1b066bd6e3f69211ebd5e7a84777a52801523.tar.bz2 architectury-loom-58d1b066bd6e3f69211ebd5e7a84777a52801523.zip | |
Simplify RemapJarTask remapRefmap
Diffstat (limited to 'src/main/java/net/fabricmc/loom/configuration')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java | 6 | ||||
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index ebc8059b..078a777d 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -99,8 +99,10 @@ public final class CompileConfiguration { extendsFrom(Constants.Configurations.MINECRAFT_DEPENDENCIES, Constants.Configurations.FORGE_DEPENDENCIES, project); } - Configuration includeConfig = project.getConfigurations().maybeCreate(Constants.Configurations.INCLUDE); - includeConfig.setTransitive(false); // Dont get transitive deps + if (!project.getExtensions().getByType(LoomGradleExtension.class).isForge()) { + Configuration includeConfig = project.getConfigurations().maybeCreate(Constants.Configurations.INCLUDE); + includeConfig.setTransitive(false); // Dont get transitive deps + } project.getConfigurations().maybeCreate(Constants.Configurations.MAPPING_CONSTANTS); extendsFrom(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME, Constants.Configurations.MAPPING_CONSTANTS, project); diff --git a/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java index b21faa63..e4044a68 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 (task.getAddNestedDependencies().getOrElse(false)) { + if (!extension.isForge() && task.getAddNestedDependencies().getOrElse(false)) { NestedDependencyProvider.getRequiredTasks(project).forEach(task::dependsOn); } }); |