From ab01d8c989e61327748d119177184d40c48d31bf Mon Sep 17 00:00:00 2001
From: Juuxel <6596629+Juuxel@users.noreply.github.com>
Date: Mon, 27 Jul 2020 23:40:24 +0300
Subject: [PATCH] Force project-based file storage

---
 src/main/java/net/fabricmc/loom/LoomGradleExtension.java   | 4 ++++
 .../java/net/fabricmc/loom/providers/MappingsProvider.java | 2 +-
 .../fabricmc/loom/providers/MinecraftMappedProvider.java   | 7 +++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java
index 32ae2143..064065d5 100644
--- a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java
+++ b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java
@@ -392,4 +392,8 @@ public class LoomGradleExtension {
 	public boolean isShareCaches() {
 		return shareCaches;
 	}
+
+	public boolean isProjectBasedJarStorageForced() {
+		return true;
+	}
 }
diff --git a/src/main/java/net/fabricmc/loom/providers/MappingsProvider.java b/src/main/java/net/fabricmc/loom/providers/MappingsProvider.java
index f0eb7688..140c72a2 100644
--- a/src/main/java/net/fabricmc/loom/providers/MappingsProvider.java
+++ b/src/main/java/net/fabricmc/loom/providers/MappingsProvider.java
@@ -143,7 +143,7 @@ public class MappingsProvider extends DependencyProvider {
 		JarProcessorManager processorManager = new JarProcessorManager(getProject());
 		getExtension().setJarProcessorManager(processorManager);
 
-		if (processorManager.active()) {
+		if (processorManager.active() || getExtension().isProjectBasedJarStorageForced()) {
 			mappedProvider = new MinecraftProcessedProvider(getProject(), processorManager);
 			getProject().getLogger().lifecycle("Using project based jar storage");
 		} else {
diff --git a/src/main/java/net/fabricmc/loom/providers/MinecraftMappedProvider.java b/src/main/java/net/fabricmc/loom/providers/MinecraftMappedProvider.java
index 69525cc0..be494082 100644
--- a/src/main/java/net/fabricmc/loom/providers/MinecraftMappedProvider.java
+++ b/src/main/java/net/fabricmc/loom/providers/MinecraftMappedProvider.java
@@ -147,9 +147,8 @@ public class MinecraftMappedProvider extends DependencyProvider {
 
 	public void initFiles(MinecraftProvider minecraftProvider, MappingsProvider mappingsProvider) {
 		this.minecraftProvider = minecraftProvider;
-		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");
+		minecraftIntermediaryJar = new File(getExtension().getProjectPersistentCache(), "minecraft-" + getJarVersionString("intermediary") + ".jar");
+		minecraftMappedJar = new File(getJarDirectory(getExtension().getProjectPersistentCache(), "mapped"), "minecraft-" + getJarVersionString("mapped") + ".jar");
 	}
 
 	protected File getJarDirectory(File parentDirectory, String type) {
@@ -157,7 +156,7 @@ public class MinecraftMappedProvider extends DependencyProvider {
 	}
 
 	protected String getJarVersionString(String type) {
-		return String.format("%s-%s-%s-%s", minecraftProvider.getMinecraftVersion(), type, getExtension().getMappingsProvider().mappingsName, getExtension().getMappingsProvider().mappingsVersion);
+		return String.format("%s-%s-%s-%s-patched-%s", minecraftProvider.getMinecraftVersion(), type, getExtension().getMappingsProvider().mappingsName, getExtension().getMappingsProvider().mappingsVersion, getExtension().getPatchProvider().forgeVersion);
 	}
 
 	public Collection<File> getMapperPaths() {