From fde082074afbc83b8e3244302c7f4d8510bbdc7c Mon Sep 17 00:00:00 2001
From: Adubbz <a.dubbz@hotmail.com>
Date: Fri, 22 Nov 2013 12:55:13 +1100
Subject: [PATCH] Buckets holding BOP Fluids will now cross over to 1.7 when
 the time comes

---
 common/biomesoplenty/api/Fluids.java              |  4 ++--
 common/biomesoplenty/configuration/BOPBlocks.java |  4 ++--
 common/biomesoplenty/configuration/BOPFluids.java | 15 ++++++++++++---
 common/biomesoplenty/configuration/BOPItems.java  |  2 +-
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/common/biomesoplenty/api/Fluids.java b/common/biomesoplenty/api/Fluids.java
index 83b783a7a..0e66e4fed 100644
--- a/common/biomesoplenty/api/Fluids.java
+++ b/common/biomesoplenty/api/Fluids.java
@@ -12,9 +12,9 @@ public class Fluids
 
 	public static Optional<? extends Block> springWater                     = Optional.absent();
 	public static Optional<? extends Block> liquidPoison                    = Optional.absent();
-	public static Optional<? extends Block> honey                    = Optional.absent();
+	public static Optional<? extends Block> honey                           = Optional.absent();
 
 	public static Optional<? extends Fluid> springWaterFluid                = Optional.absent();
 	public static Optional<? extends Fluid> liquidPoisonFluid               = Optional.absent();
-	public static Optional<? extends Fluid> honeyFluid               = Optional.absent();
+	public static Optional<? extends Fluid> honeyFluid                      = Optional.absent();
 }
diff --git a/common/biomesoplenty/configuration/BOPBlocks.java b/common/biomesoplenty/configuration/BOPBlocks.java
index 42d934597..9bf3bf6e6 100644
--- a/common/biomesoplenty/configuration/BOPBlocks.java
+++ b/common/biomesoplenty/configuration/BOPBlocks.java
@@ -335,12 +335,12 @@ public class BOPBlocks
 		MinecraftForge.addGrassPlant(Blocks.foliage.get(), 11, 75);
 	}
 
-	private static void registerBlock(Block block)
+	public static void registerBlock(Block block)
 	{
 	    GameRegistry.registerBlock(block, block.getUnlocalizedName().replace("tile.", ""));
 	}
 
-	private static void registerBlock(Block block, Class<? extends ItemBlock> itemBlockClass)
+	public static void registerBlock(Block block, Class<? extends ItemBlock> itemBlockClass)
 	{
 	    GameRegistry.registerBlock(block, itemBlockClass, block.getUnlocalizedName().replace("tile.", ""));
 	}
diff --git a/common/biomesoplenty/configuration/BOPFluids.java b/common/biomesoplenty/configuration/BOPFluids.java
index 3f6c4b7e9..503d55850 100644
--- a/common/biomesoplenty/configuration/BOPFluids.java
+++ b/common/biomesoplenty/configuration/BOPFluids.java
@@ -1,5 +1,8 @@
 package biomesoplenty.configuration;
 
+import static biomesoplenty.configuration.BOPBlocks.registerBlock;
+import static biomesoplenty.configuration.BOPItems.registerItem;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -27,6 +30,7 @@ public class BOPFluids
 		initializeLiquids();
 		initializeContainers();
 		registerBlocks();
+		registerItems();
 	}
 
 	private static void registerFluids()
@@ -61,8 +65,13 @@ public class BOPFluids
 
 	private static void registerBlocks()
 	{
-		GameRegistry.registerBlock(Fluids.liquidPoison.get(), "liquidPoison");
-		GameRegistry.registerBlock(Fluids.springWater.get(), "springWater");
-		GameRegistry.registerBlock(Fluids.honey.get(), "honey");
+		registerBlock(Fluids.liquidPoison.get());
+		registerBlock(Fluids.springWater.get());
+		registerBlock(Fluids.honey.get());
+	}
+	
+	private static void registerItems()
+	{
+	    registerItem(Fluids.bopBucket.get());
 	}
 }
diff --git a/common/biomesoplenty/configuration/BOPItems.java b/common/biomesoplenty/configuration/BOPItems.java
index d9d63c01e..6228aa2b6 100644
--- a/common/biomesoplenty/configuration/BOPItems.java
+++ b/common/biomesoplenty/configuration/BOPItems.java
@@ -211,7 +211,7 @@ public class BOPItems {
         registerItem(Items.flippers.get());
 	}
 
-	private static void registerItem(Item item)
+	public static void registerItem(Item item)
 	{
 	    GameRegistry.registerItem(item, item.getUnlocalizedName().replace("item.", ""));
 	}