fix: yarn on 26.1

Author: ishland

src/main/java/org/relativitymc/neoloom/neoforge/NFRTMergedMinecraftProvider.java

@@ -186,6 +186,14 @@ public List<Path> getMinecraftJars() {
 		return List.of(this.minecraftMergedJar);
 	}
 
+	public List<Path> getFullClasspath() {
+		if (this.mergedNeoForgeJar) {
+			return List.of(this.minecraftMergedJar);
+		} else {
+			return List.of(this.minecraftMergedJar, getNeoForgeUniversalJar());
+		}
+	}
+
 	@Override
 	public File getMinecraftClientJar() {
 		throw new UnsupportedOperationException("handled by NFRT");

src/main/java/org/relativitymc/neoloom/neoforge/mappings/FieldMappingsMigrator.java

@@ -49,7 +49,6 @@
 import org.slf4j.LoggerFactory;
 
 import net.fabricmc.loom.api.mappings.layered.MappingsNamespace;
-import net.fabricmc.loom.configuration.providers.minecraft.MinecraftProvider;
 import net.fabricmc.loom.util.Constants;
 import net.fabricmc.loom.util.FileSystemUtil;
 import net.fabricmc.mappingio.MappingReader;
@@ -61,14 +60,16 @@
 import dev.architectury.loom.util.Stopwatch;
 import dev.architectury.loom.util.ThreadingUtils;
 
+import org.relativitymc.neoloom.neoforge.NFRTMergedMinecraftProvider;
+
 public final class FieldMappingsMigrator implements MappingsMigrator {
 	private static final Logger LOGGER = LoggerFactory.getLogger(FieldMappingsMigrator.class);
 
 	private List<Map.Entry<FieldMember, String>> migratedFields = new ArrayList<>();
 	public Path migratedFieldsCache;
 
 	@Override
-	public long setup(Project project, MinecraftProvider minecraftProvider, Path cache, Path rawMappings) throws IOException {
+	public long setup(Project project, NFRTMergedMinecraftProvider minecraftProvider, Path cache, Path rawMappings) throws IOException {
 		migratedFieldsCache = cache.resolve("migrated-fields.json");
 		migratedFields.clear();
 

src/main/java/org/relativitymc/neoloom/neoforge/mappings/ForgeMigratedMappingConfiguration.java

@@ -39,6 +39,8 @@
 
 import dev.architectury.loom.util.Stopwatch;
 
+import org.relativitymc.neoloom.neoforge.NFRTMergedMinecraftProvider;
+
 public final class ForgeMigratedMappingConfiguration extends MappingConfiguration {
 	private final List<MappingsMigrator> migrators = List.of(new FieldMappingsMigrator(), new MethodInheritanceMappingsMigrator());
 	private final Path hashPath;
@@ -60,7 +62,7 @@ protected void manipulateMappings(@NonNull Project project) throws IOException {
 		this.tinyMappings = mappingsWorkingDir().resolve("mappings-migrated.tiny");
 
 		for (MappingsMigrator migrator : this.migrators) {
-			hash = hash * 31 + migrator.setup(project, extension.getMinecraftProvider(), this.mappingsWorkingDir(), this.rawTinyMappings);
+			hash = hash * 31 + migrator.setup(project, (NFRTMergedMinecraftProvider) extension.getMinecraftProvider(), this.mappingsWorkingDir(), this.rawTinyMappings);
 		}
 
 		if (!isOutdated(extension)) {

src/main/java/org/relativitymc/neoloom/neoforge/mappings/MappingsMigrator.java

@@ -30,10 +30,10 @@
 
 import org.gradle.api.Project;
 
-import net.fabricmc.loom.configuration.providers.minecraft.MinecraftProvider;
+import org.relativitymc.neoloom.neoforge.NFRTMergedMinecraftProvider;
 
 public interface MappingsMigrator {
-	long setup(Project project, MinecraftProvider minecraftProvider, Path cache, Path rawMappings) throws IOException;
+	long setup(Project project, NFRTMergedMinecraftProvider minecraftProvider, Path cache, Path rawMappings) throws IOException;
 
 	void migrate(Project project, List<MappingsEntry> entries) throws IOException;
 

src/main/java/org/relativitymc/neoloom/neoforge/mappings/MethodInheritanceMappingsMigrator.java

@@ -49,7 +49,6 @@
 
 import net.fabricmc.loom.LoomGradleExtension;
 import net.fabricmc.loom.api.mappings.layered.MappingsNamespace;
-import net.fabricmc.loom.configuration.providers.minecraft.MinecraftProvider;
 import net.fabricmc.loom.util.Constants;
 import net.fabricmc.loom.util.FileSystemUtil;
 import net.fabricmc.loom.util.Pair;
@@ -61,6 +60,8 @@
 
 import dev.architectury.loom.util.collection.Multimap;
 
+import org.relativitymc.neoloom.neoforge.NFRTMergedMinecraftProvider;
+
 /**
  * With some forge patches, methods can inherit methods from a class that is not in the mappings.
  * This migrator will try to detect all the methods that are inherited from a class that is not in the mappings,
@@ -70,7 +71,7 @@ public final class MethodInheritanceMappingsMigrator implements MappingsMigrator
 	private Set<Pair<String, String>> methodsToRemove;
 
 	@Override
-	public long setup(Project project, MinecraftProvider minecraftProvider, Path cache, Path rawMappings) throws IOException {
+	public long setup(Project project, NFRTMergedMinecraftProvider minecraftProvider, Path cache, Path rawMappings) throws IOException {
 		Path cacheFile = cache.resolve("method-inheritance-migrator.json");
 
 		if (!minecraftProvider.refreshDeps() && Files.exists(cacheFile)) {
@@ -84,9 +85,10 @@ public long setup(Project project, MinecraftProvider minecraftProvider, Path cac
 			LoomGradleExtension extension = LoomGradleExtension.get(project);
 			methodsToRemove = new HashSet<>();
 
-			for (Path jar : minecraftProvider.getMinecraftJars()) {
-				methodsToRemove.addAll(prepareCache(project.getLogger(), rawMappings, List.of(jar)));
-			}
+			// for (Path jar : minecraftProvider.getMinecraftJars()) {
+			// 	methodsToRemove.addAll(prepareCache(project.getLogger(), rawMappings, List.of(jar)));
+			// }
+			methodsToRemove.addAll(prepareCache(project.getLogger(), rawMappings, minecraftProvider.getFullClasspath()));
 
 			Files.writeString(cacheFile, new Gson().toJson(methodsToRemove.stream().sorted(Comparator.comparing(p -> p.left() + "|" + p.right())).toList()), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
 		}