Update more generated system properties for Quilt Loader

architectury · Oct 20, 2023 · b6354a0 · b6354a0
1 parent 54f252f
commit b6354a0
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java b/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java
@@ -60,9 +60,10 @@ public void run() throws IOException {
 			assetsDirectory = new File(assetsDirectory, "/legacy/" + versionInfo.id());
 		}
 
+		boolean quilt = getExtension().isQuilt();
 		final LaunchConfig launchConfig = new LaunchConfig()
-				.property(!getExtension().isQuilt() ? "fabric.development" : "loader.development", "true")
-				.property(!getExtension().isQuilt() ? "fabric.remapClasspathFile" : "loader.remapClasspathFile", getExtension().getFiles().getRemapClasspathFile().getAbsolutePath())
+				.property(!quilt ? "fabric.development" : "loader.development", "true")
+				.property(!quilt ? "fabric.remapClasspathFile" : "loader.remapClasspathFile", getExtension().getFiles().getRemapClasspathFile().getAbsolutePath())
 				.property("log4j.configurationFile", getAllLog4JConfigFiles())
 				.property("log4j2.formatMsgNoLookups", "true");
 
@@ -82,12 +83,12 @@ public void run() throws IOException {
 					.argument("client", assetsDirectory.getAbsolutePath());
 
 			if (getExtension().areEnvironmentSourceSetsSplit()) {
-				launchConfig.property("client", "fabric.gameJarPath.client", getGameJarPath("client"));
-				launchConfig.property("fabric.gameJarPath", getGameJarPath("common"));
+				launchConfig.property("client", !quilt ? "fabric.gameJarPath.client" : "loader.gameJarPath.client", getGameJarPath("client"));
+				launchConfig.property(!quilt ? "fabric.gameJarPath" : "loader.gameJarPath", getGameJarPath("common"));
 			}
 
 			if (!getExtension().getMods().isEmpty()) {
-				launchConfig.property("fabric.classPathGroups", getClassPathGroups());
+				launchConfig.property(!quilt ? "fabric.classPathGroups" : "loader.classPathGroups", getClassPathGroups());
 			}
 		}