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

Fix split env overriding custom run config sourcesets.

Browse Source
This commit is contained in:
modmuss50
2022-05-19 01:24:58 +01:00
parent 997f9a8acd
commit c46100c76e
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/net/fabricmc/loom/configuration/ide/RunConfigSettings.java
View File

@@ -38,6 +38,7 @@ import org.gradle.api.plugins.JavaPluginExtension;
import org.gradle.api.tasks.SourceSet;
import net.fabricmc.loom.LoomGradleExtension;
import net.fabricmc.loom.configuration.providers.minecraft.MinecraftSourceSets;
import net.fabricmc.loom.util.Constants;
import net.fabricmc.loom.util.OperatingSystem;
@@ -103,7 +104,11 @@ public final class RunConfigSettings implements Named {
this.extension = LoomGradleExtension.get(project);
this.ideConfigGenerated = extension.isRootProject();
source("main");
setSource(p -> {
final String sourceSetName = MinecraftSourceSets.get(p).getSourceSetForEnv(getEnvironment());
return p.getExtensions().getByType(JavaPluginExtension.class).getSourceSets().getByName(sourceSetName);
});
runDir("run");
}

12
src/main/java/net/fabricmc/loom/task/LoomTasks.java
View File

@@ -34,7 +34,6 @@ import org.gradle.api.tasks.TaskProvider;
import net.fabricmc.loom.LoomGradleExtension;
import net.fabricmc.loom.configuration.ide.RunConfigSettings;
import net.fabricmc.loom.configuration.providers.minecraft.MinecraftJarConfiguration;
import net.fabricmc.loom.configuration.providers.minecraft.MinecraftSourceSets;
import net.fabricmc.loom.task.launch.GenerateDLIConfigTask;
import net.fabricmc.loom.task.launch.GenerateLog4jConfigTask;
import net.fabricmc.loom.task.launch.GenerateRemapClasspathTask;
@@ -156,17 +155,6 @@ public final class LoomTasks {
extension.getRunConfigs().removeIf(settings -> settings.getName().equals(taskName));
});
// Configure the run config source sets.
project.afterEvaluate(p -> {
if (!extension.areEnvironmentSourceSetsSplit()) {
return;
}
extension.getRunConfigs().configureEach(settings ->
settings.source(MinecraftSourceSets.get(project).getSourceSetForEnv(settings.getEnvironment()))
);
});
}
public static Provider<Task> getIDELaunchConfigureTaskName(Project project) {