diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-04-04 19:30:51 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-04-04 19:30:51 +0800 |
| commit | ad1754a932ef0c6b2134f5d717f6e55f692d85ee (patch) | |
| tree | e46d6f443b4b68698d494dc5de4aec71a0f74bd2 /src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java | |
| parent | 8bf5870c7f2d2cae6efe79ea46230e633db1e9c3 (diff) | |
| parent | 98731532d57d31e3084ef932cce2435d872772c2 (diff) | |
| download | architectury-loom-ad1754a932ef0c6b2134f5d717f6e55f692d85ee.tar.gz architectury-loom-ad1754a932ef0c6b2134f5d717f6e55f692d85ee.tar.bz2 architectury-loom-ad1754a932ef0c6b2134f5d717f6e55f692d85ee.zip | |
Merge remote-tracking branch 'FabricMC/dev/0.7' into dev/0.7-forge
# Conflicts:
# .github/workflows/test-push.yml
# build.gradle
# src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
# src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java
# src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProvider.java
# src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProvider.java
# src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java
# src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java
# src/main/java/net/fabricmc/loom/decompilers/fernflower/AbstractFernFlowerDecompiler.java
# src/main/java/net/fabricmc/loom/decompilers/fernflower/ForkingJavaExec.java
# src/main/java/net/fabricmc/loom/task/RemapJarTask.java
# src/main/java/net/fabricmc/loom/util/GroovyXmlUtil.java
# src/main/java/net/fabricmc/loom/util/HashedDownloadUtil.java
# src/test/groovy/net/fabricmc/loom/BuildUtils.groovy
Diffstat (limited to 'src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java b/src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java index 8bbca4fa..603de2db 100644 --- a/src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java +++ b/src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java @@ -69,6 +69,7 @@ public class RunConfig { public String programArgs; public List<String> vscodeBeforeRun = new ArrayList<>(); public final Map<String, String> envVariables = new HashMap<>(); + public SourceSet sourceSet; public Element genRuns(Element doc) { Element root = this.addXml(doc, "component", ImmutableMap.of("name", "ProjectRunConfigurationManager")); @@ -235,6 +236,7 @@ public class RunConfig { runConfig.ideaModuleName = getIdeaModuleName(project, sourceSet); runConfig.runDirIdeaUrl = "file://$PROJECT_DIR$/" + runDir; runConfig.runDir = runDir; + runConfig.sourceSet = sourceSet; // Custom parameters for (String progArg : settings.getProgramArgs()) { |