From 19669b587b29d6210fc521fc98a4f8e1248d02f9 Mon Sep 17 00:00:00 2001
From: Cricket <bcord@me.com>
Date: Fri, 2 Jan 2015 17:26:12 -0500
Subject: [PATCH] EnderIO compat hopefully fixes #9

---
 .../chisel/carving/CarvableHelper.java        | 29 +++++++++----------
 .../chisel/client/render/CTM.java             |  9 +++---
 .../client/render/RenderBlocksColumn.java     |  1 -
 3 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java b/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java
index 330a450c..ece59db9 100644
--- a/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java
+++ b/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java
@@ -1,19 +1,5 @@
 package com.cricketcraft.chisel.carving;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockPane;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-
 import com.cricketcraft.chisel.Chisel;
 import com.cricketcraft.chisel.Configurations;
 import com.cricketcraft.chisel.block.BlockMarbleSlab;
@@ -22,8 +8,20 @@ import com.cricketcraft.chisel.client.render.CTM;
 import com.cricketcraft.chisel.client.render.TextureSubmap;
 import com.cricketcraft.chisel.item.ItemCarvable;
 import com.cricketcraft.chisel.utils.GeneralClient;
-
 import cpw.mods.fml.common.registry.GameRegistry;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockPane;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 public class CarvableHelper
 {
@@ -324,7 +322,6 @@ public class CarvableHelper
 
     public void registerVariation(String name, CarvableVariation variation, Block block, int blockMeta)
     {
-        //TODO Multipart registry goes here
         if(forbidChiseling)
             return;
 
diff --git a/src/main/java/com/cricketcraft/chisel/client/render/CTM.java b/src/main/java/com/cricketcraft/chisel/client/render/CTM.java
index 5625749b..218787ca 100644
--- a/src/main/java/com/cricketcraft/chisel/client/render/CTM.java
+++ b/src/main/java/com/cricketcraft/chisel/client/render/CTM.java
@@ -1,10 +1,9 @@
 package com.cricketcraft.chisel.client.render;
 
+import com.cricketcraft.chisel.api.IFacade;
 import net.minecraft.block.Block;
 import net.minecraft.world.IBlockAccess;
 
-import com.cricketcraft.chisel.api.IFacade;
-
 public class CTM
 {
     static int submaps[][] = {
@@ -260,7 +259,7 @@ public class CTM
         return texture;
     }
 
-    private static boolean isConnected(IBlockAccess world, int x, int y, int z, int side, Block block, int meta)
+    protected static boolean isConnected(IBlockAccess world, int x, int y, int z, int side, Block block, int meta)
     {
         int x2 = x, y2 = y, z2 = z;
 
@@ -291,7 +290,7 @@ public class CTM
         return getBlockOrFacade(world, x, y, z, side).equals(block) && getBlockOrFacadeMetadata(world, x, y, z, side) == meta && (!getBlockOrFacade(world, x2, y2, z2, side).equals(block) || getBlockOrFacadeMetadata(world, x2, y2, z2, side) != meta);
     }
 
-    private static int getBlockOrFacadeMetadata(IBlockAccess world, int x, int y, int z, int side) {
+    protected static int getBlockOrFacadeMetadata(IBlockAccess world, int x, int y, int z, int side) {
       Block blk = world.getBlock(x, y, z);
       if(blk instanceof IFacade) {
         return ((IFacade)blk).getFacadeMetadata(world, x, y, z, side);
@@ -299,7 +298,7 @@ public class CTM
       return world.getBlockMetadata(x, y, z);
     }
 
-    private static Block getBlockOrFacade(IBlockAccess world, int x, int y, int z, int side) {
+    protected static Block getBlockOrFacade(IBlockAccess world, int x, int y, int z, int side) {
       Block blk = world.getBlock(x, y, z);
       if(blk instanceof IFacade) {
         blk = ((IFacade)blk).getFacade(world, x, y, z, side);
diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RenderBlocksColumn.java b/src/main/java/com/cricketcraft/chisel/client/render/RenderBlocksColumn.java
index d2fa1d02..47cdcd29 100644
--- a/src/main/java/com/cricketcraft/chisel/client/render/RenderBlocksColumn.java
+++ b/src/main/java/com/cricketcraft/chisel/client/render/RenderBlocksColumn.java
@@ -19,7 +19,6 @@ public class RenderBlocksColumn extends RenderBlocks
     boolean connected(IBlockAccess world, int x, int y, int z, Block block, int meta)
     {
         return world.getBlock(x, y, z).equals(block) && world.getBlockMetadata(x, y, z) == meta;
-
     }
 
     @Override