From f0a5945fc3c8b910ba8a675a8931aa3db02359f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Sat, 8 Mar 2014 23:08:49 +0100 Subject: [PATCH] fixed class name lookup in class transformer when deobfed-to-srg --- src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala | 6 +----- 1 file changed, 1 insertion(+), 5 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 5b2b1ed4d..098253729 100644 --- a/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala +++ b/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala @@ -131,11 +131,7 @@ class ClassTransformer extends IClassTransformer { writeClass(classNode, ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES) } - val tileEntityName = { - (try classOf[TileEntity] catch { - case _: Throwable => loader.findClass("net.minecraft.tileentity.TileEntity") // Dev env? - }).getName.replace('.', '/') - } + val tileEntityName = FMLDeobfuscatingRemapper.INSTANCE.map("net.minecraft.tileentity.TileEntity").replace('.', '/') def isTileEntity(classNode: ClassNode): Boolean = { classNode.name != "java/lang/Object" && (classNode.name == tileEntityName || isTileEntity(classNodeFor(classNode.superName)))