From 70a16fe34410547621028a33dc6cad3424d98e42 Mon Sep 17 00:00:00 2001
From: Glitchfinder <glitchkey@gmail.com>
Date: Wed, 17 Oct 2012 13:41:19 -0700
Subject: [PATCH 1/2] Finished adding skill checks for Emerald Ore and Cocoa.

---
 .../java/com/gmail/nossr50/skills/gathering/Herbalism.java   | 2 +-
 src/main/java/com/gmail/nossr50/util/BlockChecks.java        | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java b/src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java
index 08e066d8d..5729b3bc2 100644
--- a/src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java
+++ b/src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java
@@ -193,7 +193,7 @@ public class Herbalism {
             break;
             
         case COCOA:
-            if (data == (byte) 0x2) {
+            if ((((byte) data) & 0x8) == 0x8) {
                 mat = Material.COCOA;
                 xp = Config.getInstance().getHerbalismXPCocoa();
             }
diff --git a/src/main/java/com/gmail/nossr50/util/BlockChecks.java b/src/main/java/com/gmail/nossr50/util/BlockChecks.java
index 6628ed3ff..7eda2333a 100644
--- a/src/main/java/com/gmail/nossr50/util/BlockChecks.java
+++ b/src/main/java/com/gmail/nossr50/util/BlockChecks.java
@@ -52,6 +52,8 @@ public class BlockChecks {
         case VINE:
         case WATER_LILY:
         case YELLOW_FLOWER:
+	case COCOA:
+	case EMERALD_ORE:
             return true;
 
         default:
@@ -123,6 +125,7 @@ public class BlockChecks {
         case IRON_ORE:
         case LAPIS_ORE:
         case REDSTONE_ORE:
+	case EMERALD_ORE:
             return true;
 
         default:
@@ -175,6 +178,7 @@ public class BlockChecks {
         case VINE:
         case WATER_LILY:
         case YELLOW_FLOWER:
+	case COCOA:
             return true;
 
         case CROPS:
@@ -217,6 +221,7 @@ public class BlockChecks {
         case REDSTONE_ORE:
         case SANDSTONE:
         case STONE:
+	case EMERALD_ORE:
             return true;
 
         default:

From 31513d52d7a15a3f9018706a903c54662dd633f1 Mon Sep 17 00:00:00 2001
From: Glitchfinder <glitchkey@gmail.com>
Date: Wed, 17 Oct 2012 21:26:16 -0700
Subject: [PATCH 2/2] Fixing spacing issues and making herbalism drop cocoa
 beans instead of a cocoa block.

---
 .../com/gmail/nossr50/skills/gathering/Herbalism.java  |  7 ++++++-
 src/main/java/com/gmail/nossr50/util/BlockChecks.java  | 10 +++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java b/src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java
index 5729b3bc2..beaaa762a 100644
--- a/src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java
+++ b/src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java
@@ -218,7 +218,12 @@ public class Herbalism {
                 is = new ItemStack(ModChecks.getCustomBlock(block).getItemDrop());
             }
             else {
-                is = new ItemStack(mat);
+                if (mat == Material.COCOA) {
+                    is = new ItemStack(Material.INK_SACK, 1, (short) 3);
+                }
+                else {
+                    is = new ItemStack(mat);
+                }
             }
 
             if (herbLevel > MAX_BONUS_LEVEL || random.nextInt(randomChance) <= herbLevel) {
diff --git a/src/main/java/com/gmail/nossr50/util/BlockChecks.java b/src/main/java/com/gmail/nossr50/util/BlockChecks.java
index 7eda2333a..83dfc6817 100644
--- a/src/main/java/com/gmail/nossr50/util/BlockChecks.java
+++ b/src/main/java/com/gmail/nossr50/util/BlockChecks.java
@@ -52,8 +52,8 @@ public class BlockChecks {
         case VINE:
         case WATER_LILY:
         case YELLOW_FLOWER:
-	case COCOA:
-	case EMERALD_ORE:
+        case COCOA:
+        case EMERALD_ORE:
             return true;
 
         default:
@@ -125,7 +125,7 @@ public class BlockChecks {
         case IRON_ORE:
         case LAPIS_ORE:
         case REDSTONE_ORE:
-	case EMERALD_ORE:
+        case EMERALD_ORE:
             return true;
 
         default:
@@ -178,7 +178,7 @@ public class BlockChecks {
         case VINE:
         case WATER_LILY:
         case YELLOW_FLOWER:
-	case COCOA:
+        case COCOA:
             return true;
 
         case CROPS:
@@ -221,7 +221,7 @@ public class BlockChecks {
         case REDSTONE_ORE:
         case SANDSTONE:
         case STONE:
-	case EMERALD_ORE:
+        case EMERALD_ORE:
             return true;
 
         default: