diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java index b17d566f..f916003e 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java @@ -198,18 +198,33 @@ class TargetObfuscationEnvironment { * Get an obfuscation mapping for a method */ public SrgMethod getObfMethod(SrgMethod method) { + return this.getObfMethod(method, true); + } + + /** + * Get an obfuscation mapping for a method + */ + public SrgMethod getObfMethod(SrgMethod method, boolean srgOnly) { if (this.initSrgs()) { + boolean remapped = true; SrgMethod originalMethod = method.copy(); SrgMethod methodMapping = this.srgs.getMethodMapping(method); // If no obf mapping, we can attempt to remap the owner class if (methodMapping == null) { + if (srgOnly) { + return null; + } methodMapping = originalMethod; + remapped = false; } String remappedOwner = this.getObfClass(methodMapping.getOwner()); if (remappedOwner == null || remappedOwner.equals(method.getOwner()) || remappedOwner.equals(methodMapping.getOwner())) { - return methodMapping != originalMethod ? methodMapping : null; + return remapped ? methodMapping : null; } - return methodMapping.move(remappedOwner); + if (remapped) { + return methodMapping.move(remappedOwner); + } + return new SrgMethod(remappedOwner, methodMapping.getSimpleName(), ObfuscationUtil.mapDescriptor(methodMapping.getDesc(), this.remapper)); } return null; } @@ -243,16 +258,26 @@ class TargetObfuscationEnvironment { return transformed ? new MemberInfo(method.name, owner, desc, method.matchAll) : null; } - + /** * Get an obfuscation mapping for a field */ public SrgField getObfField(String field) { + return this.getObfField(field, true); + } + + /** + * Get an obfuscation mapping for a field + */ + public SrgField getObfField(String field, boolean srgOnly) { if (this.initSrgs()) { SrgField originalField = new SrgField(field); SrgField fieldMapping = this.srgs.getFieldMapping(originalField); // If no obf mapping, we can attempt to remap the owner class if (fieldMapping == null) { + if (srgOnly) { + return null; + } fieldMapping = originalField; } String remappedOwner = this.getObfClass(fieldMapping.getOwner()); diff --git a/src/main/java/org/spongepowered/asm/obfuscation/SrgMethod.java b/src/main/java/org/spongepowered/asm/obfuscation/SrgMethod.java index d1b9c91f..f214129e 100644 --- a/src/main/java/org/spongepowered/asm/obfuscation/SrgMethod.java +++ b/src/main/java/org/spongepowered/asm/obfuscation/SrgMethod.java @@ -36,6 +36,11 @@ public final class SrgMethod { this.desc = desc; } + public SrgMethod(String owner, String simpleName, String desc) { + this.name = SrgMethod.createName(owner, simpleName); + this.desc = desc; + } + public String getName() { return this.name; } @@ -61,7 +66,7 @@ public final class SrgMethod { } public SrgMethod move(String newOwner) { - return new SrgMethod((newOwner != null ? newOwner + "/" : "") + this.getSimpleName(), this.desc); + return new SrgMethod(newOwner, this.getSimpleName(), this.desc); } public SrgMethod copy() { @@ -89,4 +94,8 @@ public final class SrgMethod { return String.format("%s %s", this.name, this.desc); } + private static String createName(String owner, String simpleName) { + return (owner != null ? owner + "/" : "") + simpleName; + } + }