Fix client data gen not depending on main when using split sources

FabricMC · Dec 2, 2024 · 1dd203a · 1dd203a
1 parent 1d0946f
commit 1dd203a
Showing 1 changed file with 20 additions and 13 deletions.
diff --git a/src/main/java/net/fabricmc/loom/configuration/FabricApiExtension.java b/src/main/java/net/fabricmc/loom/configuration/FabricApiExtension.java
@@ -142,24 +142,16 @@ public void configureDataGeneration(Action<DataGenerationSettings> action) {
 
 		if (settings.getCreateSourceSet().get()) {
 			final boolean isClientAndSplit = extension.areEnvironmentSourceSetsSplit() && settings.getClient().get();
-			final SourceSet targetSourceSet = isClientAndSplit ? SourceSetHelper.getSourceSetByName(MinecraftSourceSets.Split.CLIENT_ONLY_SOURCE_SET_NAME, getProject()) : mainSourceSet;
 
 			SourceSetContainer sourceSets = SourceSetHelper.getSourceSets(getProject());
 
 			// Create the new datagen sourceset, depend on the main or client sourceset.
 			SourceSet dataGenSourceSet = sourceSets.create(DATAGEN_SOURCESET_NAME, sourceSet -> {
-				sourceSet.setCompileClasspath(
-							sourceSet.getCompileClasspath()
-								.plus(targetSourceSet.getOutput())
-				);
-
-				sourceSet.setRuntimeClasspath(
-							sourceSet.getRuntimeClasspath()
-									.plus(targetSourceSet.getOutput())
-				);
-
-				extendsFrom(getProject(), sourceSet.getCompileClasspathConfigurationName(), targetSourceSet.getCompileClasspathConfigurationName());
-				extendsFrom(getProject(), sourceSet.getRuntimeClasspathConfigurationName(), targetSourceSet.getRuntimeClasspathConfigurationName());
+				dependsOn(sourceSet, mainSourceSet);
+
+				if (isClientAndSplit) {
+					dependsOn(sourceSet, SourceSetHelper.getSourceSetByName(MinecraftSourceSets.Split.CLIENT_ONLY_SOURCE_SET_NAME, getProject()));
+				}
 			});
 
 			settings.getModId().convention(getProject().provider(() -> {
@@ -341,4 +333,19 @@ private static void extendsFrom(Project project, String name, String extendsFrom
 			configuration.extendsFrom(configurations.getByName(extendsFrom));
 		});
 	}
+
+	private void dependsOn(SourceSet sourceSet, SourceSet other) {
+		sourceSet.setCompileClasspath(
+				sourceSet.getCompileClasspath()
+						.plus(other.getOutput())
+		);
+
+		sourceSet.setRuntimeClasspath(
+				sourceSet.getRuntimeClasspath()
+						.plus(other.getOutput())
+		);
+
+		extendsFrom(getProject(), sourceSet.getCompileClasspathConfigurationName(), other.getCompileClasspathConfigurationName());
+		extendsFrom(getProject(), sourceSet.getRuntimeClasspathConfigurationName(), other.getRuntimeClasspathConfigurationName());
+	}
 }