Merge remote-tracking branch 'origin/dev/1.12' into exp/1.13

src/main/java/net/fabricmc/loom/api/ModSettings.java

@@ -181,4 +181,10 @@ public abstract class ModSettings implements Named {
 
 		project.apply(Map.of("plugin", LoomCompanionGradlePlugin.NAME));
 	}
+
+	// DO NOT USE THIS!!!
+	// Added back because the Minecraft dev plugin uses it.
+	@ApiStatus.Internal
+	@Deprecated(forRemoval = true)
+	public abstract ListProperty<SourceSetReference> getModSourceSets();
 }

src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of fabric-loom, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2016-2022 FabricMC
+ * Copyright (c) 2016-2025 FabricMC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -407,6 +407,13 @@ public abstract class GenerateSourcesTask extends AbstractLoomTask {
 			sj.add(unpick.getUnpickCacheKey());
 		}
 
+		SourceMappingsService mappingsService = serviceFactory.get(getMappings());
+		String mappingsHash = mappingsService.getProcessorHash();
+
+		if (mappingsHash != null) {
+			sj.add(mappingsHash);
+		}
+
 		getLogger().info("Decompile cache data: {}", sj);
 
 		return Checksum.of(sj.toString()).sha256().hex();

src/main/java/net/fabricmc/loom/task/service/SourceMappingsService.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of fabric-loom, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2024 FabricMC
+ * Copyright (c) 2024-2025 FabricMC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -34,8 +34,12 @@ import java.nio.file.Path;
 
 import org.gradle.api.Project;
 import org.gradle.api.file.ConfigurableFileCollection;
+import org.gradle.api.provider.Property;
 import org.gradle.api.provider.Provider;
+import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.InputFiles;
+import org.gradle.api.tasks.Optional;
+import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -61,17 +65,23 @@ public class SourceMappingsService extends Service<SourceMappingsService.Options
 	public interface Options extends Service.Options {
 		@InputFiles
 		ConfigurableFileCollection getMappings(); // Only a single file
+
+		@Input
+		@Optional
+		Property<String> getProcessorHash(); // the hash of the processors applied to the mappings
 	}
 
 	public static Provider<Options> create(Project project) {
-		final Path mappings = getMappings(project);
+		final Property<String> hash = project.getObjects().property(String.class);
+		final Path mappings = getMappings(project, hash);
 
 		return TYPE.create(project, options -> {
 			options.getMappings().from(project.file(mappings));
+			options.getProcessorHash().set(hash);
 		});
 	}
 
-	private static Path getMappings(Project project) {
+	private static Path getMappings(Project project, Property<String> hashProperty) {
 		final LoomGradleExtension extension = LoomGradleExtension.get(project);
 		final MinecraftJarProcessorManager jarProcessor = MinecraftJarProcessorManager.create(project);
 
@@ -80,8 +90,11 @@ public class SourceMappingsService extends Service<SourceMappingsService.Options
 			return extension.getMappingConfiguration().tinyMappings;
 		}
 
+		final String hash = jarProcessor.getSourceMappingsHash();
+		hashProperty.set(hash);
+
 		final Path dir = extension.getFiles().getProjectPersistentCache().toPath().resolve("source_mappings");
-		final Path path = dir.resolve(jarProcessor.getSourceMappingsHash() + ".tiny");
+		final Path path = dir.resolve(hash + ".tiny");
 
 		if (Files.exists(path) && !extension.refreshDeps()) {
 			LOGGER.debug("Using cached source mappings");
@@ -138,4 +151,8 @@ public class SourceMappingsService extends Service<SourceMappingsService.Options
 	public Path getMappingsFile() {
 		return getOptions().getMappings().getSingleFile().toPath();
 	}
+
+	public @Nullable String getProcessorHash() {
+		return getOptions().getProcessorHash().getOrNull();
+	}
 }