From c7e63db5aa232d3c11289c64328f926ae93bf3ca Mon Sep 17 00:00:00 2001
From: Matt Caughey <Catcwe316@comcast.net>
Date: Wed, 13 Nov 2013 01:48:59 -0500
Subject: [PATCH] Even more achievement tweaks

---
 common/biomesoplenty/blocks/BlockHoney.java   | 22 +++----------------
 .../configuration/BOPAchievements.java        |  2 +-
 .../handlers/BOPPickupHandler.java            |  6 +++++
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/common/biomesoplenty/blocks/BlockHoney.java b/common/biomesoplenty/blocks/BlockHoney.java
index 72077be0c..f16dcbc84 100644
--- a/common/biomesoplenty/blocks/BlockHoney.java
+++ b/common/biomesoplenty/blocks/BlockHoney.java
@@ -1,26 +1,16 @@
 package biomesoplenty.blocks;
 
-import static net.minecraftforge.common.ForgeDirection.UP;
-
-import java.util.Random;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
-import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.common.ForgeDirection;
 import biomesoplenty.BiomesOPlenty;
-import biomesoplenty.api.Blocks;
 import biomesoplenty.api.Fluids;
-import biomesoplenty.api.Items;
-import biomesoplenty.entities.EntityWasp;
+import biomesoplenty.configuration.BOPAchievements;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockHoney extends Block
 {
@@ -36,12 +26,6 @@ public class BlockHoney extends Block
 		blockIcon = par1IconRegister.registerIcon("biomesoplenty:honeyblock");
 	}
 	
-    @Override
-    public void breakBlock(World world, int x, int y, int z, int par5, int par6)
-    {
-    	world.setBlock(x, y, z, Fluids.honey.get().blockID, 7, 2);
-    }
-	
     @Override
 	@SideOnly(Side.CLIENT)
     public int getRenderBlockPass()
diff --git a/common/biomesoplenty/configuration/BOPAchievements.java b/common/biomesoplenty/configuration/BOPAchievements.java
index 18c4f7e89..f36e4451e 100644
--- a/common/biomesoplenty/configuration/BOPAchievements.java
+++ b/common/biomesoplenty/configuration/BOPAchievements.java
@@ -59,7 +59,7 @@ public class BOPAchievements
 		achThorn = (new Achievement(3087, "bop.achThorn", -5, -1, new ItemStack(Blocks.plants.get(), 1, 5), achMoss)).registerAchievement();
 		achCoral = (new Achievement(3088, "bop.achCoral", -3, -2, new ItemStack(Blocks.coral.get(), 1, 4), achThorn)).registerAchievement();
 		
-		achHoney = (new Achievement(3089, "bop.achHoney", -1, 2, new ItemStack(Fluids.bopBucket.get(), 1, 3), achFlower)).registerAchievement();
+		achHoney = (new Achievement(3089, "bop.achHoney", -1, 2, new ItemStack(Blocks.honeyBlock.get(), 1, 0), achFlower)).registerAchievement();
 		achWitherWart = (new Achievement(3090, "bop.achWitherWart", 1, 3, new ItemStack(Blocks.plants.get(), 1, 13), achHoney)).registerAchievement();
 		achGrave = (new Achievement(3091, "bop.achGrave", -2, 4, new ItemStack(Blocks.grave.get(), 1, 0), achWitherWart)).registerAchievement();
 		achPhantom = (new Achievement(3092, "bop.achPhantom", 0, 6, new ItemStack(Items.miscItems.get(), 1, 16), achGrave)).registerAchievement().setSpecial();
diff --git a/common/biomesoplenty/handlers/BOPPickupHandler.java b/common/biomesoplenty/handlers/BOPPickupHandler.java
index 4c8bb05b5..961a8ac7f 100644
--- a/common/biomesoplenty/handlers/BOPPickupHandler.java
+++ b/common/biomesoplenty/handlers/BOPPickupHandler.java
@@ -45,6 +45,12 @@ public class BOPPickupHandler implements IPickupNotifier
 			player.addStat(BOPAchievements.achCoral, 1);
 		}
 		
+		//Bittersweet
+		if (item.getEntityItem().itemID == Blocks.honeyBlock.get().blockID)
+		{
+			player.addStat(BOPAchievements.achHoney, 1);
+		}
+		
 		//Decay
 		if (item.getEntityItem().itemID == Blocks.plants.get().blockID && (item.getEntityItem().getItemDamage() == 13))
 		{