From 82a6c90c8ce93c99de4720a3e977c58fab27ff73 Mon Sep 17 00:00:00 2001
From: Fenn <pokefenn@googlemail.com>
Date: Mon, 12 May 2014 15:10:22 +0100
Subject: [PATCH] 1.5.4c, fixed a crash bug

---
 .../info/jbcs/minecraft/chisel/Chisel.java    |  3 +--
 .../chisel/block/BlockMarbleIce.java          | 25 +++----------------
 .../chisel/carving/CarvableHelper.java        | 15 ++++++++---
 src/main/resources/mcmod.info                 |  4 +--
 4 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java
index 65afeacb..958ab1fc 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java
@@ -37,7 +37,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.GameRegistry.Type;
 
 
-@Mod(modid = "chisel", name = "Chisel", version = "1.5.4b")
+@Mod(modid = "chisel", name = "Chisel", version = "1.5.4c")
 public class Chisel
 {
     public static ItemChisel chisel;
@@ -50,7 +50,6 @@ public class Chisel
     public static CreativeTabs tabChisel;
 
     public static boolean configExists;
-    public static boolean dropIceShards;
     public static boolean oldPillars;
     public static boolean disableCTM;
     public static double concreteVelocity;
diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java
index 14f0d2c3..fccef061 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java
@@ -60,12 +60,10 @@ public class BlockMarbleIce extends BlockIce implements ICarvable
     @Override
     public void harvestBlock(World par1World, EntityPlayer par2EntityPlayer, int par3, int par4, int par5, int par6)
     {
-        if(!Chisel.dropIceShards)
-        {
-            super.harvestBlock(par1World, par2EntityPlayer, par3, par4, par5, par6);
-            return;
-        }
+        super.harvestBlock(par1World, par2EntityPlayer, par3, par4, par5, par6);
+        return;
 
+        /*
         par2EntityPlayer.addStat(StatList.mineBlockStatArray[Block.getIdFromBlock(this)], 1);
         par2EntityPlayer.addExhaustion(0.025F);
 
@@ -80,23 +78,8 @@ public class BlockMarbleIce extends BlockIce implements ICarvable
             {
                 this.dropBlockAsItem(par1World, par3, par4, par5, itemstack);
             }
-        } else
-        {
-            int i1 = EnchantmentHelper.getFortuneModifier(par2EntityPlayer);
-            this.dropBlockAsItem(par1World, par3, par4, par5, par6, i1);
         }
-    }
-
-    @Override
-    public Item getItemDropped(int par1, Random par2Random, int par3)
-    {
-        return Chisel.dropIceShards ? Chisel.itemIceshard : null;
-    }
-
-    @Override
-    public int quantityDropped(Random par1Random)
-    {
-        return Chisel.dropIceShards ? 1 + par1Random.nextInt(5) : 0;
+        */
     }
 
     @Override
diff --git a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java
index f1a69939..668488f4 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java
@@ -15,6 +15,7 @@ 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;
@@ -58,6 +59,11 @@ public class CarvableHelper
         addVariation(description, metadata, null, bb, blockMeta);
     }
 
+    public void addVariation(String description, int metadata, Block bb, int blockMeta, Material material)
+    {
+        addVariation(description, metadata, null, bb, blockMeta);
+    }
+
     public void addVariation(String description, int metadata, String texture)
     {
         addVariation(description, metadata, texture, null, 0);
@@ -68,8 +74,10 @@ public class CarvableHelper
         if(variations.size() >= 16)
             return;
 
-        if(blockName == null && block != null) blockName = block.getLocalizedName();
-        else if(blockName == null && description != null) blockName = description;
+        if(blockName == null && block != null)
+            blockName = block.getLocalizedName();
+        else if(blockName == null && description != null)
+            blockName = description;
 
         CarvableVariation variation = new CarvableVariation();
         variation.description = description;
@@ -322,7 +330,8 @@ public class CarvableHelper
         LanguageRegistry.addName(new ItemStack(block, 1, blockMeta), Chisel.blockDescriptions ? variation.blockName : variation.description);
         //TODO Multipart registry goes here
 
-        if(forbidChiseling) return;
+        if(forbidChiseling)
+            return;
 
         if(variation.block == null)
         {
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index 1d1c97ee..631c7d4a 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -3,13 +3,13 @@
   "modid": "chisel",
   "name": "Chisel",
   "description": "A mod that adds in many fancy blocks for decoration, which are crafted utilising the Chisel.",
-  "version": "1.5.4b",
+  "version": "1.5.4c",
   "credits": "This mod uses a lot of textures from the Painterly pack: http://painterlypack.net/. Also one stone variation is designed to look like a block from Doku.",
   "logoFile": "",
   "mcversion": "1.7.2",
   "url": "",
   "updateUrl": "",
-  "authors": [ "AUTOMATIC_MAIDEN", "asiekierka", "Pokefenn" ],
+  "authors": [ "AUTOMATIC_MAIDEN", "Pokefenn" ],
   "parent":"",
   "screenshots": [],
   "dependencies": []