From 00254ea567f056d7d6fcfa8b75c29072cdcef782 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Wed, 22 Nov 2023 15:02:33 +0800 Subject: [PATCH] Don't remap Forge with classpath (?) --- .../configuration/providers/forge/MinecraftPatchedProvider.java | 2 -- .../net/fabricmc/loom/test/integration/FabricAPITest.groovy | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java index 4c7b3463..dd98822b 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java @@ -226,7 +226,6 @@ public class MinecraftPatchedProvider { } private TinyRemapper buildRemapper(SharedServiceManager serviceManager, Path input) throws IOException { - Path[] libraries = TinyRemapperHelper.getMinecraftCompileLibraries(project); final MappingOption mappingOption = MappingOption.forPlatform(getExtension()); TinyMappingsService mappingsService = getExtension().getMappingConfiguration().getMappingsService(serviceManager, mappingOption); final String sourceNamespace = IntermediaryNamespaces.intermediary(project); @@ -245,7 +244,6 @@ public class MinecraftPatchedProvider { MappingsProviderVerbose.saveFile(remapper); } - remapper.readClassPath(libraries); remapper.prepareClasses(); return remapper; } diff --git a/src/test/groovy/net/fabricmc/loom/test/integration/FabricAPITest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/FabricAPITest.groovy index 8d864c1c..a1890a51 100644 --- a/src/test/groovy/net/fabricmc/loom/test/integration/FabricAPITest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/integration/FabricAPITest.groovy @@ -60,7 +60,7 @@ class FabricAPITest extends Specification implements GradleProjectTestTrait { """.stripIndent() } - // Set the version to something constant + // Change the plugin used gradle.buildGradle.text = gradle.buildGradle.text .replace('id "fabric-loom" version "1.4.1"', 'id "dev.architectury.loom"') .replace('"fabric-loom"', '"dev.architectury.loom"') + mixinApPatch