From 2af551366b3f657a7509d1c1723810f641eab6dc Mon Sep 17 00:00:00 2001
From: Juuxel <6596629+Juuxel@users.noreply.github.com>
Date: Mon, 27 Jul 2020 21:55:55 +0300
Subject: [PATCH] Add Forge dependencies to projects

---
 build.gradle                                                  | 2 +-
 src/main/java/net/fabricmc/loom/providers/ForgeProvider.java  | 4 ++++
 .../java/net/fabricmc/loom/providers/MinecraftProvider.java   | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1339cc91..93311882 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.24'
+	version = baseVersion + '-forge.27'
 }
 
 repositories {
diff --git a/src/main/java/net/fabricmc/loom/providers/ForgeProvider.java b/src/main/java/net/fabricmc/loom/providers/ForgeProvider.java
index f7baa613..8849d148 100644
--- a/src/main/java/net/fabricmc/loom/providers/ForgeProvider.java
+++ b/src/main/java/net/fabricmc/loom/providers/ForgeProvider.java
@@ -39,7 +39,11 @@ public class ForgeProvider extends DependencyProvider {
 	@Override
 	public void provide(DependencyInfo dependency, Consumer<Runnable> postPopulationScheduler) throws Exception {
 		addDependency(dependency.getDepString() + ":universal", Constants.FORGE_UNIVERSAL);
+		addDependency(dependency.getDepString() + ":launcher", Constants.MINECRAFT_DEPENDENCIES);
 		addDependency(dependency.getDepString() + ":installer", Constants.FORGE_INSTALLER);
+
+		addDependency("net.minecraftforge:eventbus:3.0.2", Constants.MINECRAFT_DEPENDENCIES);
+		addDependency("net.minecraftforge:forgespi:3.0.0", Constants.MINECRAFT_DEPENDENCIES);
 	}
 
 	@Override
diff --git a/src/main/java/net/fabricmc/loom/providers/MinecraftProvider.java b/src/main/java/net/fabricmc/loom/providers/MinecraftProvider.java
index 2a265c28..b217bccb 100644
--- a/src/main/java/net/fabricmc/loom/providers/MinecraftProvider.java
+++ b/src/main/java/net/fabricmc/loom/providers/MinecraftProvider.java
@@ -131,9 +131,9 @@ public class MinecraftProvider extends DependencyProvider {
 
 			if (!minecraftClientPatchedSrgJar.exists() || !minecraftServerPatchedSrgJar.exists()) {
 				patchJars(getProject().getLogger());
+				injectForgeClasses(getProject().getLogger());
 			}
 
-			injectForgeClasses(getProject().getLogger());
 			remapPatchedJars(getProject().getLogger());
 		}
 
@@ -260,7 +260,7 @@ public class MinecraftProvider extends DependencyProvider {
 	}
 
 	private void injectForgeClasses(Logger logger) throws IOException {
-		logger.lifecycle(":adding forge classes");
+		logger.lifecycle(":injecting forge classes into minecraft");
 		copyAll(getExtension().getForgeUniversalProvider().getForge(), minecraftClientPatchedSrgJar);
 		copyAll(getExtension().getForgeUniversalProvider().getForge(), minecraftServerPatchedSrgJar);
 	}