Skip to content

Commit e9acbdd

Browse files
authored
Add a param to update multiple source sets when updateMappings (#793)
1 parent ebc1925 commit e9acbdd

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/userdev/java/net/minecraftforge/gradle/userdev/UserDevPlugin.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@
5353
import java.util.ArrayList;
5454
import java.util.Set;
5555
import java.util.concurrent.TimeUnit;
56+
import java.util.stream.Stream;
57+
import java.util.stream.Collectors;
5658

5759
public class UserDevPlugin implements Plugin<Project> {
5860
private static String MINECRAFT = "minecraft";
@@ -181,9 +183,10 @@ public void apply(@Nonnull Project project) {
181183
if (doingUpdate) {
182184
logger.lifecycle("This process uses Srg2Source for java source file renaming. Please forward relevant bug reports to https://github.com/MinecraftForge/Srg2Source/issues.");
183185

186+
final String[] updateSourceSets = project.hasProperty("UPDATE_SOURCESETS") ? ((String) project.property("UPDATE_SOURCESETS")).split(";") : new String[] { "main" };
184187
JavaCompile javaCompile = (JavaCompile) project.getTasks().getByName("compileJava");
185188
JavaPluginConvention javaConv = (JavaPluginConvention) project.getConvention().getPlugins().get("java");
186-
Set<File> srcDirs = javaConv.getSourceSets().getByName("main").getJava().getSrcDirs();
189+
Set<File> srcDirs = Stream.of(updateSourceSets).flatMap(sourceSet -> javaConv.getSourceSets().getByName(sourceSet).getJava().getSrcDirs().stream()).collect(Collectors.toSet());
187190

188191
TaskProvider<DownloadMCPMappingsTask> dlMappingsNew = project.getTasks().register("downloadMappingsNew", DownloadMCPMappingsTask.class);
189192
TaskProvider<TaskExtractRangeMap> extractRangeConfig = project.getTasks().register("extractRangeMap", TaskExtractRangeMap.class);

0 commit comments

Comments
 (0)