From e439a1b35493fe771e34b1698270bfa5fc41a97c Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 14 Jul 2021 00:03:21 +0100 Subject: Refactor LoomGradleExtension (#431) * First pass at refactoring the extension * Fix inital issues. * Combine some interfaces * Checkstyle * Fix years * Add isShareCaches to api --- .../loom/configuration/CompileConfiguration.java | 35 +++++++++++----------- 1 file changed, 18 insertions(+), 17 deletions(-) (limited to 'src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java') diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index d4f55d74..e2afdff7 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -49,30 +49,31 @@ public final class CompileConfiguration { public static void setupConfigurations(Project project) { final ConfigurationContainer configurations = project.getConfigurations(); - LoomProjectData data = project.getExtensions().getByType(LoomGradleExtension.class).getProjectData(); - data.createLazyConfiguration(Constants.Configurations.MOD_COMPILE_CLASSPATH).configure(configuration -> configuration.setTransitive(true)); - data.createLazyConfiguration(Constants.Configurations.MOD_COMPILE_CLASSPATH_MAPPED).configure(configuration -> configuration.setTransitive(false)); - data.createLazyConfiguration(Constants.Configurations.MINECRAFT_NAMED).configure(configuration -> configuration.setTransitive(false)); // The launchers do not recurse dependencies - data.createLazyConfiguration(Constants.Configurations.MINECRAFT_DEPENDENCIES).configure(configuration -> configuration.setTransitive(false)); - data.createLazyConfiguration(Constants.Configurations.LOADER_DEPENDENCIES).configure(configuration -> configuration.setTransitive(false)); - data.createLazyConfiguration(Constants.Configurations.MINECRAFT).configure(configuration -> configuration.setTransitive(false)); - data.createLazyConfiguration(Constants.Configurations.INCLUDE).configure(configuration -> configuration.setTransitive(false)); // Dont get transitive deps - data.createLazyConfiguration(Constants.Configurations.MAPPING_CONSTANTS); + LoomGradleExtension extension = LoomGradleExtension.get(project); + + extension.createLazyConfiguration(Constants.Configurations.MOD_COMPILE_CLASSPATH).configure(configuration -> configuration.setTransitive(true)); + extension.createLazyConfiguration(Constants.Configurations.MOD_COMPILE_CLASSPATH_MAPPED).configure(configuration -> configuration.setTransitive(false)); + extension.createLazyConfiguration(Constants.Configurations.MINECRAFT_NAMED).configure(configuration -> configuration.setTransitive(false)); // The launchers do not recurse dependencies + extension.createLazyConfiguration(Constants.Configurations.MINECRAFT_DEPENDENCIES).configure(configuration -> configuration.setTransitive(false)); + extension.createLazyConfiguration(Constants.Configurations.LOADER_DEPENDENCIES).configure(configuration -> configuration.setTransitive(false)); + extension.createLazyConfiguration(Constants.Configurations.MINECRAFT).configure(configuration -> configuration.setTransitive(false)); + extension.createLazyConfiguration(Constants.Configurations.INCLUDE).configure(configuration -> configuration.setTransitive(false)); // Dont get transitive deps + extension.createLazyConfiguration(Constants.Configurations.MAPPING_CONSTANTS); extendsFrom(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME, Constants.Configurations.MAPPING_CONSTANTS, project); - data.createLazyConfiguration(Constants.Configurations.MAPPINGS); - data.createLazyConfiguration(Constants.Configurations.MAPPINGS_FINAL); - data.createLazyConfiguration(Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES); - data.createLazyConfiguration(Constants.Configurations.UNPICK_CLASSPATH); + extension.createLazyConfiguration(Constants.Configurations.MAPPINGS); + extension.createLazyConfiguration(Constants.Configurations.MAPPINGS_FINAL); + extension.createLazyConfiguration(Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES); + extension.createLazyConfiguration(Constants.Configurations.UNPICK_CLASSPATH); for (RemappedConfigurationEntry entry : Constants.MOD_COMPILE_ENTRIES) { - data.createLazyConfiguration(entry.sourceConfiguration()) + extension.createLazyConfiguration(entry.sourceConfiguration()) .configure(configuration -> configuration.setTransitive(true)); // Don't get transitive deps of already remapped mods - data.createLazyConfiguration(entry.getRemappedConfiguration()) + extension.createLazyConfiguration(entry.getRemappedConfiguration()) .configure(configuration -> configuration.setTransitive(false)); extendsFrom(entry.getTargetConfiguration(configurations), entry.getRemappedConfiguration(), project); @@ -111,7 +112,7 @@ public final class CompileConfiguration { }); p.afterEvaluate(project -> { - LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class); + LoomGradleExtension extension = LoomGradleExtension.get(project); LoomDependencyManager dependencyManager = new LoomDependencyManager(); extension.setDependencyManager(dependencyManager); @@ -129,7 +130,7 @@ public final class CompileConfiguration { SetupIntelijRunConfigs.setup(project); // Enables the default mod remapper - if (extension.remapMod) { + if (extension.isRemapMod()) { RemapConfiguration.setupDefaultRemap(project); } else { Jar jarTask = (Jar) project.getTasks().getByName("jar"); -- cgit