Support for environment variables in run configurations

Author: Yeregorix

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

@@ -348,6 +348,7 @@ public void idea(final Project project, final IdeaModel idea, final ProjectSetti
                         ideaRun.moduleRef(project, run.getIdeaRunSourceSet().orElse(run.getSourceSet()).get());
                         ideaRun.setJvmArgs(StringUtils.join(run.getAllJvmArgumentProviders(), true));
                         ideaRun.setProgramParameters(StringUtils.join(run.getAllArgumentProviders(), true));
+                        ideaRun.setEnvs(run.getActualEnvironment());
                     });
                 });
             }
@@ -374,6 +375,7 @@ private void createRunTasks(final MinecraftExtension extension, final TaskContai
                 exec.setWorkingDir(config.getWorkingDirectory());
                 exec.getJvmArgumentProviders().addAll(config.getAllJvmArgumentProviders());
                 exec.getArgumentProviders().addAll(config.getAllArgumentProviders());
+                exec.environment(config.getEnvironment());
                 if (config.getRequiresAssetsAndNatives().get()) {
                     exec.dependsOn(Constants.Tasks.DOWNLOAD_ASSETS);
                     exec.dependsOn(Constants.Tasks.COLLECT_NATIVES);

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

@@ -39,6 +39,7 @@
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamException;
@@ -117,6 +118,8 @@ public void write(final RunConfiguration run) throws XMLStreamException {
         this.stringAttribute(this.launching("VM_ARGUMENTS"), StringUtils.join(run.getAllJvmArgumentProviders(), true));
         this.stringAttribute(this.launching("WORKING_DIRECTORY"), run.getWorkingDirectory().get().getAsFile().getAbsolutePath());
 
+        this.mapAttribute(this.debug("core.environmentVariables"), run.getActualEnvironment());
+
         this.writer.writeEndElement();
         this.writer.writeEndDocument();
     }
@@ -129,6 +132,17 @@ private String debug(final String value) {
         return "org.eclipse.debug." + value;
     }
 
+    private void mapAttribute(final String key, final Map<String, String> map) throws XMLStreamException {
+        this.writer.writeStartElement("mapAttribute");
+        this.writer.writeAttribute("key", key);
+        for (final Map.Entry<String, String> entry : map.entrySet()) {
+            this.writer.writeEmptyElement("mapEntry");
+            this.writer.writeAttribute("key", entry.getKey());
+            this.writer.writeAttribute("value", entry.getValue());
+        }
+        this.writer.writeEndElement();
+    }
+
     private void listAttribute(final String key, final List<String> values) throws XMLStreamException {
         this.writer.writeStartElement("listAttribute");
         this.writer.writeAttribute("key", key);

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

@@ -48,7 +48,9 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 import javax.inject.Inject;
@@ -74,6 +76,7 @@ public class RunConfiguration implements Named {
     private final Property<SourceSet> ideaSourceSet;
     private final Property<SourceSet> sourceSet;
     private final Property<JavaLanguageVersion> targetVersion;
+    private Map<String, Object> environment = new HashMap<>();
 
     @Inject
     public RunConfiguration(final String name, final ProjectLayout layout, final ObjectFactory objects, final Project project) {
@@ -148,6 +151,52 @@ public Property<Boolean> getRequiresAssetsAndNatives() {
         return this.requiresAssetsAndNatives;
     }
 
+    public Map<String, String> getActualEnvironment() {
+        final Map<String, String> actual = new HashMap<>();
+        for (Map.Entry<String, Object> entry : this.getEnvironment().entrySet()) {
+            actual.put(entry.getKey(), String.valueOf(entry.getValue()));
+        }
+        return actual;
+    }
+
+    /**
+     * The environment variables to use for the process.
+     *
+     * @return The environment.
+     */
+    @Internal
+    public Map<String, Object> getEnvironment() {
+        return this.environment;
+    }
+
+    /**
+     * Sets the environment variable to use for the process.
+     *
+     * @param environment The environment variables.
+     */
+    public void setEnvironment(Map<String, ?> environment) {
+        this.environment = new HashMap<>(Objects.requireNonNull(environment, "environment"));
+    }
+
+    /**
+     * Adds an environment variable to the environment for this process.
+     *
+     * @param name The name of the variable.
+     * @param value The value for the variable.
+     */
+    public void environment(String name, Object value) {
+        this.getEnvironment().put(Objects.requireNonNull(name, "name"), Objects.requireNonNull(value, "value"));
+    }
+
+    /**
+     * Adds some environment variables to the environment for this process.
+     *
+     * @param environment The environment variables.
+     */
+    public void environment(Map<String, ?> environment) {
+        this.getEnvironment().putAll(Objects.requireNonNull(environment, "environment"));
+    }
+
     /**
      * Get the classpath used to run this game.
      *