More injector work

src/main/java/steamcraft/common/Steamcraft.java

@@ -39,6 +39,7 @@ import net.minecraftforge.common.MinecraftForge;
 
 import boilerplate.client.GuiHandler;
 import boilerplate.common.compathandler.FMPCompatHandler;
+import boilerplate.common.utils.handlers.BucketHandler;
 import steamcraft.common.compat.CompatabilityLayer;
 import steamcraft.common.compat.CompatibilityHandler;
 import steamcraft.common.config.Config;
@@ -52,7 +53,6 @@ import steamcraft.common.init.InitItems;
 import steamcraft.common.init.InitMisc;
 import steamcraft.common.init.InitPackets;
 import steamcraft.common.init.InitRecipes;
-import steamcraft.common.lib.BucketHandler;
 import steamcraft.common.lib.CommandSteamcraft;
 import steamcraft.common.lib.CreativeTabSteamcraft;
 import steamcraft.common.lib.LoggerSteamcraft;

src/main/java/steamcraft/common/init/InitItems.java

@@ -25,6 +25,7 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
+import boilerplate.common.utils.handlers.BucketHandler;
 import boilerplate.common.utils.helpers.RegistryHelper;
 import steamcraft.common.Steamcraft;
 import steamcraft.common.items.BaseItem;
@@ -102,7 +103,6 @@ import steamcraft.common.items.tools.steam.ItemSteamPickaxe;
 import steamcraft.common.items.tools.steam.ItemSteamShovel;
 import steamcraft.common.items.tools.steam.ItemSteamSword;
 import steamcraft.common.items.vanity.ItemTopHat;
-import steamcraft.common.lib.BucketHandler;
 import steamcraft.common.lib.ModInfo;
 
 /**
@@ -511,10 +511,10 @@ public class InitItems
 				new ItemStack(itemBoilingMudBucket), new ItemStack(Items.bucket));
 		FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("whaleoil", FluidContainerRegistry.BUCKET_VOLUME),
 				new ItemStack(itemWhaleOilBucket), new ItemStack(Items.bucket));
-		BucketHandler.INSTANCE.buckets.put(InitBlocks.blockBoilingWater, itemBoilingWaterBucket);
-		BucketHandler.INSTANCE.buckets.put(InitBlocks.blockBoilingMud, itemBoilingMudBucket);
-		BucketHandler.INSTANCE.buckets.put(InitBlocks.blockWhaleOil, itemWhaleOilBucket);
-		MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE);
+		BucketHandler.getInstance().bucketMap.put(InitBlocks.blockBoilingWater, itemBoilingWaterBucket);
+		BucketHandler.getInstance().bucketMap.put(InitBlocks.blockBoilingMud, itemBoilingMudBucket);
+		BucketHandler.getInstance().bucketMap.put(InitBlocks.blockWhaleOil, itemWhaleOilBucket);
+		MinecraftForge.EVENT_BUS.register(BucketHandler.getInstance());
 
 		itemWhalebone = new BaseItem().setUnlocalizedName("itemWhalebone");
 		registerItem(itemWhalebone, "ItemWhalebone");

src/main/java/steamcraft/common/tiles/container/ContainerInjector.java

@@ -39,6 +39,8 @@ public class ContainerInjector extends BaseContainer
 {
 	private TileInjector tileent;
 
+	private int lastFluidLevel = 0;
+
 	public ContainerInjector(InventoryPlayer player, TileInjector tile)
 	{
 		this.tileent = tile;
@@ -61,6 +63,7 @@ public class ContainerInjector extends BaseContainer
 	public void addCraftingToCrafters(ICrafting par1ICrafting)
 	{
 		super.addCraftingToCrafters(par1ICrafting);
+		par1ICrafting.sendProgressBarUpdate(this, 0, this.tileent.buffer.getFluidAmount());
 	}
 
 	@Override
@@ -71,15 +74,18 @@ public class ContainerInjector extends BaseContainer
 		for (Object obj : this.crafters)
 		{
 			ICrafting var2 = (ICrafting) obj;
-
+			if (this.lastFluidLevel != this.tileent.buffer.getFluidAmount())
+				var2.sendProgressBarUpdate(this, 2, this.tileent.buffer.getFluidAmount());
 		}
+		this.lastFluidLevel = this.tileent.buffer.getFluidAmount();
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
 	public void updateProgressBar(int par1, int par2)
 	{
-
+		if (par1 == 0)
+			this.tileent.buffer.getFluid().amount = par2;
 	}
 
 	@Override