From 4b7b5a05f4b155e99502dce250ee77a9f7a658b0 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Mon, 20 Mar 2017 13:05:29 +0000 Subject: [PATCH] Resolve obf mappings in interfaces as well as superclasses, fixes #171 --- .../AnnotatedMixinElementHandler.java | 2 +- .../AnnotatedMixinElementHandlerInjector.java | 4 +- ...atedMixinElementHandlerSoftImplements.java | 2 +- .../tools/obfuscation/ObfuscationData.java | 17 ++++- .../obfuscation/ObfuscationDataProvider.java | 66 ++++++++++++++----- 5 files changed, 71 insertions(+), 20 deletions(-) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java index 78a1018f..408614c0 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java @@ -469,7 +469,7 @@ abstract class AnnotatedMixinElementHandler { ObfuscationData stripped = new ObfuscationData(); for (ObfuscationType type : data) { T mapping = data.get(type); - stripped.add(type, mapping.move(null)); + stripped.put(type, mapping.move(null)); } return stripped; } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandlerInjector.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandlerInjector.java index d837496a..d6c7ce4b 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandlerInjector.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandlerInjector.java @@ -248,9 +248,9 @@ class AnnotatedMixinElementHandlerInjector extends AnnotatedMixinElementHandler for (ObfuscationType type : remapped) { MappingMethod mapping = remapped.get(type); if (desc == null) { - mappings.add(type, mapping.getOwner()); + mappings.put(type, mapping.getOwner()); } else { - mappings.add(type, mapping.getDesc().replace(")V", ")L" + mapping.getOwner() + ";")); + mappings.put(type, mapping.getDesc().replace(")V", ")L" + mapping.getOwner() + ";")); } } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandlerSoftImplements.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandlerSoftImplements.java index 4b208618..537da970 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandlerSoftImplements.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandlerSoftImplements.java @@ -176,7 +176,7 @@ public class AnnotatedMixinElementHandlerSoftImplements extends AnnotatedMixinEl ObfuscationData prefixed = new ObfuscationData(); for (ObfuscationType type : data) { MappingMethod mapping = data.get(type); - prefixed.add(type, mapping.addPrefix(prefix)); + prefixed.put(type, mapping.addPrefix(prefix)); } return prefixed; } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationData.java b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationData.java index 61500871..9fe4bfe1 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationData.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationData.java @@ -67,12 +67,27 @@ public class ObfuscationData implements Iterable { } /** - * Add an entry to the map + * Add an entry to the map, overwrites any previous entries. Since this + * method name poorly communicates its purpose, it is deprecated in favour + * of {@link #put}. * * @param type obfuscation type * @param value new entry + * + * @deprecated Use {@link #put} instead */ + @Deprecated public void add(ObfuscationType type, T value) { + this.put(type, value); + } + + /** + * Put an entry into this map, replaces any existing entries. + * + * @param type obfuscation type + * @param value entry + */ + public void put(ObfuscationType type, T value) { this.data.put(type, value); } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationDataProvider.java b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationDataProvider.java index 688409cf..c7d880aa 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationDataProvider.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationDataProvider.java @@ -63,7 +63,6 @@ public class ObfuscationDataProvider implements IObfuscationDataProvider { * org.spongepowered.asm.mixin.injection.struct.MemberInfo) */ @Override - @SuppressWarnings("unchecked") public ObfuscationData getObfEntryRecursive(final MemberInfo targetMember) { MemberInfo currentTarget = targetMember; ObfuscationData obfTargetNames = this.getObfClass(currentTarget.owner); @@ -74,19 +73,25 @@ public class ObfuscationDataProvider implements IObfuscationDataProvider { if (targetType == null) { return obfData; } + TypeHandle superClass = targetType.getSuperclass(); - if (superClass == null) { - return obfData; - } - currentTarget = currentTarget.move(superClass.getName()); - obfData = this.getObfEntry(currentTarget); + obfData = this.getObfEntryUsing(currentTarget, superClass); if (!obfData.isEmpty()) { - for (ObfuscationType type : obfData) { - String obfClass = obfTargetNames.get(type); - T obfMember = obfData.get(type); - obfData.add(type, (T)MemberInfo.fromMapping((IMapping)obfMember).move(obfClass).asMapping()); + return ObfuscationDataProvider.applyParents(obfTargetNames, obfData); + } + + for (TypeHandle iface : targetType.getInterfaces()) { + obfData = this.getObfEntryUsing(currentTarget, iface); + if (!obfData.isEmpty()) { + return ObfuscationDataProvider.applyParents(obfTargetNames, obfData); } } + + if (superClass == null) { + break; + } + + currentTarget = currentTarget.move(superClass.getName()); } } catch (Exception ex) { ex.printStackTrace(); @@ -95,6 +100,20 @@ public class ObfuscationDataProvider implements IObfuscationDataProvider { return obfData; } + /** + * Returns an obf entry for the specified member relocated into the + * specified target class. This is used by {@link #getObfEntryRecursive} to + * searh for matching obf entries in super classes an interfaces. + * + * @param targetMember target member to search for + * @param targetClass new target class to check, if the supplied argument is + * null then an empty dataset is returned + * @return obfuscation data for the relocated member + */ + private ObfuscationData getObfEntryUsing(MemberInfo targetMember, TypeHandle targetClass) { + return targetClass == null ? new ObfuscationData() : this.getObfEntry(targetMember.move(targetClass.getName())); + } + /* (non-Javadoc) * @see org.spongepowered.tools.obfuscation.IObfuscationManager * #getObfEntry( @@ -154,7 +173,7 @@ public class ObfuscationDataProvider implements IObfuscationDataProvider { for (ObfuscationEnvironment env : this.environments) { MappingMethod obfMethod = env.getObfMethod(method); if (obfMethod != null) { - data.add(env.getType(), obfMethod); + data.put(env.getType(), obfMethod); } } @@ -186,7 +205,7 @@ public class ObfuscationDataProvider implements IObfuscationDataProvider { for (ObfuscationEnvironment env : this.environments) { MappingMethod obfMethod = env.getObfMethod(method); if (obfMethod != null) { - data.add(env.getType(), obfMethod); + data.put(env.getType(), obfMethod); } } @@ -208,7 +227,7 @@ public class ObfuscationDataProvider implements IObfuscationDataProvider { for (ObfuscationEnvironment env : this.environments) { MemberInfo obfMethod = env.remapDescriptor(method); if (obfMethod != null) { - data.add(env.getType(), obfMethod.asMethodMapping()); + data.put(env.getType(), obfMethod.asMethodMapping()); } } @@ -248,7 +267,7 @@ public class ObfuscationDataProvider implements IObfuscationDataProvider { if (obfField.getDesc() == null && field.getDesc() != null) { obfField = obfField.transform(env.remapDescriptor(field.getDesc())); } - data.add(env.getType(), obfField); + data.put(env.getType(), obfField); } } @@ -275,11 +294,28 @@ public class ObfuscationDataProvider implements IObfuscationDataProvider { for (ObfuscationEnvironment env : this.environments) { String obfClass = env.getObfClass(className); if (obfClass != null) { - data.add(env.getType(), obfClass); + data.put(env.getType(), obfClass); } } return data; } + /** + * Applies the supplied parent names to the supplied + * + * @param parents parent class names + * @param members members to reparent + * @return members for passthrough + */ + @SuppressWarnings("unchecked") + private static ObfuscationData applyParents(ObfuscationData parents, ObfuscationData members) { + for (ObfuscationType type : members) { + String obfClass = parents.get(type); + T obfMember = members.get(type); + members.put(type, (T)MemberInfo.fromMapping((IMapping)obfMember).move(obfClass).asMapping()); + } + return members; + } + }