From d062055eaf4b8ea6ed82cbddabee571d26dbd436 Mon Sep 17 00:00:00 2001
From: Juuxel <6596629+Juuxel@users.noreply.github.com>
Date: Mon, 27 Jul 2020 20:40:59 +0300
Subject: [PATCH] Inject Forge earlier to remap its SRG names to Yarn

---
 build.gradle                                       |  2 +-
 .../fabricmc/loom/providers/MinecraftProvider.java | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index dbfb2ede..1339cc91 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ if (ENV.BUILD_NUMBER) {
 	build = 'jenkins #${ENV.BUILD_NUMBER}'
 	version = baseVersion + '.' + ENV.BUILD_NUMBER
 } else {
-	version = baseVersion + '-forge.23'
+	version = baseVersion + '-forge.24'
 }
 
 repositories {
diff --git a/src/main/java/net/fabricmc/loom/providers/MinecraftProvider.java b/src/main/java/net/fabricmc/loom/providers/MinecraftProvider.java
index eef3f6f1..2a265c28 100644
--- a/src/main/java/net/fabricmc/loom/providers/MinecraftProvider.java
+++ b/src/main/java/net/fabricmc/loom/providers/MinecraftProvider.java
@@ -133,7 +133,8 @@ public class MinecraftProvider extends DependencyProvider {
 				patchJars(getProject().getLogger());
 			}
 
-			createPatchedJars(getProject().getLogger());
+			injectForgeClasses(getProject().getLogger());
+			remapPatchedJars(getProject().getLogger());
 		}
 
 		if (!minecraftMergedJar.exists() || isRefreshDeps()) {
@@ -258,7 +259,13 @@ public class MinecraftProvider extends DependencyProvider {
 		}
 	}
 
-	private void createPatchedJars(Logger logger) throws IOException {
+	private void injectForgeClasses(Logger logger) throws IOException {
+		logger.lifecycle(":adding forge classes");
+		copyAll(getExtension().getForgeUniversalProvider().getForge(), minecraftClientPatchedSrgJar);
+		copyAll(getExtension().getForgeUniversalProvider().getForge(), minecraftServerPatchedSrgJar);
+	}
+
+	private void remapPatchedJars(Logger logger) throws IOException {
 		logger.lifecycle(":remapping minecraft (Atlas, srg -> official)");
 
 		useAtlas(MappingSet::reverse, atlas -> {
@@ -317,9 +324,6 @@ public class MinecraftProvider extends DependencyProvider {
 		copyNonClassFiles(minecraftClientJar, minecraftMergedJar);
 		copyNonClassFiles(minecraftServerJar, minecraftMergedJar);
 
-		logger.lifecycle(":adding forge classes");
-		copyAll(getExtension().getForgeUniversalProvider().getForge(), minecraftMergedJar);
-
 		/*try (JarMerger jarMerger = new JarMerger(minecraftClientPatchedJar, minecraftServerPatchedJar, minecraftMergedJar)) {
 			jarMerger.enableSyntheticParamsOffset();
 			jarMerger.merge();