mmo-ref/mc-forge
1
0
Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge synced 2026-08-22 04:26:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Generate SRG named redirects for TransformationMatrix methods in userdev (#9883)

Browse source
This commit is contained in:
embeddedt 2024-03-05 14:11:20 -05:00 • committed by GitHub
parent ed3ac8a122
commit 54233da14c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 39 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -960,7 +960,7 @@ project(':forge') {
}
task downloadInstaller(type: DownloadMavenArtifact) {
artifact = 'net.minecraftforge:installer:2.1.+:shrunk'
artifact = 'net.minecraftforge:installer:2.2.+:fatjar'
changing = true
}
@ -1246,4 +1246,4 @@ task setup() {
changelog {
fromTag MIN_TAG_FOR_CHANGELOG
}
}

51
src/main/resources/coremods/add_bouncer_method.js
View file

@ -45,7 +45,9 @@ function addBouncer(className, conflictedName, expectedName, descriptor, signatu
}
}
// Generate a method with name oldName that redirects to expectedName. oldName is remapped, expectedName isn't.
// Generate a method with name oldName that redirects to expectedName. expectedName is not remapped.
// A redirect will be generated for oldName and whatever deobfuscated name it maps to,
// provided these methods do not exist already.
function addRedirect(className, oldName, expectedName, descriptor, numArgs) {
return {
'target': {
@ -55,21 +57,42 @@ function addRedirect(className, oldName, expectedName, descriptor, numArgs) {
'transformer': function(node) {
var mappedName = ASMAPI.mapMethod(oldName);
var method = new MethodNode(
/* access = */ Opcodes.ACC_PUBLIC,
/* name = */ mappedName,
/* descriptor = */ descriptor,
/* signature = */ descriptor,
/* exceptions = */ null
);
var names = [oldName, mappedName];
for(var i = 0; i < numArgs; i++) {
method.instructions.add(new VarInsnNode(Opcodes.ALOAD, i));
for(var i = 0; i < names.length; i++) {
var name = names[i];
// Skip generating stub if method name exists in this class
var exists = false;
for(var j = 0; j < node.methods.length; j++) {
if(node.methods[i].name == name) {
exists = true;
break;
}
}
if(exists) {
continue;
}
// Generate stub
var method = new MethodNode(
/* access = */ Opcodes.ACC_PUBLIC,
/* name = */ name,
/* descriptor = */ descriptor,
/* signature = */ descriptor,
/* exceptions = */ null
);
for(var i = 0; i < numArgs; i++) {
method.instructions.add(new VarInsnNode(Opcodes.ALOAD, i));
}
method.instructions.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, className.replaceAll("\\.","/"), expectedName, descriptor));
method.instructions.add(new InsnNode(Opcodes.ARETURN));
node.methods.add(method);
}
method.instructions.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, className.replaceAll("\\.","/"), expectedName, descriptor));
method.instructions.add(new InsnNode(Opcodes.ARETURN));
node.methods.add(method);
return node;
}