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 remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge

Browse Source
This commit is contained in:
shedaniel
2021-01-30 18:42:42 +08:00
parent 056d46f4d4 6a315be278
commit 32e5297de4
23 changed files with 559 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,6 +43,7 @@ import org.gradle.api.tasks.TaskAction;
import net.fabricmc.loom.LoomGradleExtension;
import net.fabricmc.loom.configuration.ide.RunConfig;
import net.fabricmc.loom.configuration.ide.RunConfigSettings;
// Recommended vscode plugins:
// https://marketplace.visualstudio.com/items?itemName=redhat.java
@@ -94,11 +95,9 @@ public class GenVsCodeProjectTask extends AbstractLoomTask {
launch = new VsCodeLaunch();
}
launch.add(RunConfig.clientRunConfig(project));
launch.add(RunConfig.serverRunConfig(project));
if (extension.isDataGenEnabled()) {
launch.add(RunConfig.dataRunConfig(project));
for (RunConfigSettings settings : extension.getRuns()) {
launch.add(RunConfig.runConfig(project, settings));
settings.makeRunDir();
}
String json = gson.toJson(launch);
@@ -109,12 +108,6 @@ public class GenVsCodeProjectTask extends AbstractLoomTask {
throw new RuntimeException("Failed to write launch.json", e);
}
File runDir = new File(project.getRootDir(), extension.runDir);
if (!runDir.exists()) {
runDir.mkdirs();
}
VsCodeTasks tasks;
if (tasksJson.exists()) {
@@ -181,7 +174,7 @@ public class GenVsCodeProjectTask extends AbstractLoomTask {
public String type = "java";
public String name;
public String request = "launch";
public String cwd = "${workspaceFolder}/run";
public String cwd;
public String console = "internalConsole";
public boolean stopOnEntry = false;
public String mainClass;
@@ -197,6 +190,7 @@ public class GenVsCodeProjectTask extends AbstractLoomTask {
this.mainClass = runConfig.mainClass;
this.vmArgs = runConfig.vmArgs;
this.args = runConfig.programArgs;
this.cwd = "${workspaceFolder}/" + runConfig.runDir;
this.projectName = runConfig.vscodeProjectName;
this.env.putAll(runConfig.envVariables);
this.tasksBeforeRun.addAll(runConfig.vscodeBeforeRun);