Fix run config argument inheritance. Fixes #1015

Author: LexManos

.gitignore

@@ -70,6 +70,9 @@ gradle-app.setting
 # Eclipse Gradle plugin generated files
 # Eclipse Core
 .project
+.settings
+.classpath
+bin/
 # JDT-specific (Eclipse Java Development Tools)
 .classpath
 

src/main/java/net/minecraftforge/gradle/SlimeLauncherOptionsNested.java

@@ -24,6 +24,13 @@ public interface SlimeLauncherOptionsNested {
     /// @return A property for the main class
     @Input @Optional Property<String> getMainClass();
 
+    /// Wither or not to inherit arguments from the UserDev provided run configs.
+    ///
+    /// If you set this to false you must specify all arguments to start the process manually.
+    ///
+    /// @return A property controlling inheritance of arguments from UserDev config file.
+    @Input @Optional Property<Boolean> getInheritArgs();
+
     /// The arguments to pass to the main class.
     ///
     /// This is the arguments that will be passed to the main class through Slime Launcher, **not** the arguments for
@@ -32,6 +39,13 @@ public interface SlimeLauncherOptionsNested {
     /// @return A property for the arguments to pass to the main class
     @Input @Optional ListProperty<String> getArgs();
 
+    /// Wither or not to inherit JVM arguments from the UserDev provided run configs.
+    ///
+    /// If you set this to false you must specify all JVM arguments to start the process manually.
+    ///
+    /// @return A property controlling inheritance of JVM arguments from UserDev config file.
+    @Input @Optional Property<Boolean> getInheritJvmArgs();
+
     /// The JVM arguments to use.
     ///
     /// These are applied immediately when Slime Launcher is executed. A reminder that Slime Launcher is not a

src/main/java/net/minecraftforge/gradle/internal/SlimeLauncherOptionsImpl.java

@@ -16,7 +16,6 @@
 import org.gradle.api.provider.Property;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.provider.ProviderFactory;
-
 import javax.inject.Inject;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -27,7 +26,9 @@ public abstract class SlimeLauncherOptionsImpl implements SlimeLauncherOptionsIn
     private final String name;
 
     private final Property<String> mainClass = this.getObjects().property(String.class);
+    private final Property<Boolean> inheritArgs = this.getObjects().property(Boolean.class);
     private final ListProperty<String> args = this.getObjects().listProperty(String.class);
+    private final Property<Boolean> inheritJvmArgs = this.getObjects().property(Boolean.class);
     private final ListProperty<String> jvmArgs = this.getObjects().listProperty(String.class);
     private final ConfigurableFileCollection classpath = this.getObjects().fileCollection();
     private final Property<String> minHeapSize = this.getObjects().property(String.class);
@@ -61,11 +62,21 @@ public Property<String> getMainClass() {
         return this.mainClass;
     }
 
+    @Override
+    public Property<Boolean> getInheritArgs() {
+        return this.inheritArgs;
+    }
+
     @Override
     public ListProperty<String> getArgs() {
         return this.args;
     }
 
+    @Override
+    public Property<Boolean> getInheritJvmArgs() {
+        return this.inheritJvmArgs;
+    }
+
     @Override
     public ListProperty<String> getJvmArgs() {
         return this.jvmArgs;
@@ -263,7 +274,9 @@ public void environment(Provider<? extends Map<String, ?>> properties) {
     public SlimeLauncherOptionsInternal inherit(Map<String, RunConfig> configs, String sourceSetName, String name) {
         var target = getObjects().newInstance(SlimeLauncherOptionsImpl.class, name);
         target.getMainClass().convention(this.getMainClass());
+        target.getInheritArgs().convention(this.getInheritArgs());
         target.getArgs().convention(this.getArgs());
+        target.getInheritJvmArgs().convention(this.getInheritJvmArgs());
         target.getJvmArgs().convention(this.getJvmArgs());
         target.getClasspath().convention(this.getClasspath());
         target.getMinHeapSize().convention(this.getMinHeapSize());
@@ -284,11 +297,21 @@ private SlimeLauncherOptionsInternal inherit(SlimeLauncherOptionsInternal target
             if (config.main != null)
                 target.getMainClass().convention(config.main);
 
-            if (config.args != null && !config.args.isEmpty())
-                target.getArgs().convention(List.copyOf(config.args));
+            if (config.args != null && !config.args.isEmpty()) {
+                if (target.getInheritArgs().getOrElse(Boolean.TRUE)) {
+                    var args = new ArrayList<>(config.args);
+                    args.addAll(target.getArgs().get());
+                    target.getArgs().convention(args);
+                }
+            }
 
-            if (config.jvmArgs != null && !config.jvmArgs.isEmpty())
-                target.jvmArgs(config.jvmArgs);
+            if (config.jvmArgs != null && !config.jvmArgs.isEmpty()) {
+                if (target.getInheritJvmArgs().getOrElse(Boolean.TRUE)) {
+                    var args = new ArrayList<>(config.jvmArgs);
+                    args.addAll(target.getJvmArgs().get());
+                    target.getJvmArgs().convention(args);
+                }
+            }
 
             target.getClient().convention(config.client);