diff --git a/build.gradle b/build.gradle index f996b800..41632fa8 100644 --- a/build.gradle +++ b/build.gradle @@ -98,7 +98,7 @@ dependencies { } // tinyfile management - implementation ('dev.architectury:tiny-remapper:1.8.20') // TODO: Update + implementation ('dev.architectury:tiny-remapper:1.9.21') implementation 'net.fabricmc:access-widener:2.1.0' implementation 'net.fabricmc:mapping-io:0.2.1' diff --git a/src/main/java/net/fabricmc/loom/configuration/mods/AccessWidenerAnalyzeVisitorProvider.java b/src/main/java/net/fabricmc/loom/configuration/mods/AccessWidenerAnalyzeVisitorProvider.java index b59373d6..55503d74 100644 --- a/src/main/java/net/fabricmc/loom/configuration/mods/AccessWidenerAnalyzeVisitorProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/mods/AccessWidenerAnalyzeVisitorProvider.java @@ -27,6 +27,7 @@ package net.fabricmc.loom.configuration.mods; import java.io.IOException; import java.util.List; +import dev.architectury.tinyremapper.TinyRemapper; import org.objectweb.asm.ClassVisitor; import net.fabricmc.accesswidener.AccessWidener; @@ -34,15 +35,15 @@ import net.fabricmc.accesswidener.AccessWidenerClassVisitor; import net.fabricmc.accesswidener.AccessWidenerReader; import net.fabricmc.loom.configuration.mods.dependency.ModDependency; import net.fabricmc.loom.util.Constants; -import net.fabricmc.tinyremapper.TinyRemapper; +import net.fabricmc.loom.util.ModPlatform; public record AccessWidenerAnalyzeVisitorProvider(AccessWidener accessWidener) implements TinyRemapper.AnalyzeVisitorProvider { - static AccessWidenerAnalyzeVisitorProvider createFromMods(String namespace, List mods) throws IOException { + static AccessWidenerAnalyzeVisitorProvider createFromMods(String namespace, List mods, ModPlatform platform) throws IOException { AccessWidener accessWidener = new AccessWidener(); accessWidener.visitHeader(namespace); for (ModDependency mod : mods) { - final var accessWidenerData = AccessWidenerUtils.readAccessWidenerData(mod.getInputFile()); + final var accessWidenerData = AccessWidenerUtils.readAccessWidenerData(mod.getInputFile(), platform); if (accessWidenerData == null) { continue; diff --git a/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java b/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java index ce3f8632..346b176b 100644 --- a/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java +++ b/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java @@ -168,7 +168,7 @@ public class ModProcessor { .logUnknownInvokeDynamic(false) .withMappings(TinyRemapperHelper.create(mappings, fromM, toM, false)) .renameInvalidLocals(false) - .extraAnalyzeVisitor(AccessWidenerAnalyzeVisitorProvider.createFromMods(fromM, remapList)); + .extraAnalyzeVisitor(AccessWidenerAnalyzeVisitorProvider.createFromMods(fromM, remapList, extension.getPlatform().get())); final KotlinClasspathService kotlinClasspathService = KotlinClasspathService.getOrCreateIfRequired(serviceManager, project); KotlinRemapperClassloader kotlinRemapperClassloader = null;