imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-02 21:47:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge with Fabric 0.13, stage 4

Browse Source
This commit is contained in:
Juuz
2022-08-09 17:30:54 +03:00
parent 58f2f9445e 14b24b7e2b
commit 42bf456302
6 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java
View File

@@ -30,6 +30,7 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -187,10 +188,10 @@ public class GenVsCodeProjectTask extends AbstractLoomTask {
public String mainClass;
public String vmArgs;
public String args;
public Map<String, String> env = new LinkedHashMap<>();
public Map<String, Object> env;
public String projectName;
public transient List<String> tasksBeforeRun = new ArrayList<>();
public String preLaunchTask = null;
public String projectName = null;
VsCodeConfiguration(Project project, RunConfig runConfig) {
this.name = runConfig.configName;
@@ -198,8 +199,8 @@ public class GenVsCodeProjectTask extends AbstractLoomTask {
this.vmArgs = RunConfig.joinArguments(runConfig.vmArgs);
this.args = RunConfig.joinArguments(runConfig.programArgs);
this.cwd = "${workspaceFolder}/" + runConfig.runDir;
this.projectName = runConfig.vscodeProjectName;
this.env.putAll(runConfig.envVariables);
this.env = new HashMap<>(runConfig.environmentVariables);
this.projectName = runConfig.projectName;
this.tasksBeforeRun.addAll(runConfig.vscodeBeforeRun);
if (project.getRootProject() != project) {