From 9784c5491ec71e96f5c1e973d4e0aa9fdad76549 Mon Sep 17 00:00:00 2001
From: Juuz <6596629+Juuxel@users.noreply.github.com>
Date: Sun, 23 Apr 2023 12:32:09 +0300
Subject: [PATCH] Add back more missing code

---
 .../fabricmc/loom/configuration/CompileConfiguration.java  | 6 ++++++
 .../fabricmc/loom/configuration/LoomConfigurations.java    | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
index ba3ba76d..7a8bfa91 100644
--- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
+++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
@@ -132,6 +132,12 @@ public abstract class CompileConfiguration implements Runnable {
 			configureDecompileTasks(configContext);
 
 			if (extension.isForge()) {
+				if (extension.isDataGenEnabled()) {
+					getProject().getExtensions().getByType(JavaPluginExtension.class).getSourceSets().getByName("main").resources(files -> {
+						files.srcDir(getProject().file("src/generated/resources"));
+					});
+				}
+
 				// TODO: Find a better place for this?
 				//   This has to be after dependencyManager.handleDependencies() above
 				//   because of https://github.com/architectury/architectury-loom/issues/72.
diff --git a/src/main/java/net/fabricmc/loom/configuration/LoomConfigurations.java b/src/main/java/net/fabricmc/loom/configuration/LoomConfigurations.java
index f8afb01f..e545c6ad 100644
--- a/src/main/java/net/fabricmc/loom/configuration/LoomConfigurations.java
+++ b/src/main/java/net/fabricmc/loom/configuration/LoomConfigurations.java
@@ -36,6 +36,7 @@ import org.gradle.api.plugins.JavaPlugin;
 
 import net.fabricmc.loom.LoomGradleExtension;
 import net.fabricmc.loom.util.Constants;
+import net.fabricmc.loom.util.gradle.GradleUtils;
 import net.fabricmc.loom.util.gradle.SourceSetHelper;
 
 public abstract class LoomConfigurations implements Runnable {
@@ -110,6 +111,12 @@ public abstract class LoomConfigurations implements Runnable {
 		getDependencies().add(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME, Constants.Dependencies.JETBRAINS_ANNOTATIONS + Constants.Dependencies.Versions.JETBRAINS_ANNOTATIONS);
 		getDependencies().add(JavaPlugin.TEST_COMPILE_ONLY_CONFIGURATION_NAME, Constants.Dependencies.JETBRAINS_ANNOTATIONS + Constants.Dependencies.Versions.JETBRAINS_ANNOTATIONS);
 
+		GradleUtils.afterSuccessfulEvaluation(getProject(), () -> {
+			if (extension.shouldGenerateSrgTiny()) {
+				registerNonTransitive(Constants.Configurations.SRG, Type.RESOLVABLE);
+			}
+		});
+
 		if (extension.isForge()) {
 			// Set up Forge configurations
 			registerNonTransitive(Constants.Configurations.FORGE, Type.RESOLVABLE);