imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-03-28 04:07:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update TR and fix compilation errors

Browse Source
This commit is contained in:
Juuz
2023-07-19 12:14:34 +03:00
parent 60e0aaf823
commit 2de23d12cf
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -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'

7
src/main/java/net/fabricmc/loom/configuration/mods/AccessWidenerAnalyzeVisitorProvider.java
View File

@@ -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<ModDependency> mods) throws IOException {
static AccessWidenerAnalyzeVisitorProvider createFromMods(String namespace, List<ModDependency> 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;

2
src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
View File

@@ -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;