From 0eb517e049e028267b6ce2734475ec69eb622953 Mon Sep 17 00:00:00 2001
From: Mohammad-Ali Minaie <mminaie@bstonetech.com>
Date: Thu, 30 Mar 2017 00:54:29 -0400
Subject: [PATCH] fixed diamond upgrade not mining obsidian

---
 1.11/gradle.properties                                      | 2 +-
 1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java       | 2 +-
 .../java/nmd/primal/forgecraft/items/tools/CustomAxe.java   | 6 +++---
 .../nmd/primal/forgecraft/items/tools/CustomPickaxe.java    | 6 +++---
 .../nmd/primal/forgecraft/items/tools/CustomShovel.java     | 6 +++---
 1.11/src/main/resources/mcmod.info                          | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/1.11/gradle.properties b/1.11/gradle.properties
index c433f4db..a3a0e940 100644
--- a/1.11/gradle.properties
+++ b/1.11/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx3G
 
 mod_group=nmd.primal.forgecraft
 mod_name=ForgeCraft
-mod_version=1.2.05
+mod_version=1.2.06
 forge_version=13.20.0.2226
 mcp_mappings=snapshot_20161220
 mc_version=1.11.2
diff --git a/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java b/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java
index d5375d8a..932298db 100644
--- a/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java
+++ b/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java
@@ -17,7 +17,7 @@ public class ModInfo {
     public static final String MOD_NAME = "Kitsu's ForgeCraft";
     //public static final String MOD_PREFIX = MOD_ID + ":";
     public static final String MOD_CHANNEL = MOD_ID;
-    public static final String MOD_VERSION = "1.2.05";
+    public static final String MOD_VERSION = "1.2.06";
     public static final String MC_VERSIONS = "[1.11.0, 1.12.0)";
     public static final String DEPENDENCIES = "required-after:forge@[13.20.0.2226,);"
             + "after:primal;";
diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomAxe.java b/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomAxe.java
index 8b2a98af..45056db3 100644
--- a/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomAxe.java
+++ b/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomAxe.java
@@ -307,10 +307,10 @@ public class CustomAxe extends ItemAxe implements ToolNBT {
                 if( getEmerald(itemstack)){
                     itemstack.addEnchantment(Enchantment.getEnchantmentByID(33), 1);
                 }
-                /*if( getDiamondLevel(itemstack) > 0 ){
-                    itemstack.addEnchantment(Enchantment.getEnchantmentByID(34), getDiamondLevel(itemstack));
+                if( getDiamondLevel(itemstack) > 0 ){
+                    //itemstack.addEnchantment(Enchantment.getEnchantmentByID(34), getDiamondLevel(itemstack));
                     itemstack.getItem().setHarvestLevel("pickaxe", 3);
-                }*/
+                }
                 /*if( getRedstoneLevel(itemstack) > 0 ){
                     itemstack.addEnchantment(Enchantment.getEnchantmentByID(32), getRedstoneLevel(itemstack));
                     //System.out.println(itemstack.getEnchantmentTagList());
diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomPickaxe.java b/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomPickaxe.java
index 6db826b8..14ba8f5b 100644
--- a/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomPickaxe.java
+++ b/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomPickaxe.java
@@ -317,10 +317,10 @@ public class CustomPickaxe extends ItemPickaxe implements ToolNBT{
                 if( getEmerald(itemstack)){
                     itemstack.addEnchantment(Enchantment.getEnchantmentByID(33), 1);
                 }
-                /*if( getDiamondLevel(itemstack) > 0 ){
-                    itemstack.addEnchantment(Enchantment.getEnchantmentByID(34), getDiamondLevel(itemstack));
+                if( getDiamondLevel(itemstack) > 0 ){
+                    //itemstack.addEnchantment(Enchantment.getEnchantmentByID(34), getDiamondLevel(itemstack));
                     itemstack.getItem().setHarvestLevel("pickaxe", 3);
-                }*/
+                }
                 /*if( getRedstoneLevel(itemstack) > 0 ){
                     itemstack.addEnchantment(Enchantment.getEnchantmentByID(32), getRedstoneLevel(itemstack));
                     //System.out.println(itemstack.getEnchantmentTagList());
diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomShovel.java b/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomShovel.java
index 05a21634..6b3c5466 100644
--- a/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomShovel.java
+++ b/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomShovel.java
@@ -304,10 +304,10 @@ public class CustomShovel extends ItemSpade implements ToolNBT {
                 if( getEmerald(itemstack)){
                     itemstack.addEnchantment(Enchantment.getEnchantmentByID(33), 1);
                 }
-                /*if( getDiamondLevel(itemstack) > 0 ){
-                    itemstack.addEnchantment(Enchantment.getEnchantmentByID(34), getDiamondLevel(itemstack));
+                if( getDiamondLevel(itemstack) > 0 ){
+                    //itemstack.addEnchantment(Enchantment.getEnchantmentByID(34), getDiamondLevel(itemstack));
                     itemstack.getItem().setHarvestLevel("pickaxe", 3);
-                }*/
+                }
                 /*if( getRedstoneLevel(itemstack) > 0 ){
                     itemstack.addEnchantment(Enchantment.getEnchantmentByID(32), getRedstoneLevel(itemstack));
                     //System.out.println(itemstack.getEnchantmentTagList());
diff --git a/1.11/src/main/resources/mcmod.info b/1.11/src/main/resources/mcmod.info
index bd4bf881..991ba19c 100644
--- a/1.11/src/main/resources/mcmod.info
+++ b/1.11/src/main/resources/mcmod.info
@@ -2,7 +2,7 @@
   "modid": "forgecraft",
   "name": "Kitsu's Forgecraft",
   "description": "Forged with sweat and blood",
-  "version": "1.2.05",
+  "version": "1.2.06",
   "mcversion": "1.11.2",
   "url": "",
   "updateUrl": "",