From 9d4b631fda69793f6dbefbf80566d0d7027a3d4f Mon Sep 17 00:00:00 2001
From: Juuxel <6596629+Juuxel@users.noreply.github.com>
Date: Sun, 29 Nov 2020 23:21:41 +0200
Subject: [PATCH] Make Forge mode run LaunchTesting instead of DLI

---
 src/main/java/net/fabricmc/loom/util/RunConfig.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/fabricmc/loom/util/RunConfig.java b/src/main/java/net/fabricmc/loom/util/RunConfig.java
index 74c98e1b..47c2924e 100644
--- a/src/main/java/net/fabricmc/loom/util/RunConfig.java
+++ b/src/main/java/net/fabricmc/loom/util/RunConfig.java
@@ -111,7 +111,9 @@ public class RunConfig {
 		runConfig.runDir = "file://$PROJECT_DIR$/" + extension.runDir;
 		runConfig.vmArgs = "";
 
-		if ("launchwrapper".equals(extension.getLoaderLaunchMethod())) {
+		if (extension.isForge()) {
+			runConfig.mainClass = "net.minecraftforge.userdev.LaunchTesting";
+		} else if ("launchwrapper".equals(extension.getLoaderLaunchMethod())) {
 			runConfig.mainClass = "net.minecraft.launchwrapper.Launch";
 			runConfig.programArgs = "--tweakClass " + ("client".equals(mode) ? Constants.LaunchWrapper.DEFAULT_FABRIC_CLIENT_TWEAKER : Constants.LaunchWrapper.DEFAULT_FABRIC_SERVER_TWEAKER);
 		} else {
@@ -158,6 +160,7 @@ public class RunConfig {
 		populate(project, extension, ideaClient, "client");
 		ideaClient.vmArgs += getOSClientJVMArgs();
 		ideaClient.vmArgs += " -Dfabric.dli.main=" + getMainClass("client", extension);
+		ideaClient.vmArgs += " -DlaunchTarget=fmluserdevclient";
 
 		return ideaClient;
 	}
@@ -169,6 +172,7 @@ public class RunConfig {
 		ideaServer.configName = "Minecraft Server";
 		populate(project, extension, ideaServer, "server");
 		ideaServer.vmArgs += " -Dfabric.dli.main=" + getMainClass("server", extension);
+		ideaServer.vmArgs += " -DlaunchTarget=fmluserdevserver";
 
 		return ideaServer;
 	}