From 92da5adb483a2b68ab8bd1b14ea7dff247089a2d Mon Sep 17 00:00:00 2001
From: modmuss <modmuss50@gmail.com>
Date: Mon, 20 Nov 2023 19:15:30 +0000
Subject: [PATCH] Remove Minecraft libraries from the remap classpath. (#987)

---
 .../loom/configuration/processors/ContextImplHelper.java   | 1 -
 .../minecraft/mapped/AbstractMappedMinecraftProvider.java  | 1 -
 src/main/java/net/fabricmc/loom/task/RemapJarTask.java     | 7 ++++++-
 .../java/net/fabricmc/loom/util/TinyRemapperHelper.java    | 6 ------
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/main/java/net/fabricmc/loom/configuration/processors/ContextImplHelper.java b/src/main/java/net/fabricmc/loom/configuration/processors/ContextImplHelper.java
index b18e1d8a..283f2cc7 100644
--- a/src/main/java/net/fabricmc/loom/configuration/processors/ContextImplHelper.java
+++ b/src/main/java/net/fabricmc/loom/configuration/processors/ContextImplHelper.java
@@ -42,7 +42,6 @@ public final class ContextImplHelper {
 		return new LazyCloseable<>(() -> {
 			try {
 				TinyRemapper tinyRemapper = TinyRemapperHelper.getTinyRemapper(configContext.project(), configContext.serviceManager(), from.toString(), to.toString());
-				tinyRemapper.readClassPath(TinyRemapperHelper.getMinecraftCompileLibraries(configContext.project()));
 
 				for (Path minecraftJar : configContext.extension().getMinecraftJars(MappingsNamespace.INTERMEDIARY)) {
 					tinyRemapper.readClassPath(minecraftJar);
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/AbstractMappedMinecraftProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/AbstractMappedMinecraftProvider.java
index 4aed85df..aaed5b8c 100644
--- a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/AbstractMappedMinecraftProvider.java
+++ b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/AbstractMappedMinecraftProvider.java
@@ -196,7 +196,6 @@ public abstract class AbstractMappedMinecraftProvider<M extends MinecraftProvide
 
 		try (OutputConsumerPath outputConsumer = new OutputConsumerPath.Builder(remappedJars.outputJarPath()).build()) {
 			outputConsumer.addNonClassFiles(remappedJars.inputJar());
-			remapper.readClassPath(TinyRemapperHelper.getMinecraftCompileLibraries(getProject()));
 
 			for (Path path : remappedJars.remapClasspath()) {
 				remapper.readClassPath(path);
diff --git a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java
index 6dd2cd5a..fbc6e720 100644
--- a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java
+++ b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java
@@ -97,7 +97,12 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
 		super();
 		serviceManagerProvider = BuildSharedServiceManager.createForTask(this, getBuildEventsListenerRegistry());
 
-		getClasspath().from(getProject().getConfigurations().getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME));
+		final Configuration compileClasspath = getProject().getConfigurations().getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME);
+		final Configuration minecraftCompileLibraries = getProject().getConfigurations().getByName(Constants.Configurations.MINECRAFT_COMPILE_LIBRARIES);
+		// Filter out minecraft libraries from the classpath as we are 100% sure they don't play a part in the obfuscation
+		final FileCollection remapClasspath = compileClasspath.filter(file -> !minecraftCompileLibraries.getFiles().contains(file));
+
+		getClasspath().from(remapClasspath);
 		getAddNestedDependencies().convention(true).finalizeValueOnRead();
 
 		Configuration includeConfiguration = getProject().getConfigurations().getByName(Constants.Configurations.INCLUDE);
diff --git a/src/main/java/net/fabricmc/loom/util/TinyRemapperHelper.java b/src/main/java/net/fabricmc/loom/util/TinyRemapperHelper.java
index 648ba105..0381a268 100644
--- a/src/main/java/net/fabricmc/loom/util/TinyRemapperHelper.java
+++ b/src/main/java/net/fabricmc/loom/util/TinyRemapperHelper.java
@@ -24,7 +24,6 @@
 
 package net.fabricmc.loom.util;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Map;
@@ -95,11 +94,6 @@ public final class TinyRemapperHelper {
 		return builder.build();
 	}
 
-	public static Path[] getMinecraftCompileLibraries(Project project) {
-		return project.getConfigurations().getByName(Constants.Configurations.MINECRAFT_COMPILE_LIBRARIES).getFiles()
-				.stream().map(File::toPath).toArray(Path[]::new);
-	}
-
 	private static IMappingProvider.Member memberOf(String className, String memberName, String descriptor) {
 		return new IMappingProvider.Member(className, memberName, descriptor);
 	}