Allow for multiple run types

neoforged · Nov 21, 2023 · 5331692 · 5331692
1 parent 23ec387
commit 5331692
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/common/src/main/java/net/neoforged/gradle/common/runs/run/RunImpl.java b/common/src/main/java/net/neoforged/gradle/common/runs/run/RunImpl.java
@@ -30,7 +30,7 @@ public abstract class RunImpl implements ConfigurableDSLElement<Run>, Run {
     private MapProperty<String, String> environmentVariables;
     private ListProperty<String> programArguments;
     private MapProperty<String, String> systemProperties;
-    private final Property<RunType> runType;
+    private final ListProperty<RunType> runTypes;
 
     private final Set<TaskProvider<? extends Task>> dependencies = Sets.newHashSet();
 
@@ -43,7 +43,7 @@ public RunImpl(final Project project, final String name) {
         this.environmentVariables = this.project.getObjects().mapProperty(String.class, String.class);
         this.programArguments = this.project.getObjects().listProperty(String.class);
         this.systemProperties = this.project.getObjects().mapProperty(String.class, String.class);
-        this.runType = this.project.getObjects().property(RunType.class);
+        this.runTypes = this.project.getObjects().listProperty(RunType.class);
 
         getIsSingleInstance().convention(true);
         getIsClient().convention(false);
@@ -118,29 +118,30 @@ public Set<TaskProvider<? extends Task>> getTaskDependencies() {
 
     @Override
     public final void configure() {
-        if (getConfigureFromTypeWithName().get() && !runType.isPresent()) {
-            runType.set(getRunTypeProviderByName(name));
+        if (getConfigureFromTypeWithName().get()) {
+            configureInternally(getRunTypeProviderByName(name).get());
         }
 
-        if (runType.isPresent()) {
-            configureInternally(runType.get());
+        for (RunType runType : runTypes.get()) {
+            configureInternally(runType);
         }
     }
 
     @Override
     public final void configure(final @NotNull String name) {
-        runType.set(getRunTypeProviderByName(name));
+        getConfigureFromTypeWithName().set(false); // Don't re-configure
+        runTypes.add(getRunTypeProviderByName(name));
     }
 
     @Override
     public final void configure(final @NotNull RunType runType) {
         getConfigureFromTypeWithName().set(false); // Don't re-configure
-        this.runType.set(runType);
+        this.runTypes.add(runType);
     }
 
     @Override
     public void configure(@NotNull Provider<RunType> typeProvider) {
-        this.runType.set(typeProvider);
+        this.runTypes.add(typeProvider);
     }
 
     @SafeVarargs
@@ -150,6 +151,7 @@ public final void dependsOn(TaskProvider<? extends Task>... tasks) {
     }
 
     public void configureInternally(final @NotNull RunType spec) {
+        project.getLogger().debug("Configuring run {} with run type {}", name, spec.getName());
         getEnvironmentVariables().putAll(spec.getEnvironmentVariables());
         getMainClass().convention(spec.getMainClass());
         getProgramArguments().addAll(spec.getArguments());