From 284c4fd3d075d236f9c172280b7ccd6a79b5f45c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Thu, 12 Feb 2015 00:49:20 +0100
Subject: [PATCH] Minor rendering tweaks.

---
 .../opencomputers/models/block/assembler.json | 20 +++++++++----------
 .../li/cil/oc/common/block/Assembler.scala    |  2 +-
 .../li/cil/oc/common/block/ServerRack.scala   |  4 ++++
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/assets/opencomputers/models/block/assembler.json b/src/main/resources/assets/opencomputers/models/block/assembler.json
index a09d6d375..1bbead2f4 100644
--- a/src/main/resources/assets/opencomputers/models/block/assembler.json
+++ b/src/main/resources/assets/opencomputers/models/block/assembler.json
@@ -10,11 +10,11 @@
             "to": [ 16, 7, 16 ],
             "faces": {
                 "up":    { "uv": [ 0, 0, 16, 16 ], "texture": "#top" },
-                "down":  { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom" },
-                "north": { "uv": [ 0, 0, 16, 7 ], "texture": "#side" },
-                "south": { "uv": [ 0, 0, 16, 7 ], "texture": "#side" },
-                "west":  { "uv": [ 0, 0, 16, 7 ], "texture": "#side" },
-                "east":  { "uv": [ 0, 0, 16, 7 ], "texture": "#side" }
+                "down":  { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" },
+                "north": { "uv": [ 0, 0, 16, 7 ], "texture": "#side", "cullface": "north" },
+                "south": { "uv": [ 0, 0, 16, 7 ], "texture": "#side", "cullface": "south" },
+                "west":  { "uv": [ 0, 0, 16, 7 ], "texture": "#side", "cullface": "west" },
+                "east":  { "uv": [ 0, 0, 16, 7 ], "texture": "#side", "cullface": "east" }
             }
         },
         {   "from": [ 2, 7, 2 ],
@@ -31,12 +31,12 @@
         {   "from": [ 0, 9, 0 ],
             "to": [ 16, 16, 16 ],
             "faces": {
-                "up":    { "uv": [ 0, 0, 16, 16 ], "texture": "#top" },
+                "up":    { "uv": [ 0, 0, 16, 16 ], "texture": "#top", "cullface": "up" },
                 "down":  { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom" },
-                "north": { "uv": [ 0, 9, 16, 16 ], "texture": "#side" },
-                "south": { "uv": [ 0, 9, 16, 16 ], "texture": "#side" },
-                "west":  { "uv": [ 0, 9, 16, 16 ], "texture": "#side" },
-                "east":  { "uv": [ 0, 9, 16, 16 ], "texture": "#side" }
+                "north": { "uv": [ 0, 9, 16, 16 ], "texture": "#side", "cullface": "north" },
+                "south": { "uv": [ 0, 9, 16, 16 ], "texture": "#side", "cullface": "south" },
+                "west":  { "uv": [ 0, 9, 16, 16 ], "texture": "#side", "cullface": "west" },
+                "east":  { "uv": [ 0, 9, 16, 16 ], "texture": "#side", "cullface": "east" }
             }
         }
     ]
diff --git a/src/main/scala/li/cil/oc/common/block/Assembler.scala b/src/main/scala/li/cil/oc/common/block/Assembler.scala
index cbad9e7cb..49a1d3dc9 100644
--- a/src/main/scala/li/cil/oc/common/block/Assembler.scala
+++ b/src/main/scala/li/cil/oc/common/block/Assembler.scala
@@ -14,7 +14,7 @@ class Assembler extends SimpleBlock with traits.PowerAcceptor with traits.StateA
 
   override def isOpaqueCube = false
 
-  override def isVisuallyOpaque = super.isVisuallyOpaque
+  override def isFullCube = false
 
   override def isBlockSolid(world: IBlockAccess, pos: BlockPos, side: EnumFacing) = side == EnumFacing.DOWN || side == EnumFacing.UP
 
diff --git a/src/main/scala/li/cil/oc/common/block/ServerRack.scala b/src/main/scala/li/cil/oc/common/block/ServerRack.scala
index 4ad4cbeda..0959f6606 100644
--- a/src/main/scala/li/cil/oc/common/block/ServerRack.scala
+++ b/src/main/scala/li/cil/oc/common/block/ServerRack.scala
@@ -30,6 +30,10 @@ class ServerRack extends RedstoneAware with traits.PowerAcceptor with traits.Rot
     }
   }
 
+  override def isOpaqueCube = false
+
+  override def isFullCube = false
+
   override def isBlockSolid(world: IBlockAccess, pos: BlockPos, side: EnumFacing) = side == EnumFacing.SOUTH
 
   override def isSideSolid(world: IBlockAccess, pos: BlockPos, side: EnumFacing) = toLocal(world, pos, side) != EnumFacing.SOUTH