From da8566a7d76bbe6a2c8d720856fcc6a461b93100 Mon Sep 17 00:00:00 2001 From: 0x22 <0x22@futureclient.net> Date: Mon, 13 Feb 2023 10:17:14 -0500 Subject: [PATCH] Fix InnerClassGenerator not remapping fields. (#98) * Fix InnerClassGenerator not remapping fields. * Fix InnerClassGenerator case-insensitive class owner name comparison. --- .../transformer/InnerClassGenerator.java | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/InnerClassGenerator.java b/src/main/java/org/spongepowered/asm/mixin/transformer/InnerClassGenerator.java index d8009cbc..179deb59 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/InnerClassGenerator.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/InnerClassGenerator.java @@ -36,6 +36,7 @@ import org.objectweb.asm.commons.Remapper; import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.commons.ClassRemapper; import org.spongepowered.asm.mixin.extensibility.IMixinInfo; +import org.spongepowered.asm.mixin.transformer.ClassInfo.Field; import org.spongepowered.asm.mixin.transformer.ClassInfo.Method; import org.spongepowered.asm.mixin.transformer.ext.IClassGenerator; import org.spongepowered.asm.mixin.transformer.throwables.InvalidMixinException; @@ -158,14 +159,33 @@ final class InnerClassGenerator implements IClassGenerator { classNode.accept(classVisitor); this.loadCounter++; } - + /** - * Used to remap synthetic accessor methods which have been renamed when - * being applied to the target class. + * Used to remap fields which have been renamed while being applied to + * the target class or by an implementation of IRemapper. + * + * @see org.spongepowered.asm.mixin.extensibility.IRemapper + */ + @Override + public String mapFieldName(String owner, String name, String descriptor) { + if (this.ownerName.equals(owner)) { + Field field = this.owner.getClassInfo().findField(name, descriptor, ClassInfo.INCLUDE_ALL); + if (field != null) { + return field.getName(); + } + } + return super.mapFieldName(owner, name, descriptor); + } + + /** + * Used to remap methods which have been renamed while being applied to + * the target class or by an implementation of IRemapper. + * + * @see org.spongepowered.asm.mixin.extensibility.IRemapper */ @Override public String mapMethodName(String owner, String name, String desc) { - if (this.ownerName.equalsIgnoreCase(owner)) { + if (this.ownerName.equals(owner)) { Method method = this.owner.getClassInfo().findMethod(name, desc, ClassInfo.INCLUDE_ALL); if (method != null) { return method.getName();