Ability to change the source set added to classpath

Author: Yeregorix

subprojects/gradle-plugin/src/main/java/org/spongepowered/gradle/vanilla/VanillaGradle.java

@@ -106,13 +106,6 @@ private void applyToProject(final Project project) {
                     c.extendsFrom(minecraftConfig.get());
                 });
             });
-
-            project.afterEvaluate(p -> {
-                final NamedDomainObjectProvider<SourceSet> mainSourceSet =
-                    p.getExtensions().getByType(SourceSetContainer.class).named(SourceSet.MAIN_SOURCE_SET_NAME);
-                minecraft.getRuns().configureEach(
-                    run -> run.getClasspath().from(mainSourceSet.map(SourceSet::getOutput), mainSourceSet.map(SourceSet::getRuntimeClasspath)));
-            });
         });
 
         for (final String shadowPluginId : SHADOW_PLUGIN_IDS) {

subprojects/gradle-plugin/src/main/java/org/spongepowered/gradle/vanilla/internal/ProvideMinecraftPlugin.java

@@ -51,8 +51,6 @@
 import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.Delete;
 import org.gradle.api.tasks.JavaExec;
-import org.gradle.api.tasks.SourceSet;
-import org.gradle.api.tasks.SourceSetContainer;
 import org.gradle.api.tasks.Sync;
 import org.gradle.api.tasks.TaskContainer;
 import org.gradle.api.tasks.TaskProvider;
@@ -73,7 +71,6 @@
 import org.spongepowered.gradle.vanilla.internal.util.StringUtils;
 import org.spongepowered.gradle.vanilla.repository.MinecraftPlatform;
 import org.spongepowered.gradle.vanilla.repository.MinecraftRepositoryExtension;
-import org.spongepowered.gradle.vanilla.repository.MinecraftSide;
 import org.spongepowered.gradle.vanilla.runs.ClientRunParameterTokens;
 import org.spongepowered.gradle.vanilla.task.DecompileJarTask;
 import org.spongepowered.gradle.vanilla.task.DownloadAssetsTask;
@@ -348,13 +345,7 @@ public void idea(final Project project, final IdeaModel idea, final ProjectSetti
                         ideaRun.setWorkingDirectory(runDirectory.getAbsolutePath());
                         runDirectory.mkdirs();
 
-                        final SourceSet moduleSet;
-                        if (run.getIdeaRunSourceSet().isPresent()) {
-                            moduleSet = run.getIdeaRunSourceSet().get();
-                        } else {
-                            moduleSet = project.getExtensions().getByType(SourceSetContainer.class).getByName(SourceSet.MAIN_SOURCE_SET_NAME);
-                        }
-                        ideaRun.moduleRef(project, moduleSet);
+                        ideaRun.moduleRef(project, run.getIdeaRunSourceSet().orElse(run.getSourceSet()).get());
                         ideaRun.setJvmArgs(StringUtils.join(run.getAllJvmArgumentProviders(), true));
                         ideaRun.setProgramParameters(StringUtils.join(run.getAllArgumentProviders(), true));
                     });

subprojects/gradle-plugin/src/main/java/org/spongepowered/gradle/vanilla/runs/RunConfiguration.java

@@ -27,6 +27,7 @@
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.gradle.api.Action;
 import org.gradle.api.Named;
+import org.gradle.api.Project;
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.file.ProjectLayout;
@@ -38,6 +39,7 @@
 import org.gradle.api.tasks.Nested;
 import org.gradle.api.tasks.Optional;
 import org.gradle.api.tasks.SourceSet;
+import org.gradle.api.tasks.SourceSetContainer;
 import org.gradle.jvm.toolchain.JavaLanguageVersion;
 import org.gradle.process.CommandLineArgumentProvider;
 import org.spongepowered.gradle.vanilla.internal.Constants;
@@ -70,10 +72,11 @@ public class RunConfiguration implements Named {
     private final MapProperty<String, String> parameterTokens;
     private final Property<Boolean> requiresAssetsAndNatives;
     private final Property<SourceSet> ideaSourceSet;
+    private final Property<SourceSet> sourceSet;
     private final Property<JavaLanguageVersion> targetVersion;
 
     @Inject
-    public RunConfiguration(final String name, final ProjectLayout layout, final ObjectFactory objects) {
+    public RunConfiguration(final String name, final ProjectLayout layout, final ObjectFactory objects, final Project project) {
         this.name = name;
         this.displayName = objects.property(String.class);
 
@@ -89,8 +92,12 @@ public RunConfiguration(final String name, final ProjectLayout layout, final Obj
         this.parameterTokens = objects.mapProperty(String.class, String.class);
         this.requiresAssetsAndNatives = objects.property(Boolean.class).convention(false);
         this.ideaSourceSet = objects.property(SourceSet.class);
+        this.sourceSet = objects.property(SourceSet.class)
+                .convention(project.getExtensions().getByType(SourceSetContainer.class).named(SourceSet.MAIN_SOURCE_SET_NAME));
         this.targetVersion = objects.property(JavaLanguageVersion.class);
 
+        this.classpath.from(this.sourceSet.map(SourceSet::getOutput), this.sourceSet.map(SourceSet::getRuntimeClasspath));
+
         // Apply global environment here
         this.parameterTokens.put(ClientRunParameterTokens.LAUNCHER_NAME, Constants.NAME);
         this.parameterTokens.put(ClientRunParameterTokens.LAUNCHER_VERSION, Constants.VERSION);
@@ -156,13 +163,26 @@ public ConfigurableFileCollection getClasspath() {
      *
      * @return the source set to use
      * @since 0.2
+     * @deprecated Use {@link #getSourceSet()} instead.
      */
+    @Deprecated
     @Input
     @Optional
     public Property<SourceSet> getIdeaRunSourceSet() {
         return this.ideaSourceSet;
     }
 
+    /**
+     * Get the source set to use in the classpath and IDE runs.
+     *
+     * @return the source set to use
+     * @since 0.2.1
+     */
+    @Input
+    public Property<SourceSet> getSourceSet() {
+        return this.sourceSet;
+    }
+
     @Nested
     public List<CommandLineArgumentProvider> getAllArgumentProviders() {
         return this.allArgs;