From 63798d6a8fe33f0c114158d4758c1a4c13987c4d Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 27 Jan 2016 14:37:08 +0000 Subject: [PATCH] Fix ASM SignatureReader choking on lambda signatures generated by JDT --- .../transformers/deobf/FMLDeobfuscatingRemapper.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/net/minecraftforge/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java b/src/main/java/net/minecraftforge/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java index 43de7d9e95..fcf04f4ca6 100644 --- a/src/main/java/net/minecraftforge/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java +++ b/src/main/java/net/minecraftforge/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java @@ -313,6 +313,17 @@ public class FMLDeobfuscatingRemapper extends Remapper { String methodDescriptor = name+desc; return methodMap!=null && methodMap.containsKey(methodDescriptor) ? methodMap.get(methodDescriptor) : name; } + + @Override + public String mapSignature(String signature, boolean typeSignature) + { + // JDT decorates some lambdas with this and SignatureReader chokes on it + if (signature != null && signature.contains("!*")) + { + return null; + } + return super.mapSignature(signature, typeSignature); + } private Map getFieldMap(String className) {