From bb5a3c6900fb68aadd4868e26aaee2d41b75c5e3 Mon Sep 17 00:00:00 2001 From: asie Date: Thu, 13 Dec 2018 17:59:02 +0100 Subject: [PATCH] [Fabric] Write all descriptors which were remapped, regardless of whether or not they are actually different --- .../obfuscation/ObfuscationEnvironment.java | 7 ++++--- .../asm/bridge/RemapperAdapter.java | 3 ++- .../asm/mixin/refmap/ReferenceMapper.java | 3 --- .../spongepowered/asm/util/ObfuscationUtil.java | 16 ++++++++++++---- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationEnvironment.java b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationEnvironment.java index 8cf91fc3..d8005e5e 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationEnvironment.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationEnvironment.java @@ -248,7 +248,7 @@ public abstract class ObfuscationEnvironment implements IObfuscationEnvironment return mapping.move(remappedOwner); } String desc = ObfuscationUtil.mapDescriptor(mapping.getDesc(), this.remapper); - return new MappingMethod(remappedOwner, mapping.getSimpleName(), desc); + return new MappingMethod(remappedOwner, mapping.getSimpleName(), desc != null ? desc : mapping.getDesc()); } return null; } @@ -275,7 +275,7 @@ public abstract class ObfuscationEnvironment implements IObfuscationEnvironment String desc = method.getDesc(); if (desc != null) { String newDesc = ObfuscationUtil.mapDescriptor(method.getDesc(), this.remapper); - if (!newDesc.equals(method.getDesc())) { + if (newDesc != null) { desc = newDesc; transformed = true; } @@ -293,7 +293,8 @@ public abstract class ObfuscationEnvironment implements IObfuscationEnvironment */ @Override public String remapDescriptor(String desc) { - return ObfuscationUtil.mapDescriptor(desc, this.remapper); + String newDesc = ObfuscationUtil.mapDescriptor(desc, this.remapper); + return newDesc != null ? newDesc : desc; } /** diff --git a/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapter.java b/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapter.java index 82d8e8f4..5d125ae8 100644 --- a/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapter.java +++ b/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapter.java @@ -92,7 +92,8 @@ public abstract class RemapperAdapter implements IRemapper, IClassRemapper { @Override public String unmapDesc(String desc) { - return ObfuscationUtil.unmapDescriptor(desc, this); + String newDesc = ObfuscationUtil.unmapDescriptor(desc, this); + return newDesc != null ? newDesc : desc; } } diff --git a/src/main/java/org/spongepowered/asm/mixin/refmap/ReferenceMapper.java b/src/main/java/org/spongepowered/asm/mixin/refmap/ReferenceMapper.java index 242069c6..924d7651 100644 --- a/src/main/java/org/spongepowered/asm/mixin/refmap/ReferenceMapper.java +++ b/src/main/java/org/spongepowered/asm/mixin/refmap/ReferenceMapper.java @@ -220,9 +220,6 @@ public final class ReferenceMapper implements IReferenceMapper, Serializable { return null; } String conformedReference = reference.replaceAll("\\s", ""); - if (conformedReference.equals(newReference)) { - return null; - } Map> mappings = this.mappings; if (context != null) { mappings = this.data.get(context); diff --git a/src/main/java/org/spongepowered/asm/util/ObfuscationUtil.java b/src/main/java/org/spongepowered/asm/util/ObfuscationUtil.java index 02160f6a..b82f7393 100644 --- a/src/main/java/org/spongepowered/asm/util/ObfuscationUtil.java +++ b/src/main/java/org/spongepowered/asm/util/ObfuscationUtil.java @@ -24,6 +24,8 @@ */ package org.spongepowered.asm.util; +import java.util.Optional; + /** * Utility methods for obfuscation tasks */ @@ -79,12 +81,18 @@ public abstract class ObfuscationUtil { private static String remapDescriptor(String desc, IClassRemapper remapper, boolean unmap) { StringBuilder sb = new StringBuilder(); StringBuilder token = null; + boolean remapped = false; for (int pos = 0; pos < desc.length(); pos++) { char c = desc.charAt(pos); if (token != null) { if (c == ';') { - sb.append('L').append(ObfuscationUtil.remap(token.toString(), remapper, unmap)).append(';'); + String tokenStr = token.toString(); + Optional remappedStr = ObfuscationUtil.remap(tokenStr, remapper, unmap); + if (remappedStr.isPresent()) { + remapped = true; + } + sb.append('L').append(remappedStr.orElse(tokenStr)).append(';'); token = null; } else { token.append(c); @@ -102,12 +110,12 @@ public abstract class ObfuscationUtil { throw new IllegalArgumentException("Invalid descriptor '" + desc + "', missing ';'"); } - return sb.toString(); + return remapped ? sb.toString() : null; } - private static Object remap(String typeName, IClassRemapper remapper, boolean unmap) { + private static Optional remap(String typeName, IClassRemapper remapper, boolean unmap) { String result = unmap ? remapper.unmap(typeName) : remapper.map(typeName); - return result != null ? result : typeName; + return Optional.ofNullable(result); } }