Fix an issue with configurations being looked up without checking if …

…they exist
neoforged · May 28, 2024 · f6bbe39 · f6bbe39
1 parent eee6d50
commit f6bbe39
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/common/src/main/java/net/neoforged/gradle/common/CommonProjectPlugin.java b/common/src/main/java/net/neoforged/gradle/common/CommonProjectPlugin.java
@@ -180,17 +180,22 @@ private void configureSourceSetConventions(Project project, Conventions conventi
         }
 
         ProjectUtils.afterEvaluate(project, () -> {
-            project.getExtensions().configure(RunsConstants.Extensions.RUNS, (Action<NamedDomainObjectContainer<Run>>) runs -> runs.configureEach(run -> {
-                if (sourceSets.getShouldMainSourceSetBeAutomaticallyAddedToRuns().get()) {
-                    //We always register main
-                    run.getModSources().add(project.getExtensions().getByType(SourceSetContainer.class).getByName("main"));
-                }
+            project.getExtensions().configure(RunsConstants.Extensions.RUNS, (Action<NamedDomainObjectContainer<Run>>) runs -> {
+                runs.configureEach(run -> {
+                    if (sourceSets.getShouldMainSourceSetBeAutomaticallyAddedToRuns().get()) {
+                        //We always register main
+                        run.getModSources().add(project.getExtensions().getByType(SourceSetContainer.class).getByName("main"));
+                    }
 
-                if (sourceSets.getShouldSourceSetsLocalRunRuntimesBeAutomaticallyAddedToRuns().get() && configurations.getIsEnabled().get())
-                    run.getModSources().get().forEach(sourceSet -> {
-                        run.getDependencies().get().getRuntime().add(project.getConfigurations().getByName(ConfigurationUtils.getSourceSetName(sourceSet, configurations.getRunRuntimeConfigurationPostFix().get())));
-                    });
-            }));
+                    if (sourceSets.getShouldSourceSetsLocalRunRuntimesBeAutomaticallyAddedToRuns().get() && configurations.getIsEnabled().get()) {
+                        run.getModSources().get().forEach(sourceSet -> {
+                            if (project.getConfigurations().findByName(ConfigurationUtils.getSourceSetName(sourceSet, configurations.getRunRuntimeConfigurationPostFix().get())) != null) {
+                                run.getDependencies().get().getRuntime().add(project.getConfigurations().getByName(ConfigurationUtils.getSourceSetName(sourceSet, configurations.getRunRuntimeConfigurationPostFix().get())));
+                            }
+                        });
+                    }
+                });
+            });
         });
 
     }