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

Use Constants.ASM_VERSION everywhere

Browse Source
This commit is contained in:
Juuz
2025-10-01 00:21:36 +03:00
parent e76606425e
commit e1c5f7e868
5 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/dev/architectury/loom/forge/FieldMappingsMigrator.java
View File

@@ -48,13 +48,13 @@ import org.gradle.api.Project;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.FieldVisitor;
import org.objectweb.asm.Opcodes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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.mappingio.MappingReader;
import net.fabricmc.mappingio.format.tiny.Tiny2FileWriter;
@@ -183,7 +183,7 @@ public final class FieldMappingsMigrator implements MappingsMigrator {
}
}
Visitor visitor = new Visitor(Opcodes.ASM9);
Visitor visitor = new Visitor(Constants.ASM_VERSION);
FileSystemUtil.Delegate system = FileSystemUtil.getJarFileSystem(patchedJar, false);
completer.onComplete(value -> system.close());

4
src/main/java/dev/architectury/loom/forge/MethodInheritanceMappingsMigrator.java
View File

@@ -48,11 +48,11 @@ import org.gradle.api.logging.Logger;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Opcodes;
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;
import net.fabricmc.mappingio.MappingReader;
@@ -182,7 +182,7 @@ public final class MethodInheritanceMappingsMigrator implements MappingsMigrator
private static Pair<Multimap<String, String>, Set<MethodKey>> collectClassesAndMethods(Iterable<Path> jars) throws IOException {
Multimap<String, String> classInheritanceMap = Multimap.setMultimap();
Set<MethodKey> methods = new HashSet<>();
Visitor visitor = new Visitor(Opcodes.ASM9, classInheritanceMap, methods);
Visitor visitor = new Visitor(Constants.ASM_VERSION, classInheritanceMap, methods);
for (Path jar : jars) {
try (FileSystemUtil.Delegate system = FileSystemUtil.getJarFileSystem(jar, false)) {

6
src/main/java/dev/architectury/loom/forge/ModDirTransformerDiscovererPatch.java
View File

@@ -5,6 +5,8 @@ import org.objectweb.asm.Label;
import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Opcodes;
import net.fabricmc.loom.util.Constants;
/**
* Patches {@code ModDirTransformerDiscovererPatch} in Forge 49.0.50+ so that it doesn't try to create modules
* directly out of UnionFS root paths created by Union Relauncher. SecureModules can't infer the module names
@@ -12,7 +14,7 @@ import org.objectweb.asm.Opcodes;
*/
public final class ModDirTransformerDiscovererPatch extends ClassVisitor {
public ModDirTransformerDiscovererPatch(ClassVisitor classVisitor) {
super(Opcodes.ASM9, classVisitor);
super(Constants.ASM_VERSION, classVisitor);
}
@Override
@@ -20,7 +22,7 @@ public final class ModDirTransformerDiscovererPatch extends ClassVisitor {
MethodVisitor next = super.visitMethod(access, name, descriptor, signature, exceptions);
if (name.equals("isServiceProvider") && descriptor.equals("(Ljava/nio/file/Path;)Z")) {
return new MethodVisitor(Opcodes.ASM9, next) {
return new MethodVisitor(Constants.ASM_VERSION, next) {
@Override
public void visitCode() {
super.visitCode();

5
src/main/java/dev/architectury/loom/forge/minecraft/MinecraftPatchedProvider.java
View File

@@ -78,7 +78,6 @@ import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.Label;
import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.tree.ClassNode;
import net.fabricmc.loom.LoomGradleExtension;
@@ -339,10 +338,10 @@ public class MinecraftPatchedProvider {
ClassReader reader = new ClassReader(bytes);
ClassWriter writer = new ClassWriter(0);
reader.accept(new ClassVisitor(Opcodes.ASM9, writer) {
reader.accept(new ClassVisitor(Constants.ASM_VERSION, writer) {
@Override
public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
return new MethodVisitor(Opcodes.ASM9, super.visitMethod(access, name, descriptor, signature, exceptions)) {
return new MethodVisitor(Constants.ASM_VERSION, super.visitMethod(access, name, descriptor, signature, exceptions)) {
@Override
public void visitParameter(String name, int access) {
if (name != null && vignetteParameters.matcher(name).matches()) {

7
src/main/java/dev/architectury/loom/neoforge/LaunchHandlerPatcher.java
View File

@@ -2,7 +2,8 @@ package dev.architectury.loom.neoforge;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Opcodes;
import net.fabricmc.loom.util.Constants;
/*
* Patches the Minecraft.class check in FML's CommonUserdevLaunchHandler
@@ -15,7 +16,7 @@ public final class LaunchHandlerPatcher extends ClassVisitor {
private static final String OUTPUT_CLASS_FILE = "net/minecraft/client/main/Main.class";
public LaunchHandlerPatcher(ClassVisitor next) {
super(Opcodes.ASM9, next);
super(Constants.ASM_VERSION, next);
}
@Override
@@ -25,7 +26,7 @@ public final class LaunchHandlerPatcher extends ClassVisitor {
private static final class MethodPatcher extends MethodVisitor {
MethodPatcher(MethodVisitor next) {
super(Opcodes.ASM9, next);
super(Constants.ASM_VERSION, next);
}
@Override