From a98019bac94e2669239e5f8d8d475bc02c4fe605 Mon Sep 17 00:00:00 2001 From: Vexatos Date: Fri, 1 Sep 2017 16:15:42 +0200 Subject: [PATCH] Fixed SimpleComponent injection not working. --- src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala b/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala index 1d8237f3b..312a05add 100644 --- a/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala +++ b/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala @@ -297,7 +297,7 @@ class ClassTransformer extends IClassTransformer { val mapper = FMLDeobfuscatingRemapper.INSTANCE def filter(method: MethodNode) = { val descDeObf = mapper.mapMethodDesc(method.desc) - val methodNameDeObf = mapper.mapMethodName(ObfNames.Class_TileEntity(0), method.name, method.desc) + val methodNameDeObf = mapper.mapMethodName(mapper.unmap(ObfNames.Class_TileEntity(0)), method.name, method.desc) val areSamePlain = method.name + descDeObf == methodName + desc val areSameDeObf = methodNameDeObf + descDeObf == methodNameSrg + desc areSamePlain || areSameDeObf @@ -353,7 +353,7 @@ class ClassTransformer extends IClassTransformer { if (classNode == null) false else { log.trace(s"Checking if class ${classNode.name} is a TileEntity...") - ObfNames.Class_TileEntity.contains(classNode.name) || + ObfNames.Class_TileEntity.contains(FMLDeobfuscatingRemapper.INSTANCE.map(classNode.name)) || (classNode.superName != null && isTileEntity(classNodeFor(classNode.superName))) } }