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

Merge branch 'master' of github.com:MightyPirates/OpenComputers into one-three

Browse Source 
Conflicts:
	build.properties
This commit is contained in:
Florian Nücke 2014-05-27 22:43:43 +02:00
commit a2182c7d8e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,6 +104,9 @@ class ClassTransformer extends IClassTransformer {
} }
val template = classNodeFor("li/cil/oc/common/asm/template/SimpleEnvironment") val template = classNodeFor("li/cil/oc/common/asm/template/SimpleEnvironment")
if (template == null) {
throw new InjectionFailedException("Could not find SimpleComponent template!")
}
def inject(methodName: String, signature: String, required: Boolean = false) { def inject(methodName: String, signature: String, required: Boolean = false) {
def filter(method: MethodNode) = method.name == methodName && method.desc == signature def filter(method: MethodNode) = method.name == methodName && method.desc == signature
@ -198,8 +201,8 @@ class ClassTransformer extends IClassTransformer {
else { else {
val nameObfed = FMLDeobfuscatingRemapper.INSTANCE.unmap(name).replace('/', '.') val nameObfed = FMLDeobfuscatingRemapper.INSTANCE.unmap(name).replace('/', '.')
val bytes = loader.getClassBytes(nameObfed) val bytes = loader.getClassBytes(nameObfed)
if (bytes == null) throw new ClassNotFoundException(namePlain) if (bytes == null) null
newClassNode(bytes) else newClassNode(bytes)
} }
} }