diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java index a90eb314..02ff43c2 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java @@ -609,7 +609,7 @@ class AnnotatedMixin { } if (targetMember.isField()) { - ObfuscationData obfFieldData = this.mixins.getObfField(targetMember.toSrg()); + ObfuscationData obfFieldData = this.getObfFieldRecursive(targetMember); if (obfFieldData.isEmpty()) { this.mixins.printMessage(Kind.WARNING, "Cannot find field mapping for @At(" + key + ") '" + target + "'", element, inject); return false; @@ -627,6 +627,32 @@ class AnnotatedMixin { return true; } + private ObfuscationData getObfFieldRecursive(MemberInfo targetMember) { + ObfuscationData targetNames = this.mixins.getObfClass(targetMember.owner); + ObfuscationData obfFieldData = this.mixins.getObfField(targetMember.toSrg()); + try { + while (obfFieldData.isEmpty()) { + TypeHandle targetType = this.mixins.getTypeHandle(targetMember.owner); + if (targetType == null) { + return obfFieldData; + } + TypeHandle superClass = targetType.getSuperclass(); + if (superClass == null) { + return obfFieldData; + } + targetMember = targetMember.move(superClass.getName()); + obfFieldData = this.mixins.getObfField(targetMember.toSrg()); + if (!obfFieldData.isEmpty()) { + for (ObfuscationType type : obfFieldData) { + obfFieldData.add(type, MemberInfo.fromSrgField(obfFieldData.get(type), "").move(targetNames.get(type)).toSrg()); + } + } + } + } finally { + return obfFieldData; + } + } + /** * Add a field mapping to the local table */ diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java index 2ec444b7..4dbe5d36 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java @@ -344,6 +344,22 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp return data; } + + /** + * Get an obfuscation mapping for a class + */ + public ObfuscationData getObfClass(String className) { + ObfuscationData data = new ObfuscationData(className); + + for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { + String obfClass = targetEnv.getObfClass(className); + if (obfClass != null) { + data.add(targetEnv.getType(), obfClass); + } + } + + return data; + } void addMethodMapping(String className, String reference, ObfuscationData obfMethodData) { for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationData.java b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationData.java index 370569d4..9f062fe2 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationData.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationData.java @@ -31,9 +31,19 @@ import java.util.Map; public class ObfuscationData implements Iterable { private final Map data = new HashMap(); - - public void add(ObfuscationType type, T method) { - this.data.put(type, method); + + private final T defaultValue; + + public ObfuscationData() { + this(null); + } + + public ObfuscationData(T defaultValue) { + this.defaultValue = defaultValue; + } + + public void add(ObfuscationType type, T value) { + this.data.put(type, value); } public boolean isEmpty() { @@ -41,7 +51,8 @@ public class ObfuscationData implements Iterable { } public T get(ObfuscationType type) { - return this.data.get(type); + T value = this.data.get(type); + return value != null ? value : this.defaultValue; } @Override diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java index 231bb344..79aeea51 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java @@ -190,6 +190,16 @@ class TargetObfuscationEnvironment { } return null; } + + /** + * Get an obfuscation mapping for a class + */ + public String getObfClass(String className) { + if (this.initSrgs()) { + return this.srgs.classMap.get(className); + } + return null; + } /** * Write out generated srgs diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TypeHandle.java b/src/ap/java/org/spongepowered/tools/obfuscation/TypeHandle.java index 90fa5725..74cfcb0f 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TypeHandle.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TypeHandle.java @@ -35,6 +35,7 @@ import javax.lang.model.element.PackageElement; import javax.lang.model.element.TypeElement; import javax.lang.model.element.VariableElement; import javax.lang.model.type.DeclaredType; +import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; @@ -145,6 +146,23 @@ public class TypeHandle { public TypeMirror getType() { return this.element != null ? this.element.asType() : null; } + + /** + * Returns the enclosed element's superclass if available, or null if this + * class does not have a superclass + */ + public TypeHandle getSuperclass() { + if (this.element == null) { + return null; + } + + TypeMirror superClass = this.element.getSuperclass(); + if (superClass == null || superClass.getKind() == TypeKind.NONE) { + return null; + } + + return new TypeHandle((DeclaredType)superClass); + } /** * Get whether the element is probably public diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java index 753500cd..1b1cb758 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java @@ -190,6 +190,19 @@ public class MemberInfo { this.matchAll = remapped.matchAll; } + /** + * Initialise a remapped MemberInfo with a new name + * + * @param original Original MemberInfo + * @param owner new owner + */ + private MemberInfo(MemberInfo original, String owner) { + this.owner = owner; + this.name = original.name; + this.desc = original.desc; + this.matchAll = original.matchAll; + } + /* (non-Javadoc) * @see java.lang.Object#toString() */ @@ -210,7 +223,7 @@ public class MemberInfo { */ public String toSrg() { if (!this.isFullyQualified()) { - throw new RuntimeException("Cannot convert unqalified reference to SRG mapping"); + throw new RuntimeException("Cannot convert unqualified reference to SRG mapping"); } if (this.desc.startsWith("(")) { @@ -230,7 +243,7 @@ public class MemberInfo { public MethodData asMethodData() { if (!this.isFullyQualified()) { - throw new RuntimeException("Cannot convert unqalified reference to MethodData"); + throw new RuntimeException("Cannot convert unqualified reference to MethodData"); } if (this.isField()) { @@ -377,6 +390,20 @@ public class MemberInfo { && (ordinal == 0 || this.matchAll); } + /** + * Create a new version of this member with a different owner + * + * @param methodData Method data to use + * @param setOwner True to set the owner as well as the name + * @return New MethodInfo with remapped values + */ + public MemberInfo move(String newOwner) { + if (newOwner.equals(this.owner)) { + return this; + } + return new MemberInfo(this, newOwner); + } + /** * Create a remapped version of this member using the supplied method data *