Extract patching logic to MinecraftPatchedProvider

4 files changed, 331 insertions, 262 deletions

diff --git a/src/main/java/net/fabricmc/loom/providers/MappingsProvider.java b/src/main/java/net/fabricmc/loom/providers/MappingsProvider.java
index f31e609f..3b1b4e4b 100644
--- a/src/main/java/net/fabricmc/loom/providers/MappingsProvider.java
+++ b/src/main/java/net/fabricmc/loom/providers/MappingsProvider.java
@@ -63,6 +63,7 @@ import net.fabricmc.stitch.commands.tinyv2.CommandReorderTinyV2;
 
 public class MappingsProvider extends DependencyProvider {
 	public MinecraftMappedProvider mappedProvider;
+	public MinecraftPatchedProvider patchedProvider;
 
 	public String mappingsName;
 	public String minecraftVersion;
@@ -172,6 +173,11 @@ public class MappingsProvider extends DependencyProvider {
 		extension.setJarProcessorManager(processorManager);
 		processorManager.setupProcessors();
 
+		if (extension.isForge()) {
+			patchedProvider = new MinecraftPatchedProvider(getProject());
+			patchedProvider.provide(dependency, postPopulationScheduler);
+		}
+
 		if (processorManager.active()) {
 			mappedProvider = new MinecraftProcessedProvider(getProject(), processorManager);
 			getProject().getLogger().lifecycle("Using project based jar storage");
diff --git a/src/main/java/net/fabricmc/loom/providers/MinecraftMappedProvider.java b/src/main/java/net/fabricmc/loom/providers/MinecraftMappedProvider.java
index b9484639..ac3099cf 100644
--- a/src/main/java/net/fabricmc/loom/providers/MinecraftMappedProvider.java
+++ b/src/main/java/net/fabricmc/loom/providers/MinecraftMappedProvider.java
@@ -61,6 +61,7 @@ public class MinecraftMappedProvider extends DependencyProvider {
 			.put("javax/annotation/concurrent/Immutable", "org/jetbrains/annotations/Unmodifiable")
 			.build();
 
+	private File inputJar;
 	private File minecraftMappedJar;
 	private File minecraftIntermediaryJar;
 
@@ -76,7 +77,7 @@ public class MinecraftMappedProvider extends DependencyProvider {
 			throw new RuntimeException("mappings file not found");
 		}
 
-		if (!getExtension().getMinecraftProvider().getMergedJar().exists()) {
+		if (!inputJar.exists()) {
 			throw new RuntimeException("input merged jar not found");
 		}
 
@@ -114,7 +115,7 @@ public class MinecraftMappedProvider extends DependencyProvider {
 
 		MappingsProvider mappingsProvider = getExtension().getMappingsProvider();
 
-		Path input = minecraftProvider.getMergedJar().toPath();
+		Path input = inputJar.toPath();
 		Path outputMapped = minecraftMappedJar.toPath();
 		Path outputIntermediary = minecraftIntermediaryJar.toPath();
 
@@ -207,6 +208,7 @@ public class MinecraftMappedProvider extends DependencyProvider {
 		this.minecraftProvider = minecraftProvider;
 		minecraftIntermediaryJar = new File(getExtension().getUserCache(), "minecraft-" + getJarVersionString("intermediary") + ".jar");
 		minecraftMappedJar = new File(getJarDirectory(getExtension().getUserCache(), "mapped"), "minecraft-" + getJarVersionString("mapped") + ".jar");
+		inputJar = getExtension().isForge() ? mappingsProvider.patchedProvider.getMergedJar() : minecraftProvider.getMergedJar();
 	}
 
 	protected File getJarDirectory(File parentDirectory, String type) {
diff --git a/src/main/java/net/fabricmc/loom/providers/MinecraftPatchedProvider.java b/src/main/java/net/fabricmc/loom/providers/MinecraftPatchedProvider.java
new file mode 100644
index 00000000..dc394415
--- /dev/null
+++ b/src/main/java/net/fabricmc/loom/providers/MinecraftPatchedProvider.java
@@ -0,0 +1,310 @@
+/*
+ * This file is part of fabric-loom, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) 2016, 2017, 2018 FabricMC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package net.fabricmc.loom.providers;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import java.io.UncheckedIOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.util.Collections;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.function.UnaryOperator;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.io.Files;
+import net.minecraftforge.accesstransformer.TransformerProcessor;
+import net.minecraftforge.binarypatcher.ConsoleTool;
+import net.minecraftforge.gradle.mcp.util.MCPRuntime;
+import net.minecraftforge.gradle.mcp.util.MCPWrapper;
+import org.apache.commons.io.FileUtils;
+import org.cadixdev.atlas.Atlas;
+import org.cadixdev.bombe.asm.jar.JarEntryRemappingTransformer;
+import org.cadixdev.lorenz.MappingSet;
+import org.cadixdev.lorenz.asm.LorenzRemapper;
+import org.cadixdev.lorenz.io.srg.tsrg.TSrgReader;
+import org.gradle.api.Project;
+import org.gradle.api.logging.Logger;
+
+import net.fabricmc.loom.util.Constants;
+import net.fabricmc.loom.util.DependencyProvider;
+import net.fabricmc.loom.util.JarUtil;
+import net.fabricmc.loom.util.function.FsPathConsumer;
+import net.fabricmc.loom.util.function.IoConsumer;
+
+public class MinecraftPatchedProvider extends DependencyProvider {
+	private File minecraftClientSrgJar;
+	private File minecraftServerSrgJar;
+	private File minecraftClientPatchedSrgJar;
+	private File minecraftServerPatchedSrgJar;
+	private File minecraftClientPatchedJar;
+	private File minecraftServerPatchedJar;
+	private File minecraftMergedPatchedJar;
+
+	public MinecraftPatchedProvider(Project project) {
+		super(project);
+	}
+
+	@Override
+	public void provide(DependencyInfo dependency, Consumer<Runnable> postPopulationScheduler) throws Exception {
+		initFiles();
+
+		if (!minecraftClientPatchedJar.exists() || !minecraftServerPatchedJar.exists()) {
+			if (!minecraftClientSrgJar.exists() || !minecraftServerSrgJar.exists()) {
+				createSrgJars(getProject().getLogger());
+			}
+
+			if (!minecraftClientPatchedSrgJar.exists() || !minecraftServerPatchedSrgJar.exists()) {
+				patchJars(getProject().getLogger());
+				injectForgeClasses(getProject().getLogger());
+			}
+
+			remapPatchedJars(getProject().getLogger());
+		}
+
+		if (!minecraftMergedPatchedJar.exists()) {
+			mergeJars(getProject().getLogger());
+		}
+	}
+
+	private void initFiles() {
+		MinecraftProvider minecraftProvider = getExtension().getMinecraftProvider();
+		PatchProvider patchProvider = getExtension().getPatchProvider();
+		String minecraftVersion = minecraftProvider.getMinecraftVersion();
+		String jarSuffix = "-patched-forge-" + patchProvider.forgeVersion;
+		minecraftProvider.setJarSuffix(jarSuffix);
+
+		minecraftClientPatchedJar = new File(getExtension().getUserCache(), "minecraft-" + minecraftVersion + "-client" + jarSuffix + ".jar");
+		minecraftServerPatchedJar = new File(getExtension().getUserCache(), "minecraft-" + minecraftVersion + "-server" + jarSuffix + ".jar");
+		minecraftClientSrgJar = new File(getExtension().getUserCache(), "minecraft-" + minecraftVersion + "-client-srg.jar");
+		minecraftServerSrgJar = new File(getExtension().getUserCache(), "minecraft-" + minecraftVersion + "-server-srg.jar");
+		minecraftClientPatchedSrgJar = new File(getExtension().getUserCache(), "minecraft-" + minecraftVersion + "-client-srg" + jarSuffix + ".jar");
+		minecraftServerPatchedSrgJar = new File(getExtension().getUserCache(), "minecraft-" + minecraftVersion + "-server-srg" + jarSuffix + ".jar");
+		minecraftMergedPatchedJar = new File(getExtension().getUserCache(), "minecraft-" + minecraftVersion + "-merged" + jarSuffix + ".jar");
+	}
+
+	private void createSrgJars(Logger logger) throws Exception {
+		logger.lifecycle(":remapping minecraft (MCP, official -> srg)");
+
+		McpConfigProvider volde = getExtension().getMcpConfigProvider();
+		File root = new File(getExtension().getUserCache(), "mcp_root");
+		root.mkdirs();
+		MCPWrapper wrapper = new MCPWrapper(volde.getMcp(), root);
+
+		// Client
+		{
+			MCPRuntime runtime = wrapper.getRuntime(getProject(), "client");
+			File output = runtime.execute(logger, "rename");
+			Files.copy(output, minecraftClientSrgJar);
+		}
+
+		// Server
+		{
+			MCPRuntime runtime = wrapper.getRuntime(getProject(), "server");
+			File output = runtime.execute(logger, "rename");
+			Files.copy(output, minecraftServerSrgJar);
+		}
+	}
+
+	private void injectForgeClasses(Logger logger) throws IOException {
+		logger.lifecycle(":injecting forge classes into minecraft");
+		copyAll(getExtension().getForgeUniversalProvider().getForge(), minecraftClientPatchedSrgJar);
+		copyAll(getExtension().getForgeUniversalProvider().getForge(), minecraftServerPatchedSrgJar);
+
+		copyUserdevFiles(getExtension().getForgeUserdevProvider().getUserdevJar(), minecraftClientPatchedSrgJar);
+		copyUserdevFiles(getExtension().getForgeUserdevProvider().getUserdevJar(), minecraftServerPatchedSrgJar);
+
+		logger.lifecycle(":injecting loom classes into minecraft");
+		File injection = File.createTempFile("loom-injection", ".jar");
+
+		try (InputStream in = MinecraftProvider.class.getResourceAsStream("/inject/injection.jar")) {
+			FileUtils.copyInputStreamToFile(in, injection);
+		}
+
+		walkFileSystems(injection, minecraftClientPatchedSrgJar, it -> !it.getFileName().toString().equals("MANIFEST.MF"), this::copyReplacing);
+		walkFileSystems(injection, minecraftServerPatchedSrgJar, it -> !it.getFileName().toString().equals("MANIFEST.MF"), this::copyReplacing);
+
+		logger.lifecycle(":access transforming");
+		File clientAtJar = File.createTempFile("atclient", ".jar");
+		File serverAtJar = File.createTempFile("atserver", ".jar");
+		File clientAt = File.createTempFile("atclient", ".cfg");
+		File serverAt = File.createTempFile("atserver", ".cfg");
+		Files.copy(minecraftClientPatchedSrgJar, clientAtJar);
+		Files.copy(minecraftServerPatchedSrgJar, serverAtJar);
+		JarUtil.extractFile(clientAtJar, "META-INF/accesstransformer.cfg", clientAt);
+		JarUtil.extractFile(serverAtJar, "META-INF/accesstransformer.cfg", serverAt);
+		TransformerProcessor.main("--inJar", clientAtJar.getAbsolutePath(), "--outJar", minecraftClientPatchedSrgJar.getAbsolutePath(), "--atFile", clientAt.getAbsolutePath());
+		TransformerProcessor.main("--inJar", serverAtJar.getAbsolutePath(), "--outJar", minecraftServerPatchedSrgJar.getAbsolutePath(), "--atFile", serverAt.getAbsolutePath());
+	}
+
+	private void remapPatchedJars(Logger logger) throws IOException {
+		logger.lifecycle(":remapping minecraft (Atlas, srg -> official)");
+
+		useAtlas(MappingSet::reverse, atlas -> {
+			atlas.run(minecraftClientPatchedSrgJar.toPath(), minecraftClientPatchedJar.toPath());
+			atlas.run(minecraftServerPatchedSrgJar.toPath(), minecraftServerPatchedJar.toPath());
+		});
+	}
+
+	private void useAtlas(UnaryOperator<MappingSet> mappingOp, IoConsumer<Atlas> action) throws IOException {
+		try (Reader mappingReader = new FileReader(getExtension().getMcpConfigProvider().getSrg());
+				TSrgReader reader = new TSrgReader(mappingReader);
+				Atlas atlas = new Atlas()) {
+			MappingSet mappings = mappingOp.apply(reader.read());
+
+			atlas.install(ctx -> new JarEntryRemappingTransformer(
+					new LorenzRemapper(mappings, ctx.inheritanceProvider())
+			));
+
+			for (File library : getExtension().getMinecraftProvider().getLibraryProvider().getLibraries()) {
+				atlas.use(library.toPath());
+			}
+
+			action.accept(atlas);
+		}
+	}
+
+	private void patchJars(Logger logger) throws IOException {
+		logger.lifecycle(":patching jars");
+
+		PatchProvider patchProvider = getExtension().getPatchProvider();
+		patchJars(minecraftClientSrgJar, minecraftClientPatchedSrgJar, patchProvider.clientPatches);
+		patchJars(minecraftServerSrgJar, minecraftServerPatchedSrgJar, patchProvider.serverPatches);
+
+		logger.lifecycle(":copying missing classes into patched jars");
+		copyMissingClasses(minecraftClientSrgJar, minecraftClientPatchedSrgJar);
+		copyMissingClasses(minecraftServerSrgJar, minecraftServerPatchedSrgJar);
+	}
+
+	private void patchJars(File clean, File output, Path patches) throws IOException {
+		ConsoleTool.main(new String[]{
+				"--clean", clean.getAbsolutePath(),
+				"--output", output.getAbsolutePath(),
+				"--apply", patches.toAbsolutePath().toString()
+		});
+	}
+
+	private void mergeJars(Logger logger) throws IOException {
+		// FIXME: Hack here: There are no server-only classes so we can just copy the client JAR.
+		Files.copy(minecraftClientPatchedJar, minecraftMergedPatchedJar);
+
+		logger.lifecycle(":copying resources");
+
+		// Copy resources
+		MinecraftProvider minecraftProvider = getExtension().getMinecraftProvider();
+		copyNonClassFiles(minecraftProvider.minecraftClientJar, minecraftMergedPatchedJar);
+		copyNonClassFiles(minecraftProvider.minecraftServerJar, minecraftMergedPatchedJar);
+	}
+
+	private void walkFileSystems(File source, File target, Predicate<Path> filter, Function<FileSystem, Iterable<Path>> toWalk, FsPathConsumer action) throws IOException {
+		try (FileSystem sourceFs = FileSystems.newFileSystem(new URI("jar:" + source.toURI()), ImmutableMap.of("create", false));
+				FileSystem targetFs = FileSystems.newFileSystem(new URI("jar:" + target.toURI()), ImmutableMap.of("create", false))) {
+			for (Path sourceDir : toWalk.apply(sourceFs)) {
+				Path dir = sourceDir.toAbsolutePath();
+				java.nio.file.Files.walk(dir)
+						.filter(java.nio.file.Files::isRegularFile)
+						.filter(filter)
+						.forEach(it -> {
+							boolean root = dir.getParent() == null;
+
+							try {
+								Path relativeSource = root ? it : dir.relativize(it);
+								Path targetPath = targetFs.getPath(relativeSource.toString());
+								action.accept(sourceFs, targetFs, it, targetPath);
+							} catch (IOException e) {
+								throw new UncheckedIOException(e);
+							}
+						});
+			}
+		} catch (URISyntaxException e) {
+			throw new IOException(e);
+		}
+	}
+
+	private void walkFileSystems(File source, File target, Predicate<Path> filter, FsPathConsumer action) throws IOException {
+		walkFileSystems(source, target, filter, FileSystem::getRootDirectories, action);
+	}
+
+	private void copyAll(File source, File target) throws IOException {
+		walkFileSystems(source, target, it -> true, this::copyReplacing);
+	}
+
+	private void copyMissingClasses(File source, File target) throws IOException {
+		walkFileSystems(source, target, it -> it.toString().endsWith(".class"), (sourceFs, targetFs, sourcePath, targetPath) -> {
+			if (java.nio.file.Files.exists(targetPath)) return;
+			Path parent = targetPath.getParent();
+
+			if (parent != null) {
+				java.nio.file.Files.createDirectories(parent);
+			}
+
+			java.nio.file.Files.copy(sourcePath, targetPath);
+		});
+	}
+
+	private void copyNonClassFiles(File source, File target) throws IOException {
+		walkFileSystems(source, target, it -> !it.toString().endsWith(".class"), this::copyReplacing);
+	}
+
+	private void copyReplacing(FileSystem sourceFs, FileSystem targetFs, Path sourcePath, Path targetPath) throws IOException {
+		Path parent = targetPath.getParent();
+
+		if (parent != null) {
+			java.nio.file.Files.createDirectories(parent);
+		}
+
+		java.nio.file.Files.copy(sourcePath, targetPath, StandardCopyOption.REPLACE_EXISTING);
+	}
+
+	private void copyUserdevFiles(File source, File target) throws IOException {
+		walkFileSystems(source, target, file -> true, fs -> Collections.singleton(fs.getPath("inject")), (sourceFs, targetFs, sourcePath, targetPath) -> {
+			Path parent = targetPath.getParent();
+
+			if (parent != null) {
+				java.nio.file.Files.createDirectories(parent);
+			}
+
+			java.nio.file.Files.copy(sourcePath, targetPath);
+		});
+	}
+
+	public File getMergedJar() {
+		return minecraftMergedPatchedJar;
+	}
+
+	@Override
+	public String getTargetConfig() {
+		return Constants.Configurations.MINECRAFT;
+	}
+}
diff --git a/src/main/java/net/fabricmc/loom/providers/MinecraftProvider.java b/src/main/java/net/fabricmc/loom/providers/MinecraftProvider.java
index d2f5b22f..67634b6b 100644
--- a/src/main/java/net/fabricmc/loom/providers/MinecraftProvider.java
+++ b/src/main/java/net/fabricmc/loom/providers/MinecraftProvider.java
@@ -27,39 +27,15 @@ package net.fabricmc.loom.providers;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.io.UncheckedIOException;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.FileSystem;
-import java.nio.file.FileSystems;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-import java.util.Collections;
 import java.util.Optional;
 import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.function.UnaryOperator;
 import java.util.zip.ZipError;
 
-import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Files;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import net.minecraftforge.accesstransformer.TransformerProcessor;
-import net.minecraftforge.binarypatcher.ConsoleTool;
-import net.minecraftforge.gradle.mcp.util.MCPRuntime;
-import net.minecraftforge.gradle.mcp.util.MCPWrapper;
-import org.apache.commons.io.FileUtils;
-import org.cadixdev.atlas.Atlas;
-import org.cadixdev.bombe.asm.jar.JarEntryRemappingTransformer;
-import org.cadixdev.lorenz.MappingSet;
-import org.cadixdev.lorenz.asm.LorenzRemapper;
-import org.cadixdev.lorenz.io.srg.tsrg.TSrgReader;
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
 import org.gradle.api.logging.Logger;
@@ -67,9 +43,6 @@ import org.gradle.api.logging.Logger;
 import net.fabricmc.loom.util.Constants;
 import net.fabricmc.loom.util.DependencyProvider;
 import net.fabricmc.loom.util.DownloadUtil;
-import net.fabricmc.loom.util.JarUtil;
-import net.fabricmc.loom.util.function.FsPathConsumer;
-import net.fabricmc.loom.util.function.IoConsumer;
 import net.fabricmc.loom.util.ManifestVersion;
 import net.fabricmc.loom.util.MinecraftVersionInfo;
 import net.fabricmc.loom.util.StaticPathWatcher;
@@ -82,14 +55,8 @@ public class MinecraftProvider extends DependencyProvider {
 	private MinecraftLibraryProvider libraryProvider;
 
 	private File minecraftJson;
-	private File minecraftClientJar;
-	private File minecraftServerJar;
-	private File minecraftClientSrgJar;
-	private File minecraftServerSrgJar;
-	private File minecraftClientPatchedSrgJar;
-	private File minecraftServerPatchedSrgJar;
-	private File minecraftClientPatchedJar;
-	private File minecraftServerPatchedJar;
+	File minecraftClientJar;
+	File minecraftServerJar;
 	private File minecraftMergedJar;
 	private String jarSuffix = "";
 
@@ -132,19 +99,6 @@ public class MinecraftProvider extends DependencyProvider {
 		libraryProvider = new MinecraftLibraryProvider();
 		libraryProvider.provide(this, getProject());
 
-		if (getExtension().isForge() && (!minecraftClientPatchedJar.exists() || !minecraftServerPatchedJar.exists())) {
-			if (!minecraftClientSrgJar.exists() || !minecraftServerSrgJar.exists()) {
-				createSrgJars(getProject().getLogger());
-			}
-
-			if (!minecraftClientPatchedSrgJar.exists() || !minecraftServerPatchedSrgJar.exists()) {
-				patchJars(getProject().getLogger());
-				injectForgeClasses(getProject().getLogger());
-			}
-
-			remapPatchedJars(getProject().getLogger());
-		}
-
 		if (!minecraftMergedJar.exists() || isRefreshDeps()) {
 			try {
 				mergeJars(getProject().getLogger());
@@ -152,15 +106,6 @@ public class MinecraftProvider extends DependencyProvider {
 				DownloadUtil.delete(minecraftClientJar);
 				DownloadUtil.delete(minecraftServerJar);
 
-				if (getExtension().isForge()) {
-					DownloadUtil.delete(minecraftClientPatchedJar);
-					DownloadUtil.delete(minecraftServerPatchedJar);
-					DownloadUtil.delete(minecraftClientSrgJar);
-					DownloadUtil.delete(minecraftServerSrgJar);
-					DownloadUtil.delete(minecraftClientPatchedSrgJar);
-					DownloadUtil.delete(minecraftServerPatchedSrgJar);
-				}
-
 				getProject().getLogger().error("Could not merge JARs! Deleting source JARs - please re-run the command and move on.", e);
 				throw new RuntimeException();
 			}
@@ -171,21 +116,7 @@ public class MinecraftProvider extends DependencyProvider {
 		minecraftJson = new File(getExtension().getUserCache(), "minecraft-" + minecraftVersion + "-info.json");
 		minecraftClientJar = new File(getExtension().getUserCache(), "minecraft-" + minecraftVersion + "-client.jar");
 		minecraftServerJar = new File(getExtension().getUserCache(), "minecraft-" + minecraftVersion + "-server.jar");
-
-		if (getExtension().isForge()) {
-			// Forge-related JARs
-			PatchProvider patchProvider = getExtension().getPatchProvider();
-			jarSuffix = "-patched-forge-" + patchProvider.forgeVersion;
-
-			minecraftClientPatchedJar = new File(getExtension().getUserCache(), "minecraft-" + minecraftVersion + "-client" + jarSuffix + ".jar");
-			minecraftServerPatchedJar = new File(getExtension().getUserCache(), "minecraft-" + minecraftVersion + "-server" + jarSuffix + ".jar");
-			minecraftClientSrgJar = new File(getExtension().getUserCache(), "minecraft-" + minecraftVersion + "-client-srg.jar");
-			minecraftServerSrgJar = new File(getExtension().getUserCache(), "minecraft-" + minecraftVersion + "-server-srg.jar");
-			minecraftClientPatchedSrgJar = new File(getExtension().getUserCache(), "minecraft-" + minecraftVersion + "-client-srg" + jarSuffix + ".jar");
-			minecraftServerPatchedSrgJar = new File(getExtension().getUserCache(), "minecraft-" + minecraftVersion + "-server-srg" + jarSuffix + ".jar");
-		}
-
-		minecraftMergedJar = new File(getExtension().getUserCache(), "minecraft-" + minecraftVersion + "-merged" + jarSuffix + ".jar");
+		minecraftMergedJar = new File(getExtension().getUserCache(), "minecraft-" + minecraftVersion + "-merged.jar");
 	}
 
 	private void downloadMcJson(boolean offline) throws IOException {
@@ -254,197 +185,13 @@ public class MinecraftProvider extends DependencyProvider {
 		DownloadUtil.downloadIfChanged(new URL(versionInfo.downloads.get("server").url), minecraftServerJar, logger);
 	}
 
-	private void createSrgJars(Logger logger) throws Exception {
-		logger.lifecycle(":remapping minecraft (MCP, official -> srg)");
-
-		McpConfigProvider volde = getExtension().getMcpConfigProvider();
-		File root = new File(getExtension().getUserCache(), "mcp_root");
-		root.mkdirs();
-		MCPWrapper wrapper = new MCPWrapper(volde.getMcp(), root);
-
-		// Client
-		{
-			MCPRuntime runtime = wrapper.getRuntime(getProject(), "client");
-			File output = runtime.execute(logger, "rename");
-			Files.copy(output, minecraftClientSrgJar);
-		}
-
-		// Server
-		{
-			MCPRuntime runtime = wrapper.getRuntime(getProject(), "server");
-			File output = runtime.execute(logger, "rename");
-			Files.copy(output, minecraftServerSrgJar);
-		}
-	}
-
-	private void injectForgeClasses(Logger logger) throws IOException {
-		logger.lifecycle(":injecting forge classes into minecraft");
-		copyAll(getExtension().getForgeUniversalProvider().getForge(), minecraftClientPatchedSrgJar);
-		copyAll(getExtension().getForgeUniversalProvider().getForge(), minecraftServerPatchedSrgJar);
-
-		copyUserdevFiles(getExtension().getForgeUserdevProvider().getUserdevJar(), minecraftClientPatchedSrgJar);
-		copyUserdevFiles(getExtension().getForgeUserdevProvider().getUserdevJar(), minecraftServerPatchedSrgJar);
-
-		logger.lifecycle(":injecting loom classes into minecraft");
-		File injection = File.createTempFile("loom-injection", ".jar");
-
-		try (InputStream in = MinecraftProvider.class.getResourceAsStream("/inject/injection.jar")) {
-			FileUtils.copyInputStreamToFile(in, injection);
-		}
-
-		walkFileSystems(injection, minecraftClientPatchedSrgJar, it -> !it.getFileName().toString().equals("MANIFEST.MF"), this::copyReplacing);
-		walkFileSystems(injection, minecraftServerPatchedSrgJar, it -> !it.getFileName().toString().equals("MANIFEST.MF"), this::copyReplacing);
-
-		logger.lifecycle(":access transforming");
-		File clientAtJar = File.createTempFile("atclient", ".jar");
-		File serverAtJar = File.createTempFile("atserver", ".jar");
-		File clientAt = File.createTempFile("atclient", ".cfg");
-		File serverAt = File.createTempFile("atserver", ".cfg");
-		Files.copy(minecraftClientPatchedSrgJar, clientAtJar);
-		Files.copy(minecraftServerPatchedSrgJar, serverAtJar);
-		JarUtil.extractFile(clientAtJar, "META-INF/accesstransformer.cfg", clientAt);
-		JarUtil.extractFile(serverAtJar, "META-INF/accesstransformer.cfg", serverAt);
-		TransformerProcessor.main("--inJar", clientAtJar.getAbsolutePath(), "--outJar", minecraftClientPatchedSrgJar.getAbsolutePath(), "--atFile", clientAt.getAbsolutePath());
-		TransformerProcessor.main("--inJar", serverAtJar.getAbsolutePath(), "--outJar", minecraftServerPatchedSrgJar.getAbsolutePath(), "--atFile", serverAt.getAbsolutePath());
-	}
-
-	private void remapPatchedJars(Logger logger) throws IOException {
-		logger.lifecycle(":remapping minecraft (Atlas, srg -> official)");
-
-		useAtlas(MappingSet::reverse, atlas -> {
-			atlas.run(minecraftClientPatchedSrgJar.toPath(), minecraftClientPatchedJar.toPath());
-			atlas.run(minecraftServerPatchedSrgJar.toPath(), minecraftServerPatchedJar.toPath());
-		});
-	}
-
-	private void useAtlas(UnaryOperator<MappingSet> mappingOp, IoConsumer<Atlas> action) throws IOException {
-		try (Reader mappingReader = new FileReader(getExtension().getMcpConfigProvider().getSrg());
-				TSrgReader reader = new TSrgReader(mappingReader);
-				Atlas atlas = new Atlas()) {
-			MappingSet mappings = mappingOp.apply(reader.read());
-
-			atlas.install(ctx -> new JarEntryRemappingTransformer(
-					new LorenzRemapper(mappings, ctx.inheritanceProvider())
-			));
-
-			for (File library : getLibraryProvider().getLibraries()) {
-				atlas.use(library.toPath());
-			}
-
-			action.accept(atlas);
-		}
-	}
-
-	private void patchJars(Logger logger) throws IOException {
-		logger.lifecycle(":patching jars");
-
-		PatchProvider patchProvider = getExtension().getPatchProvider();
-		patchJars(minecraftClientSrgJar, minecraftClientPatchedSrgJar, patchProvider.clientPatches);
-		patchJars(minecraftServerSrgJar, minecraftServerPatchedSrgJar, patchProvider.serverPatches);
-
-		logger.lifecycle(":copying missing classes into patched jars");
-		copyMissingClasses(minecraftClientSrgJar, minecraftClientPatchedSrgJar);
-		copyMissingClasses(minecraftServerSrgJar, minecraftServerPatchedSrgJar);
-	}
-
-	private void patchJars(File clean, File output, Path patches) throws IOException {
-		ConsoleTool.main(new String[]{
-				"--clean", clean.getAbsolutePath(),
-				"--output", output.getAbsolutePath(),
-				"--apply", patches.toAbsolutePath().toString()
-		});
-	}
-
 	private void mergeJars(Logger logger) throws IOException {
-		if (getExtension().isForge()) {
-			// FIXME: Hack here: There are no server-only classes so we can just copy the client JAR.
-			Files.copy(minecraftClientPatchedJar, minecraftMergedJar);
-
-			logger.lifecycle(":copying resources");
-
-			// Copy resources
-			copyNonClassFiles(minecraftClientJar, minecraftMergedJar);
-			copyNonClassFiles(minecraftServerJar, minecraftMergedJar);
-		} else {
-			logger.lifecycle(":merging jars");
-
-			try (JarMerger jarMerger = new JarMerger(minecraftClientJar, minecraftServerJar, minecraftMergedJar)) {
-				jarMerger.enableSyntheticParamsOffset();
-				jarMerger.merge();
-			}
-		}
-	}
-
-	private void walkFileSystems(File source, File target, Predicate<Path> filter, Function<FileSystem, Iterable<Path>> toWalk, FsPathConsumer action) throws IOException {
-		try (FileSystem sourceFs = FileSystems.newFileSystem(new URI("jar:" + source.toURI()), ImmutableMap.of("create", false));
-				FileSystem targetFs = FileSystems.newFileSystem(new URI("jar:" + target.toURI()), ImmutableMap.of("create", false))) {
-			for (Path sourceDir : toWalk.apply(sourceFs)) {
-				Path dir = sourceDir.toAbsolutePath();
-				java.nio.file.Files.walk(dir)
-						.filter(java.nio.file.Files::isRegularFile)
-						.filter(filter)
-						.forEach(it -> {
-							boolean root = dir.getParent() == null;
-
-							try {
-								Path relativeSource = root ? it : dir.relativize(it);
-								Path targetPath = targetFs.getPath(relativeSource.toString());
-								action.accept(sourceFs, targetFs, it, targetPath);
-							} catch (IOException e) {
-								throw new UncheckedIOException(e);
-							}
-						});
-			}
-		} catch (URISyntaxException e) {
-			throw new IOException(e);
-		}
-	}
-
-	private void walkFileSystems(File source, File target, Predicate<Path> filter, FsPathConsumer action) throws IOException {
-		walkFileSystems(source, target, filter, FileSystem::getRootDirectories, action);
-	}
+		logger.lifecycle(":merging jars");
 
-	private void copyAll(File source, File target) throws IOException {
-		walkFileSystems(source, target, it -> true, this::copyReplacing);
-	}
-
-	private void copyMissingClasses(File source, File target) throws IOException {
-		walkFileSystems(source, target, it -> it.toString().endsWith(".class"), (sourceFs, targetFs, sourcePath, targetPath) -> {
-			if (java.nio.file.Files.exists(targetPath)) return;
-			Path parent = targetPath.getParent();
-
-			if (parent != null) {
-				java.nio.file.Files.createDirectories(parent);
-			}
-
-			java.nio.file.Files.copy(sourcePath, targetPath);
-		});
-	}
-
-	private void copyNonClassFiles(File source, File target) throws IOException {
-		walkFileSystems(source, target, it -> !it.toString().endsWith(".class"), this::copyReplacing);
-	}
-
-	private void copyReplacing(FileSystem sourceFs, FileSystem targetFs, Path sourcePath, Path targetPath) throws IOException {
-		Path parent = targetPath.getParent();
-
-		if (parent != null) {
-			java.nio.file.Files.createDirectories(parent);
+		try (JarMerger jarMerger = new JarMerger(minecraftClientJar, minecraftServerJar, minecraftMergedJar)) {
+			jarMerger.enableSyntheticParamsOffset();
+			jarMerger.merge();
 		}
-
-		java.nio.file.Files.copy(sourcePath, targetPath, StandardCopyOption.REPLACE_EXISTING);
-	}
-
-	private void copyUserdevFiles(File source, File target) throws IOException {
-		walkFileSystems(source, target, file -> true, fs -> Collections.singleton(fs.getPath("inject")), (sourceFs, targetFs, sourcePath, targetPath) -> {
-			Path parent = targetPath.getParent();
-
-			if (parent != null) {
-				java.nio.file.Files.createDirectories(parent);
-			}
-
-			java.nio.file.Files.copy(sourcePath, targetPath);
-		});
 	}
 
 	public File getMergedJar() {
@@ -467,6 +214,10 @@ public class MinecraftProvider extends DependencyProvider {
 		return jarSuffix;
 	}
 
+	void setJarSuffix(String jarSuffix) {
+		this.jarSuffix = jarSuffix;
+	}
+
 	@Override
 	public String getTargetConfig() {
 		return Constants.Configurations.MINECRAFT;