mirror of
https://github.com/LegacyModdingMC/UniMix.git
synced 2026-11-20 06:29:35 +00:00
Fix InnerClassGenerator not remapping fields. (#98)
* Fix InnerClassGenerator not remapping fields. * Fix InnerClassGenerator case-insensitive class owner name comparison.
This commit is contained in:
1 file changed
+24
-4
@@ -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();
|
||||
|
||||
Reference in new issue
Block a user