From 0958d98269af29c2f466e6029570b7fc5e37c36c Mon Sep 17 00:00:00 2001
From: Juuxel <6596629+Juuxel@users.noreply.github.com>
Date: Mon, 27 Jul 2020 17:31:49 +0300
Subject: [PATCH] It "works" now, though resources are gone

---
 build.gradle                                         |  2 +-
 .../loom/providers/MinecraftMappedProvider.java      |  5 +++--
 .../fabricmc/loom/providers/MinecraftProvider.java   | 12 +++++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 74da0962..3aab583e 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.6'
+	version = baseVersion + '-forge.8'
 }
 
 repositories {
diff --git a/src/main/java/net/fabricmc/loom/providers/MinecraftMappedProvider.java b/src/main/java/net/fabricmc/loom/providers/MinecraftMappedProvider.java
index ae3ad18c..69525cc0 100644
--- a/src/main/java/net/fabricmc/loom/providers/MinecraftMappedProvider.java
+++ b/src/main/java/net/fabricmc/loom/providers/MinecraftMappedProvider.java
@@ -147,8 +147,9 @@ public class MinecraftMappedProvider extends DependencyProvider {
 
 	public void initFiles(MinecraftProvider minecraftProvider, MappingsProvider mappingsProvider) {
 		this.minecraftProvider = minecraftProvider;
-		minecraftIntermediaryJar = new File(getExtension().getUserCache(), "minecraft-" + getJarVersionString("intermediary") + ".jar");
-		minecraftMappedJar = new File(getJarDirectory(getExtension().getUserCache(), "mapped"), "minecraft-" + getJarVersionString("mapped") + ".jar");
+		PatchProvider patchProvider = getExtension().getPatchProvider();
+		minecraftIntermediaryJar = new File(getExtension().getProjectPersistentCache(), "minecraft-" + getJarVersionString("intermediary") + "-patched-" + patchProvider.forgeVersion + ".jar");
+		minecraftMappedJar = new File(getJarDirectory(getExtension().getProjectPersistentCache(), "mapped"), "minecraft-" + getJarVersionString("mapped") + "-patched-" + patchProvider.forgeVersion + ".jar");
 	}
 
 	protected File getJarDirectory(File parentDirectory, String type) {
diff --git a/src/main/java/net/fabricmc/loom/providers/MinecraftProvider.java b/src/main/java/net/fabricmc/loom/providers/MinecraftProvider.java
index cd9608ae..73493042 100644
--- a/src/main/java/net/fabricmc/loom/providers/MinecraftProvider.java
+++ b/src/main/java/net/fabricmc/loom/providers/MinecraftProvider.java
@@ -224,7 +224,7 @@ public class MinecraftProvider extends DependencyProvider {
 	}
 
 	private void createSrgJars(Logger logger) throws Exception {
-		logger.info(":remapping minecraft: official->srg");
+		logger.lifecycle(":remapping minecraft (MCP, official -> srg)");
 
 		McpConfigProvider volde = getExtension().getMcpConfigProvider();
 		File root = new File(getExtension().getUserCache(), "mcp_root");
@@ -247,7 +247,7 @@ public class MinecraftProvider extends DependencyProvider {
 	}
 
 	private void createPatchedJars(Logger logger) throws IOException {
-		logger.info(":remapping minecraft: srg->official");
+		logger.lifecycle(":remapping minecraft (Atlas, srg -> official)");
 
 		useAtlas(MappingSet::reverse, atlas -> {
 			atlas.run(minecraftClientPatchedSrgJar.toPath(), minecraftClientPatchedJar.toPath());
@@ -274,7 +274,7 @@ public class MinecraftProvider extends DependencyProvider {
 	}
 
 	private void patchJars(Logger logger) throws IOException {
-		logger.info(":patching jars");
+		logger.lifecycle(":patching jars");
 
 		PatchProvider patchProvider = getExtension().getPatchProvider();
 		patchJars(minecraftClientSrgJar, minecraftClientPatchedSrgJar, patchProvider.clientPatches);
@@ -292,10 +292,12 @@ public class MinecraftProvider extends DependencyProvider {
 	private void mergeJars(Logger logger) throws IOException {
 		logger.lifecycle(":merging jars");
 
-		try (JarMerger jarMerger = new JarMerger(minecraftClientPatchedJar, minecraftServerPatchedJar, minecraftMergedJar)) {
+		// FIXME: Hack here: There are no server-only classes so we can just copy the client JAR.
+		Files.copy(minecraftClientPatchedJar, minecraftMergedJar);
+		/*try (JarMerger jarMerger = new JarMerger(minecraftClientPatchedJar, minecraftServerPatchedJar, minecraftMergedJar)) {
 			jarMerger.enableSyntheticParamsOffset();
 			jarMerger.merge();
-		}
+		}*/
 	}
 
 	public File getMergedJar() {