AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-17 11:15:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed SimpleComponent injection not working.

Browse Source
This commit is contained in:
Vexatos 2017-09-01 16:15:42 +02:00
parent c6e43d3031
commit a98019bac9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala
View File

@ -297,7 +297,7 @@ class ClassTransformer extends IClassTransformer {
val mapper = FMLDeobfuscatingRemapper.INSTANCE val mapper = FMLDeobfuscatingRemapper.INSTANCE
def filter(method: MethodNode) = { def filter(method: MethodNode) = {
val descDeObf = mapper.mapMethodDesc(method.desc) 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 areSamePlain = method.name + descDeObf == methodName + desc
val areSameDeObf = methodNameDeObf + descDeObf == methodNameSrg + desc val areSameDeObf = methodNameDeObf + descDeObf == methodNameSrg + desc
areSamePlain || areSameDeObf areSamePlain || areSameDeObf
@ -353,7 +353,7 @@ class ClassTransformer extends IClassTransformer {
if (classNode == null) false if (classNode == null) false
else { else {
log.trace(s"Checking if class ${classNode.name} is a TileEntity...") 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))) (classNode.superName != null && isTileEntity(classNodeFor(classNode.superName)))
} }
} }