From e5efdb7d02bd973bc4ed187d5fcc5ab81f860d35 Mon Sep 17 00:00:00 2001
From: tterrag1098 <tterrag1098@gmail.com>
Date: Thu, 28 May 2015 14:19:43 -0400
Subject: [PATCH] Fix column rendering crashing

---
 .../chisel/api/rendering/RenderBlocksCTM.java   |  6 +-----
 .../api/rendering/RenderBlocksColumn.java       | 17 ++++++++++-------
 .../chisel/api/rendering/TextureType.java       |  3 ++-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/cricketcraft/chisel/api/rendering/RenderBlocksCTM.java b/src/main/java/com/cricketcraft/chisel/api/rendering/RenderBlocksCTM.java
index fd65f34f..06be57d3 100644
--- a/src/main/java/com/cricketcraft/chisel/api/rendering/RenderBlocksCTM.java
+++ b/src/main/java/com/cricketcraft/chisel/api/rendering/RenderBlocksCTM.java
@@ -163,7 +163,7 @@ public class RenderBlocksCTM extends RenderBlocks {
 		renderMaxX = renderMaxY = renderMaxZ = 1;
 	}
 
-	protected Tessellator tessellator;
+	protected Tessellator tessellator = Tessellator.instance;
 	protected double minU, maxU;
 	protected double minV, maxV;
 	protected int[] lightingCache = new int[4];
@@ -188,13 +188,9 @@ public class RenderBlocksCTM extends RenderBlocks {
 		by = y;
 		bz = z;
 
-		tessellator = Tessellator.instance;
 		tessellator.setColorOpaque_F(1.0F, 1.0F, 1.0F);
-
 		tessellator.addTranslation(x, y, z);
-
 		boolean res = super.renderStandardBlock(block, x, y, z);
-
 		tessellator.addTranslation(-x, -y, -z);
 
 		return res;
diff --git a/src/main/java/com/cricketcraft/chisel/api/rendering/RenderBlocksColumn.java b/src/main/java/com/cricketcraft/chisel/api/rendering/RenderBlocksColumn.java
index 39fc036c..051d9086 100644
--- a/src/main/java/com/cricketcraft/chisel/api/rendering/RenderBlocksColumn.java
+++ b/src/main/java/com/cricketcraft/chisel/api/rendering/RenderBlocksColumn.java
@@ -124,32 +124,35 @@ public class RenderBlocksColumn extends RenderBlocks {
 
 	@Override
 	public void renderFaceXNeg(Block block, double x, double y, double z, IIcon icon) {
-		super.renderFaceXNeg(block, x, y, z, sides[4]);
+		super.renderFaceXNeg(block, x, y, z, getIcon(icon, 4));
 	}
 
 	@Override
 	public void renderFaceXPos(Block block, double x, double y, double z, IIcon icon) {
-		super.renderFaceXPos(block, x, y, z, sides[5]);
+		super.renderFaceXPos(block, x, y, z, getIcon(icon, 5));
 	}
 
 	@Override
 	public void renderFaceZNeg(Block block, double x, double y, double z, IIcon icon) {
-		super.renderFaceZNeg(block, x, y, z, sides[2]);
+		super.renderFaceZNeg(block, x, y, z, getIcon(icon, 2));
 	}
 
 	@Override
 	public void renderFaceZPos(Block block, double x, double y, double z, IIcon icon) {
-		super.renderFaceZPos(block, x, y, z, sides[3]);
+		super.renderFaceZPos(block, x, y, z, getIcon(icon, 3));
 	}
 
 	@Override
 	public void renderFaceYNeg(Block block, double x, double y, double z, IIcon icon) {
-		super.renderFaceYNeg(block, x, y, z, sides[0]);
+		super.renderFaceYNeg(block, x, y, z, getIcon(icon, 0));
 	}
 
 	@Override
 	public void renderFaceYPos(Block block, double x, double y, double z, IIcon icon) {
-		super.renderFaceYPos(block, x, y, z, sides[1]);
+		super.renderFaceYPos(block, x, y, z, getIcon(icon, 1));
 	}
 
-}
+	private IIcon getIcon(IIcon defaultIcon, int side) {
+		return sides[side] == null ? defaultIcon : sides[side];
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/cricketcraft/chisel/api/rendering/TextureType.java b/src/main/java/com/cricketcraft/chisel/api/rendering/TextureType.java
index 71559479..fa8770ae 100644
--- a/src/main/java/com/cricketcraft/chisel/api/rendering/TextureType.java
+++ b/src/main/java/com/cricketcraft/chisel/api/rendering/TextureType.java
@@ -60,6 +60,7 @@ public enum TextureType {
 		}
 	},
 	CTMV("ctmv", "top"){
+				
 		@Override
 		protected Object registerIcons(ICarvingVariation variation, String modName, String texturePath, IIconRegister register) {
 			return Pair.of(new TextureSubmap(register.registerIcon(modName + ":" + texturePath + "-ctmv"), 2, 2), register.registerIcon(modName + ":" + texturePath + "-top"));
@@ -364,7 +365,7 @@ public enum TextureType {
 	protected RenderBlocks createRenderContext(RenderBlocks rendererOld, IBlockAccess world, Object cachedObject) {
 		return rendererOld;
 	}
-
+	
 	public static TextureType getTypeFor(CarvableHelper inst, String modid, String path) {
 		if (path == null) {
 			return CUSTOM;