From 82be46c7b8e0e7efd6fd582d077196d1410b1886 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Tue, 27 May 2014 21:19:18 +0200 Subject: [PATCH] Fixed the fix... --- build.properties | 2 +- src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build.properties b/build.properties index 7eac0a83a..bf2c87b39 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ minecraft.version=1.6.4 forge.version=9.11.1.964 -oc.version=1.2.11 +oc.version=1.2.12 ccl.version=1.0.0.62 fmp.version=1.0.0.250 maven.url=file:///var/www/users/fnuecke/maven.cil.li \ No newline at end of file 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 9c2e28489..2250eb21d 100644 --- a/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala +++ b/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala @@ -104,6 +104,9 @@ class ClassTransformer extends IClassTransformer { } 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 filter(method: MethodNode) = method.name == methodName && method.desc == signature @@ -198,8 +201,8 @@ class ClassTransformer extends IClassTransformer { else { val nameObfed = FMLDeobfuscatingRemapper.INSTANCE.unmap(name).replace('/', '.') val bytes = loader.getClassBytes(nameObfed) - if (bytes == null) throw new ClassNotFoundException(namePlain) - newClassNode(bytes) + if (bytes == null) null + else newClassNode(bytes) } }