From 50c1171d10baba85cf54edd5221ddd0522f1f647 Mon Sep 17 00:00:00 2001
From: Juuz <6596629+Juuxel@users.noreply.github.com>
Date: Mon, 7 Mar 2022 17:46:33 +0200
Subject: [PATCH] Fix part of #72

That was caused by two places resolving the configurations too early
before the mod processing had completed:

1. Forge sources remapper in Loom
2. Architectury plugin's runtime transformer file generation
   (see architectury/architectury-plugin#25)
---
 .../configuration/CompileConfiguration.java   | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
index 496b20cd..f5739760 100644
--- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
+++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
@@ -233,6 +233,19 @@ public final class CompileConfiguration {
 			}
 
 			configureDecompileTasks(project);
+
+			if (extension.isForge()) {
+				// 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.
+				if (!OperatingSystem.isCIBuild()) {
+					try {
+						ForgeSourcesRemapper.addBaseForgeSources(project);
+					} catch (IOException e) {
+						e.printStackTrace();
+					}
+				}
+			}
 		});
 
 		finalizedBy(p, "idea", "genIdeaWorkspace");
@@ -299,15 +312,6 @@ public final class CompileConfiguration {
 			final SrgMinecraftProvider<?> srgMinecraftProvider = jarConfiguration.getSrgMinecraftProviderBiFunction().apply(project, minecraftProvider);
 			extension.setSrgMinecraftProvider(srgMinecraftProvider);
 			srgMinecraftProvider.provide(true);
-
-			// TODO: Find a better place for this?
-			if (!OperatingSystem.isCIBuild()) {
-				try {
-					ForgeSourcesRemapper.addBaseForgeSources(project);
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
 		}
 	}