AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-10-02 01:24:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8

Browse Source
This commit is contained in:
Florian Nücke 2015-02-20 02:31:33 +01:00
commit a8b8b82f96
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/main/resources/assets/opencomputers/models/item/chunkLoaderUpgrade.json → src/main/resources/assets/opencomputers/models/item/chunkloaderUpgrade.json
View File

2
src/main/scala/li/cil/oc/client/renderer/TextBufferRenderCache.scala
View File

@ -62,7 +62,6 @@ object TextBufferRenderCache extends Callable[Int] with RemovalListener[TileEnti
GL11.glEndList()
RenderState.checkError(getClass.getName + ".compileOrDraw: glEndList")
}
RenderState.checkError(getClass.getName + ".compileOrDraw: leaving")
@ -71,6 +70,7 @@ object TextBufferRenderCache extends Callable[Int] with RemovalListener[TileEnti
}
else {
GL11.glCallList(list)
RenderState.bindTexture(0)
RenderState.checkError(getClass.getName + ".compileOrDraw: glCallList")
}

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

@ -183,7 +183,7 @@ class ClassTransformer extends IClassTransformer {
// if (entity instanceof Drone) {
// d5 = 0.0;
// d6 = 0.0;
// d7 = -0.75;
// d7 = -0.25;
// }
// before the `instanceof EntityHanging` check in func_110827_b.
if (ObfNames.Class_RenderLiving.contains(name.replace('.', '/'))) {
@ -202,7 +202,7 @@ class ClassTransformer extends IClassTransformer {
toInject.add(new VarInsnNode(Opcodes.DSTORE, 17))
toInject.add(new LdcInsnNode(double2Double(0.0)))
toInject.add(new VarInsnNode(Opcodes.DSTORE, 19))
toInject.add(new LdcInsnNode(double2Double(-0.75)))
toInject.add(new LdcInsnNode(double2Double(-0.25)))
toInject.add(new VarInsnNode(Opcodes.DSTORE, 21))
toInject.add(skip)
instructions.insertBefore(varNode, toInject)