Remap InnerClassNodes

Signed-off-by: Graham <gpe@openrs2.dev>
pull/132/head
Graham 4 years ago
parent 46c0c29559
commit 8a563a3b26
  1. 12
      asm/src/main/java/dev/openrs2/asm/ClassNodeRemapper.kt

@ -1,11 +1,13 @@
package dev.openrs2.asm package dev.openrs2.asm
import dev.openrs2.asm.classpath.ExtendedRemapper import dev.openrs2.asm.classpath.ExtendedRemapper
import org.objectweb.asm.commons.Remapper
import org.objectweb.asm.tree.AbstractInsnNode import org.objectweb.asm.tree.AbstractInsnNode
import org.objectweb.asm.tree.ClassNode import org.objectweb.asm.tree.ClassNode
import org.objectweb.asm.tree.FieldInsnNode import org.objectweb.asm.tree.FieldInsnNode
import org.objectweb.asm.tree.FieldNode import org.objectweb.asm.tree.FieldNode
import org.objectweb.asm.tree.FrameNode import org.objectweb.asm.tree.FrameNode
import org.objectweb.asm.tree.InnerClassNode
import org.objectweb.asm.tree.InvokeDynamicInsnNode import org.objectweb.asm.tree.InvokeDynamicInsnNode
import org.objectweb.asm.tree.LdcInsnNode import org.objectweb.asm.tree.LdcInsnNode
import org.objectweb.asm.tree.MethodInsnNode import org.objectweb.asm.tree.MethodInsnNode
@ -28,6 +30,10 @@ fun ClassNode.remap(remapper: ExtendedRemapper) {
outerMethodDesc = remapper.mapMethodDesc(outerMethodDesc) outerMethodDesc = remapper.mapMethodDesc(outerMethodDesc)
} }
for (innerClass in innerClasses) {
innerClass.remap(remapper)
}
for (field in fields) { for (field in fields) {
field.remap(remapper, originalName) field.remap(remapper, originalName)
} }
@ -37,6 +43,12 @@ fun ClassNode.remap(remapper: ExtendedRemapper) {
} }
} }
fun InnerClassNode.remap(remapper: Remapper) {
name = remapper.mapType(name)
outerName = remapper.mapType(outerName)
innerName = remapper.mapType(innerName)
}
fun FieldNode.remap(remapper: ExtendedRemapper, owner: String) { fun FieldNode.remap(remapper: ExtendedRemapper, owner: String) {
name = remapper.mapFieldName(owner, name, desc) name = remapper.mapFieldName(owner, name, desc)
desc = remapper.mapDesc(desc) desc = remapper.mapDesc(desc)

Loading…
Cancel
Save