Fix WAILA compat. Update to WAILA 1.5.8a. Fix stair block descriptions.

src/main/java/com/cricketcraft/chisel/Chisel.java

@@ -138,7 +138,7 @@ public class Chisel {
 		MinecraftForge.EVENT_BUS.register(this);
 		FMLCommonHandler.instance().bus().register(instance);
 
-		FMLInterModComms.sendMessage("Waila", "register", "com.cricketcraft.chisel.Waila.register");
+		FMLInterModComms.sendMessage("Waila", "register", "com.cricketcraft.chisel.compat.WailaCompat.register");
 	}
 
 	private void registerWorldgen(Features feature, Block block, int amount) {

src/main/java/com/cricketcraft/chisel/block/BlockCarvableStairs.java

@@ -89,6 +89,6 @@ public class BlockCarvableStairs extends BlockStairs implements ICarvable {
 
 	@Override
 	public CarvableVariation getVariation(int metadata) {
-		return carverHelper.getVariation(metadata);
+		return carverHelper.getVariation(blockMeta + (metadata / 8));
 	}
 }

src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java

@@ -296,11 +296,7 @@ public class CarvableHelper {
 		if (forbidChiseling)
 			return;
 
-		if (variation.block == null) {
-			Carving.chisel.addVariation(name, block, blockMeta, variation.metadata);
-		} else {
-			Carving.chisel.addVariation(name, variation.block, variation.blockMeta, variation.metadata);
-		}
+		Carving.chisel.addVariation(name, block, blockMeta, variation.metadata);
 	}
 
 	public void registerBlockIcons(String modName, Block block, IIconRegister register) {

src/main/java/com/cricketcraft/chisel/compat/WailaCompat.java

@@ -6,11 +6,18 @@ import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
 import mcp.mobius.waila.api.IWailaRegistrar;
+import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
 
-import com.cricketcraft.chisel.block.BlockCarvable;
+import com.cricketcraft.chisel.api.ICarvable;
 
-public class Waila implements IWailaDataProvider {
+public class WailaCompat implements IWailaDataProvider {
+
+	private WailaCompat() {
+	}
 
 	@Override
 	public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler configHandler) {
@@ -24,8 +31,8 @@ public class Waila implements IWailaDataProvider {
 
 	@Override
 	public List<String> getWailaBody(ItemStack stack, List<String> strings, IWailaDataAccessor accessor, IWailaConfigHandler configHandler) {
-		if (accessor.getBlock() instanceof BlockCarvable) {
-			BlockCarvable block = (BlockCarvable) accessor.getBlock();
+		if (accessor.getBlock() instanceof ICarvable) {
+			ICarvable block = (ICarvable) accessor.getBlock();
 			strings.add(block.getVariation(accessor.getMetadata()).getDescription());
 		}
 		return strings;
@@ -36,8 +43,12 @@ public class Waila implements IWailaDataProvider {
 		return strings;
 	}
 
+	@Override
+	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
+		return tag;
+	}
+
 	public static void register(IWailaRegistrar registrar) {
-		Waila instance = new Waila();
-		registrar.registerBodyProvider(instance, BlockCarvable.class);
+		registrar.registerBodyProvider(new WailaCompat(), ICarvable.class);
 	}
 }