Rename MinecraftPatchedProvider jar paths on NeoForge

architectury · Oct 31, 2023 · 9aba46e · 9aba46e
1 parent 53f82da
commit 9aba46e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java
@@ -101,6 +101,7 @@ public class MinecraftPatchedProvider {
 	private final MinecraftProvider minecraftProvider;
 	private final Type type;
 
+	// TODO (Neo): Rename all these srg -> "intermediate"
 	// Step 1: Remap Minecraft to SRG, merge if needed
 	private Path minecraftSrgJar;
 	// Step 2: Binary Patch
@@ -141,9 +142,10 @@ private void initPatchedFiles() {
 
 		minecraftProvider.setJarPrefix(patchId);
 
-		minecraftSrgJar = forgeWorkingDir.resolve("minecraft-" + type.id + "-srg.jar");
-		minecraftPatchedSrgJar = forgeWorkingDir.resolve("minecraft-" + type.id + "-srg-patched.jar");
-		minecraftPatchedSrgAtJar = forgeWorkingDir.resolve("minecraft-" + type.id + "-srg-at-patched.jar");
+		final String intermediateId = getExtension().isNeoForge() ? "mojang" : "srg";
+		minecraftSrgJar = forgeWorkingDir.resolve("minecraft-" + type.id + "-" + intermediateId + ".jar");
+		minecraftPatchedSrgJar = forgeWorkingDir.resolve("minecraft-" + type.id + "-" + intermediateId + "-patched.jar");
+		minecraftPatchedSrgAtJar = forgeWorkingDir.resolve("minecraft-" + type.id + "-" + intermediateId + "-at-patched.jar");
 		minecraftPatchedJar = forgeWorkingDir.resolve("minecraft-" + type.id + "-patched.jar");
 		minecraftClientExtra = forgeWorkingDir.resolve("client-extra.jar");
 	}