new fillable item system, armor slots for mod table

src/main/java/api/hbm/fluid/IFillableItem.java

@@ -0,0 +1,17 @@
+package api.hbm.fluid;
+
+import com.hbm.inventory.fluid.FluidType;
+
+import net.minecraft.item.ItemStack;
+
+public interface IFillableItem {
+
+	/** Whether this stack can be filled with this type. Not particularly useful for normal operations */
+	public boolean acceptsFluid(FluidType type, ItemStack stack);
+	/** Tries to fill the stack, returns the remainder that couldn't be added */
+	public int tryFill(FluidType type, int amount, ItemStack stack);
+	/** Whether this stack can fill tiles with this type. Not particularly useful for normal operations */
+	public boolean providesFluid(FluidType type, ItemStack stack);
+	/** Provides fluid with the maximum being the requested amount */
+	public int tryEmpty(FluidType type, int amount, ItemStack stack);
+}

src/main/java/api/hbm/fluid/IFluidStandardReceiver.java

@@ -1,7 +1,7 @@
 package api.hbm.fluid;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.tank.FluidTank;
 
 /**
  * Uses default implementation to make the underlying interfaces easier to use for the most common fluid users.

src/main/java/api/hbm/fluid/IFluidStandardSender.java

@@ -1,7 +1,7 @@
 package api.hbm.fluid;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.tank.FluidTank;
 
 /**
  * Uses default implementation to make the underlying interfaces easier to use for the most common fluid users.

src/main/java/api/hbm/fluid/IFluidStandardTransceiver.java

@@ -1,7 +1,7 @@
 package api.hbm.fluid;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.tank.FluidTank;
 
 /**
  * transceiver [trăn-sē′vər], noun

src/main/java/com/hbm/blocks/machine/rbmk/RBMKHeatex.java

@@ -4,9 +4,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.hbm.blocks.ILookOverlay;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.items.machine.IItemFluidIdentifier;
 import com.hbm.tileentity.machine.rbmk.TileEntityHeatex;
 import com.hbm.tileentity.machine.rbmk.TileEntityRBMKHeater;

src/main/java/com/hbm/interfaces/IPartiallyFillable.java

@@ -4,6 +4,7 @@ import com.hbm.inventory.fluid.FluidType;
 
 import net.minecraft.item.ItemStack;
 
+@Deprecated
 public interface IPartiallyFillable {
 	
 	public FluidType getType(ItemStack stack);

src/main/java/com/hbm/inventory/container/ContainerArmorTable.java

@@ -3,6 +3,8 @@ package com.hbm.inventory.container;
 import com.hbm.handler.ArmorModHandler;
 import com.hbm.items.armor.ItemArmorMod;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -12,6 +14,7 @@ import net.minecraft.inventory.InventoryCraftResult;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemArmor;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
 
 public class ContainerArmorTable extends Container {
 	
@@ -19,6 +22,7 @@ public class ContainerArmorTable extends Container {
 	public IInventory armor = new InventoryCraftResult();
 
 	public ContainerArmorTable(InventoryPlayer inventory) {
+		EntityPlayer player = inventory.player;
 		
 		this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.helmet_only, 26, 27));	// helmet only
 		this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.plate_only, 62, 27));		// chestplate only
@@ -72,16 +76,35 @@ public class ContainerArmorTable extends Container {
 			}
 		});
 		
-		for(int i = 0; i < 3; i++)
+		//player armor slots for easy accessibility
-		{
+		for(int i = 0; i < 4; ++i) {
-			for(int j = 0; j < 9; j++)
+			final int k = i;
-			{
+			this.addSlotToContainer(new Slot(inventory, inventory.getSizeInventory() - 1 - i, -18, 36 + i * 18) {
+				
+				public int getSlotStackLimit() {
+					return 1;
+				}
+				
+				public boolean isItemValid(ItemStack stack) {
+					if(stack == null)
+						return false;
+					return stack.getItem().isValidArmor(stack, k, player);
+				}
+				
+				@SideOnly(Side.CLIENT)
+				public IIcon getBackgroundIconIndex() {
+					return ItemArmor.func_94602_b(k);
+				}
+			});
+		}
+		
+		for(int i = 0; i < 3; i++) {
+			for(int j = 0; j < 9; j++) {
 				this.addSlotToContainer(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18 + 56));
 			}
 		}
 
-		for(int i = 0; i < 9; i++)
+		for(int i = 0; i < 9; i++) {
-		{
 			this.addSlotToContainer(new Slot(inventory, i, 8 + i * 18, 142 + 56));
 		}
 		

src/main/java/com/hbm/inventory/fluid/FluidType.java

@@ -11,7 +11,7 @@ import org.lwjgl.input.Keyboard;
 
 import java.util.Set;
 
-import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.inventory.fluid.trait.*;
 import com.hbm.inventory.fluid.trait.FluidTraitSimple.*;
 import com.hbm.lib.RefStrings;

src/main/java/com/hbm/inventory/fluid/tank/FluidLoaderFillableItem.java

@@ -0,0 +1,69 @@
+package com.hbm.inventory.fluid.tank;
+
+import com.hbm.handler.ArmorModHandler;
+import com.hbm.inventory.fluid.FluidType;
+
+import api.hbm.fluid.IFillableItem;
+import net.minecraft.item.ItemArmor;
+import net.minecraft.item.ItemStack;
+
+public class FluidLoaderFillableItem extends FluidLoadingHandler {
+
+	@Override
+	public boolean fillItem(ItemStack[] slots, int in, int out, FluidTank tank) {
+		return fill(slots[in], tank);
+	}
+	
+	public boolean fill(ItemStack stack, FluidTank tank) {
+		
+		FluidType type = tank.getTankType();
+		
+		if(stack.getItem() instanceof ItemArmor && ArmorModHandler.hasMods(stack)) {
+			for(ItemStack mod : ArmorModHandler.pryMods(stack)) {
+				
+				if(mod != null && mod.getItem() instanceof IFillableItem) {
+					fill(mod, tank);
+				}
+			}
+		}
+		
+		if(!(stack.getItem() instanceof IFillableItem)) return false;
+		
+		IFillableItem fillable = (IFillableItem) stack.getItem();
+		
+		if(fillable.acceptsFluid(type, stack)) {
+			tank.setFill(fillable.tryFill(type, tank.getFill(), stack));
+		}
+		
+		return true;
+	}
+
+	@Override
+	public boolean emptyItem(ItemStack[] slots, int in, int out, FluidTank tank) {
+		return empty(slots[in], tank);
+	}
+	
+	public boolean empty(ItemStack stack, FluidTank tank) {
+		
+		FluidType type = tank.getTankType();
+		
+		if(stack.getItem() instanceof ItemArmor && ArmorModHandler.hasMods(stack)) {
+			for(ItemStack mod : ArmorModHandler.pryMods(stack)) {
+				
+				if(mod != null && mod.getItem() instanceof IFillableItem) {
+					empty(mod, tank);
+				}
+			}
+		}
+		
+		if(!(stack.getItem() instanceof IFillableItem)) return false;
+		
+		IFillableItem fillable = (IFillableItem) stack.getItem();
+		
+		if(fillable.providesFluid(type, stack)) {
+			tank.setFill(tank.getFill() + fillable.tryEmpty(type, tank.getMaxFill() - tank.getFill(), stack));
+		}
+		
+		return tank.getFill() == tank.getMaxFill();
+	}
+}

src/main/java/com/hbm/inventory/fluid/tank/FluidLoaderStandard.java

@@ -0,0 +1,90 @@
+package com.hbm.inventory.fluid.tank;
+
+import com.hbm.inventory.FluidContainerRegistry;
+import com.hbm.inventory.fluid.FluidType;
+
+import net.minecraft.item.ItemStack;
+
+public class FluidLoaderStandard extends FluidLoadingHandler {
+
+	@Override
+	public boolean fillItem(ItemStack[] slots, int in, int out, FluidTank tank) {
+		
+		if(slots[in] == null)
+			return true;
+		
+		FluidType type = tank.getTankType();
+		ItemStack full = FluidContainerRegistry.getFullContainer(slots[in], type);
+		
+		if(slots[in] != null && tank.getFill() - FluidContainerRegistry.getFluidContent(full, type) >= 0) {
+			
+			ItemStack fullContainer = FluidContainerRegistry.getFullContainer(slots[in], type);
+			
+			if(slots[out] == null) {
+				
+				tank.setFill(tank.getFill() - FluidContainerRegistry.getFluidContent(full, type));
+				slots[out] = full.copy();
+				slots[in].stackSize--;
+				if(slots[in].stackSize <= 0) {
+					slots[in] = null;
+				}
+				
+			} else if(slots[out] != null && slots[out].getItem() == fullContainer.getItem() && slots[out].getItemDamage() == fullContainer.getItemDamage() && slots[out].stackSize < slots[out].getMaxStackSize()) {
+				
+				tank.setFill(tank.getFill() - FluidContainerRegistry.getFluidContent(full, type));
+				slots[in].stackSize--;
+				
+				if(slots[in].stackSize <= 0) {
+					slots[in] = null;
+				}
+				slots[out].stackSize++;
+			}
+		}
+		
+		return false;
+	}
+
+	@Override
+	public boolean emptyItem(ItemStack[] slots, int in, int out, FluidTank tank) {
+		
+		if(slots[in] == null)
+			return true;
+		
+		FluidType type = tank.getTankType();
+		int amount = FluidContainerRegistry.getFluidContent(slots[in], type);
+		
+		if(amount > 0 && tank.getFill() + amount <= tank.maxFluid) {
+			
+			ItemStack emptyContainer = FluidContainerRegistry.getEmptyContainer(slots[in]);
+			
+			if(slots[out] == null) {
+				
+				tank.setFill(tank.getFill() + amount);
+				slots[out] = emptyContainer;
+				
+				slots[in].stackSize--;
+				if(slots[in].stackSize <= 0) {
+					slots[in] = null;
+				}
+				
+			} else if(slots[out] != null && (emptyContainer == null || (slots[out].getItem() == emptyContainer.getItem() && slots[out].getItemDamage() == emptyContainer.getItemDamage() && slots[out].stackSize < slots[out].getMaxStackSize()))) {
+				
+				tank.setFill(tank.getFill() + amount);
+				slots[in].stackSize--;
+				
+				if(slots[in].stackSize <= 0) {
+					slots[in] = null;
+				}
+				
+				if(emptyContainer != null) {
+					slots[out].stackSize++;
+				}
+			}
+			
+			return true;
+		}
+		
+		return false;
+	}
+
+}

src/main/java/com/hbm/inventory/fluid/tank/FluidLoadingHandler.java

@@ -0,0 +1,9 @@
+package com.hbm.inventory.fluid.tank;
+
+import net.minecraft.item.ItemStack;
+
+public abstract class FluidLoadingHandler {
+
+	public abstract boolean fillItem(ItemStack[] slots, int in, int out, FluidTank tank);
+	public abstract boolean emptyItem(ItemStack[] slots, int in, int out, FluidTank tank);
+}

src/main/java/com/hbm/inventory/fluid/tank/FluidTank.java

@@ -1,4 +1,4 @@
-package com.hbm.inventory;
+package com.hbm.inventory.fluid.tank;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -7,6 +7,7 @@ import org.lwjgl.opengl.GL11;
 
 import com.hbm.handler.ArmorModHandler;
 import com.hbm.interfaces.IPartiallyFillable;
+import com.hbm.inventory.FluidContainerRegistry;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
 import com.hbm.inventory.gui.GuiInfoContainer;
@@ -16,6 +17,7 @@ import com.hbm.items.machine.IItemFluidIdentifier;
 import com.hbm.packet.PacketDispatcher;
 import com.hbm.packet.TEFluidPacket;
 
+import api.hbm.fluid.IFillableItem;
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.Tessellator;
@@ -52,7 +54,6 @@ public class FluidTank {
 	}
 	
 	public FluidType getTankType() {
-		
 		return type;
 	}
 	
@@ -158,6 +159,41 @@ public class FluidTank {
 		ItemStack full = null;
 		if(slots[in] != null) {
 			
+			if(this.handleFillableUnload(slots, in))
+				return;
+			
+			if(this.handleInfiniteUnload(slots, in))
+				return;
+			
+			if(this.handleNewFillableUnload(slots[in]))
+				return;
+			
+			full = FluidContainerRegistry.getFullContainer(slots[in], type);
+		}
+		
+		if(full == null)
+			return;
+		
+		if(slots[in] != null && fluid - FluidContainerRegistry.getFluidContent(full, type) >= 0) {
+			ItemStack fullContainer = FluidContainerRegistry.getFullContainer(slots[in], type);
+			if(slots[out] == null) {
+				fluid -= FluidContainerRegistry.getFluidContent(full, type);
+				slots[out] = full.copy();
+				slots[in].stackSize--;
+				if(slots[in].stackSize <= 0)
+					slots[in] = null;
+			} else if(slots[out] != null && slots[out].getItem() == fullContainer.getItem() && slots[out].getItemDamage() == fullContainer.getItemDamage() && slots[out].stackSize < slots[out].getMaxStackSize()) {
+				fluid -= FluidContainerRegistry.getFluidContent(full, type);
+				slots[in].stackSize--;
+				if(slots[in].stackSize <= 0)
+					slots[in] = null;
+				slots[out].stackSize++;
+			}
+		}
+	}
+	
+	public boolean handleFillableUnload(ItemStack[] slots, int in) {
+		
 		ItemStack partial = slots[in];
 		
 		if(partial.getItem() instanceof ItemArmor && ArmorModHandler.hasMods(partial)) {
@@ -188,51 +224,58 @@ public class FluidTank {
 				ArmorModHandler.applyMod(slots[in], partial);
 			}
 			
-				return;
+			return true;
 		}
 		
+		return false;
+	}
+	
+	public boolean handleInfiniteUnload(ItemStack[] slots, int in) {
+		
 		if(slots[in].getItem() == ModItems.fluid_barrel_infinite) {
 			this.fluid = 0;
-				return;
+			return true;
 		}
 		
 		if(slots[in].getItem() == ModItems.inf_water && type == Fluids.WATER) {
 			this.fluid -= 50;
 			if(this.fluid < 0)
 				this.fluid = 0;
-				return;
+			return true;
 		}
 		
 		if(slots[in].getItem() == ModItems.inf_water_mk2 && type == Fluids.WATER) {
 			this.fluid -= 500;
 			if(this.fluid < 0)
 				this.fluid = 0;
-				return;
+			return true;
 		}
 		
-			full = FluidContainerRegistry.getFullContainer(slots[in], type);
+		return false;
 	}
-		if(full == null)
-			return;
 	
-		if(slots[in] != null && fluid - FluidContainerRegistry.getFluidContent(full, type) >= 0) {
+	public boolean handleNewFillableUnload(ItemStack stack) {
-			ItemStack fullContainer = FluidContainerRegistry.getFullContainer(slots[in], type);
+		
-			if(slots[out] == null) {
+		if(stack.getItem() instanceof ItemArmor && ArmorModHandler.hasMods(stack)) {
-				fluid -= FluidContainerRegistry.getFluidContent(full, type);
+			for(ItemStack mod : ArmorModHandler.pryMods(stack)) {
-				slots[out] = full.copy();
+				
-				slots[in].stackSize--;
+				if(mod != null && mod.getItem() instanceof IFillableItem) {
-				if(slots[in].stackSize <= 0)
+					handleNewFillableUnload(mod);
-					slots[in] = null;
-			} else if(slots[out] != null && slots[out].getItem() == fullContainer.getItem() && slots[out].getItemDamage() == fullContainer.getItemDamage() && slots[out].stackSize < slots[out].getMaxStackSize()) {
-				fluid -= FluidContainerRegistry.getFluidContent(full, type);
-				slots[in].stackSize--;
-				if(slots[in].stackSize <= 0)
-					slots[in] = null;
-				slots[out].stackSize++;
 				}
 			}
 		}
 		
+		if(!(stack.getItem() instanceof IFillableItem)) return false;
+		
+		IFillableItem fillable = (IFillableItem) stack.getItem();
+		
+		if(fillable.acceptsFluid(getTankType(), stack)) {
+			this.setFill(fillable.tryFill(type, this.getFill(), stack));
+		}
+		
+		return true;
+	}
+
 	public boolean setType(int in, ItemStack[] slots) {
 		return setType(in, in, slots);
 	}

src/main/java/com/hbm/inventory/fluid/trait/FT_VentRadiation.java

@@ -1,7 +1,7 @@
 package com.hbm.inventory.fluid.trait;
 
 import com.hbm.handler.radiation.ChunkRadiationManager;
-import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.tank.FluidTank;
 
 import net.minecraft.world.World;
 

src/main/java/com/hbm/inventory/fluid/trait/FluidTrait.java

@@ -2,7 +2,7 @@ package com.hbm.inventory.fluid.trait;
 
 import java.util.List;
 
-import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.tank.FluidTank;
 
 import net.minecraft.world.World;
 

src/main/java/com/hbm/inventory/gui/GUIAMSBase.java

@@ -2,8 +2,8 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerAMSBase;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.TileEntityAMSBase;
 import net.minecraft.client.Minecraft;

src/main/java/com/hbm/inventory/gui/GUIAMSEmitter.java

@@ -2,8 +2,8 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerAMSEmitter;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.TileEntityAMSEmitter;
 import net.minecraft.client.Minecraft;

src/main/java/com/hbm/inventory/gui/GUIAMSLimiter.java

@@ -2,8 +2,8 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerAMSLimiter;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.TileEntityAMSLimiter;
 

src/main/java/com/hbm/inventory/gui/GUIBarrel.java

@@ -2,8 +2,8 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerBarrel;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.packet.AuxButtonPacket;
 import com.hbm.packet.PacketDispatcher;

src/main/java/com/hbm/inventory/gui/GUICore.java

@@ -2,8 +2,8 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerCore;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.TileEntityCore;
 

src/main/java/com/hbm/inventory/gui/GUICoreEmitter.java

@@ -4,8 +4,8 @@ import org.apache.commons.lang3.math.NumberUtils;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerCoreEmitter;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.packet.AuxButtonPacket;
 import com.hbm.packet.PacketDispatcher;

src/main/java/com/hbm/inventory/gui/GUICoreInjector.java

@@ -2,8 +2,8 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerCoreInjector;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.TileEntityCoreInjector;
 

src/main/java/com/hbm/inventory/gui/GUICoreReceiver.java

@@ -2,8 +2,8 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerCoreReceiver;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.TileEntityCoreReceiver;
 import com.hbm.util.BobMathUtil;

src/main/java/com/hbm/inventory/gui/GUICrystallizer.java

@@ -2,8 +2,8 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerCrystallizer;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.TileEntityMachineCrystallizer;
 import com.hbm.util.I18nUtil;

src/main/java/com/hbm/inventory/gui/GUIFWatzCore.java

@@ -2,8 +2,8 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerFWatzCore;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.TileEntityFWatzCore;
 

src/main/java/com/hbm/inventory/gui/GUIIGenerator.java

@@ -2,8 +2,8 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerIGenerator;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.TileEntityMachineIGenerator;
 

src/main/java/com/hbm/inventory/gui/GUIITER.java

@@ -2,8 +2,8 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerITER;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.packet.AuxButtonPacket;
 import com.hbm.packet.PacketDispatcher;

src/main/java/com/hbm/inventory/gui/GUILiquefactor.java

@@ -2,8 +2,8 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerLiquefactor;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.oil.TileEntityMachineLiquefactor;
 

src/main/java/com/hbm/inventory/gui/GUIMachineBoiler.java

@@ -2,9 +2,9 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerMachineBoiler;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.TileEntityMachineBoiler;
 

src/main/java/com/hbm/inventory/gui/GUIMachineBoilerElectric.java

@@ -2,9 +2,9 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerMachineBoilerElectric;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.TileEntityMachineBoilerElectric;
 

src/main/java/com/hbm/inventory/gui/GUIMachineCMBFactory.java

@@ -2,8 +2,8 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerMachineCMBFactory;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.TileEntityMachineCMBFactory;
 

src/main/java/com/hbm/inventory/gui/GUIMachineCoal.java

@@ -7,8 +7,8 @@ import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerMachineCoal;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.TileEntityMachineCoal;
 

src/main/java/com/hbm/inventory/gui/GUIMachineCompactLauncher.java

@@ -2,8 +2,8 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerCompactLauncher;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.items.weapon.ItemCustomMissile;
 import com.hbm.lib.RefStrings;
 import com.hbm.render.util.MissileMultipart;

src/main/java/com/hbm/inventory/gui/GUIMachineCyclotron.java

@@ -2,8 +2,8 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerMachineCyclotron;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.packet.AuxButtonPacket;
 import com.hbm.packet.PacketDispatcher;

src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java

@@ -7,10 +7,10 @@ import java.util.Map.Entry;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerMachineDiesel;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.TileEntityMachineDiesel;
 import com.hbm.util.BobMathUtil;

src/main/java/com/hbm/inventory/gui/GUIMachineFluidTank.java

@@ -2,8 +2,8 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerMachineFluidTank;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.packet.AuxButtonPacket;
 import com.hbm.packet.PacketDispatcher;

src/main/java/com/hbm/inventory/gui/GUIMachineGasCent.java

@@ -2,8 +2,8 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerMachineGasCent;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.TileEntityMachineGasCent;
 import com.hbm.util.I18nUtil;

src/main/java/com/hbm/inventory/gui/GUIMachineGenerator.java

@@ -7,8 +7,8 @@ import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerGenerator;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.TileEntityMachineGenerator;
 

src/main/java/com/hbm/inventory/gui/GUIMachineInserter.java

@@ -2,8 +2,8 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerMachineInserter;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.TileEntityMachineInserter;
 import net.minecraft.client.Minecraft;

src/main/java/com/hbm/inventory/gui/GUIMachineLargeTurbine.java

@@ -2,9 +2,9 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerMachineLargeTurbine;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.TileEntityMachineLargeTurbine;
 

src/main/java/com/hbm/inventory/gui/GUIMachineLaunchTable.java

@@ -2,8 +2,8 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerLaunchTable;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.items.weapon.ItemCustomMissile;
 import com.hbm.items.weapon.ItemMissile.PartSize;
 import com.hbm.lib.RefStrings;

src/main/java/com/hbm/inventory/gui/GUIMachineOilWell.java

@@ -2,8 +2,8 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerMachineOilWell;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.oil.TileEntityOilDrillBase;
 import com.hbm.util.I18nUtil;

src/main/java/com/hbm/inventory/gui/GUIMachinePuF6Tank.java

@@ -2,8 +2,8 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerPuF6Tank;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.storage.TileEntityMachinePuF6Tank;
 

src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java

@@ -2,9 +2,9 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerMachineRefinery;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.packet.NBTControlPacket;
 import com.hbm.packet.PacketDispatcher;

src/main/java/com/hbm/inventory/gui/GUIMachineSelenium.java

@@ -6,10 +6,10 @@ import java.util.Map.Entry;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerMachineSelenium;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.TileEntityMachineDiesel;
 import com.hbm.tileentity.machine.TileEntityMachineSeleniumEngine;

src/main/java/com/hbm/inventory/gui/GUIMachineTurbine.java

@@ -2,9 +2,9 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerMachineTurbine;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.TileEntityMachineTurbine;
 

src/main/java/com/hbm/inventory/gui/GUIMachineUF6Tank.java

@@ -2,8 +2,8 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerUF6Tank;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.storage.TileEntityMachineUF6Tank;
 

src/main/java/com/hbm/inventory/gui/GUIMiningLaser.java

@@ -2,8 +2,8 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerMiningLaser;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.packet.AuxButtonPacket;
 import com.hbm.packet.PacketDispatcher;

src/main/java/com/hbm/inventory/gui/GUIPlasmaHeater.java

@@ -2,9 +2,9 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerMicrowave;
 import com.hbm.inventory.container.ContainerPlasmaHeater;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.packet.AuxButtonPacket;
 import com.hbm.packet.PacketDispatcher;

src/main/java/com/hbm/inventory/gui/GUIRadiolysis.java

@@ -4,8 +4,8 @@ import java.util.List;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerRadiolysis;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.items.machine.ItemRTGPellet;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.TileEntityMachineRadiolysis;

src/main/java/com/hbm/inventory/gui/GUIReactorMultiblock.java

@@ -2,10 +2,10 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerReactorMultiblock;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.packet.AuxButtonPacket;
 import com.hbm.packet.PacketDispatcher;

src/main/java/com/hbm/inventory/gui/GUISoyuzLauncher.java

@@ -2,8 +2,8 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerSoyuzLauncher;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.packet.AuxButtonPacket;
 import com.hbm.packet.PacketDispatcher;

src/main/java/com/hbm/inventory/gui/GUITurretFritz.java

@@ -1,6 +1,6 @@
 package com.hbm.inventory.gui;
 
-import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.turret.TileEntityTurretBaseNT;
 import com.hbm.tileentity.turret.TileEntityTurretFritz;

src/main/java/com/hbm/inventory/gui/GUIWatzCore.java

@@ -2,8 +2,8 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerWatzCore;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.TileEntityWatzCore;
 

src/main/java/com/hbm/items/armor/ArmorFSBFueled.java

@@ -2,11 +2,11 @@ package com.hbm.items.armor;
 
 import java.util.List;
 
-import com.hbm.interfaces.IPartiallyFillable;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.util.BobMathUtil;
 import com.hbm.util.I18nUtil;
 
+import api.hbm.fluid.IFillableItem;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.entity.player.EntityPlayer;
@@ -14,7 +14,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 
-public class ArmorFSBFueled extends ArmorFSB implements IPartiallyFillable {
+public class ArmorFSBFueled extends ArmorFSB implements IFillableItem {
 
 	FluidType fuelType;
 	public int maxFuel = 1;
@@ -31,12 +31,6 @@ public class ArmorFSBFueled extends ArmorFSB implements IPartiallyFillable {
 		this.maxFuel = maxFuel;
 	}
 
-	@Override
-	public FluidType getType(ItemStack stack) {
-		return this.fuelType;
-	}
-
-	@Override
 	public int getFill(ItemStack stack) {
 		if(stack.stackTagCompound == null) {
 			stack.stackTagCompound = new NBTTagCompound();
@@ -47,7 +41,6 @@ public class ArmorFSBFueled extends ArmorFSB implements IPartiallyFillable {
 		return stack.stackTagCompound.getInteger("fuel");
 	}
 
-	@Override
 	public void setFill(ItemStack stack, int fill) {
 		if(stack.stackTagCompound == null) {
 			stack.stackTagCompound = new NBTTagCompound();
@@ -56,17 +49,14 @@ public class ArmorFSBFueled extends ArmorFSB implements IPartiallyFillable {
 		stack.stackTagCompound.setInteger("fuel", fill);
 	}
 
-	@Override
 	public int getMaxFill(ItemStack stack) {
 		return this.maxFuel;
 	}
 
-	@Override
 	public int getLoadSpeed(ItemStack stack) {
 		return this.fillRate;
 	}
 
-	@Override
 	public int getUnloadSpeed(ItemStack stack) {
 		return 0;
 	}
@@ -86,7 +76,7 @@ public class ArmorFSBFueled extends ArmorFSB implements IPartiallyFillable {
 
 		super.onArmorTick(world, player, stack);
 
-		if(this.drain > 0 && ArmorFSB.hasFSBArmor(player) && !player.capabilities.isCreativeMode) {
+		if(this.drain > 0 && ArmorFSB.hasFSBArmor(player) && !player.capabilities.isCreativeMode && world.getTotalWorldTime() % 10 == 0) {
 			this.setFill(stack, Math.max(this.getFill(stack) - this.drain, 0));
 		}
 	}
@@ -106,4 +96,32 @@ public class ArmorFSBFueled extends ArmorFSB implements IPartiallyFillable {
 	public double getDurabilityForDisplay(ItemStack stack) {
 		return 1 - (double) getFill(stack) / (double) getMaxFill(stack);
 	}
+
+	@Override
+	public boolean acceptsFluid(FluidType type, ItemStack stack) {
+		return type == this.fuelType;
+	}
+
+	@Override
+	public int tryFill(FluidType type, int amount, ItemStack stack) {
+		
+		if(!acceptsFluid(type, stack))
+			return amount;
+		
+		int toFill = Math.min(amount, this.fillRate);
+		toFill = Math.min(toFill, this.maxFuel - this.getFill(stack));
+		this.setFill(stack, this.getFill(stack) + toFill);
+		
+		return amount - toFill;
+	}
+
+	@Override
+	public boolean providesFluid(FluidType type, ItemStack stack) {
+		return false;
+	}
+
+	@Override
+	public int tryEmpty(FluidType type, int amount, ItemStack stack) {
+		return 0;
+	}
 }

src/main/java/com/hbm/items/tool/ItemAnalyzer.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import com.hbm.interfaces.IFluidContainer;
 import com.hbm.interfaces.IFluidDuct;
-import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.tileentity.machine.TileEntityDummy;
 import com.hbm.tileentity.machine.TileEntityLockableBase;
 import com.hbm.tileentity.network.TileEntityPylon;

src/main/java/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java

@@ -7,9 +7,9 @@ import com.hbm.entity.missile.EntityMissileCustom;
 import com.hbm.handler.MissileStruct;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.items.ModItems;
 import com.hbm.items.weapon.ItemCustomMissile;
 import com.hbm.items.weapon.ItemMissile;

src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchTable.java

@@ -7,9 +7,9 @@ import com.hbm.entity.missile.EntityMissileCustom;
 import com.hbm.handler.MissileStruct;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.items.ModItems;
 import com.hbm.items.weapon.ItemCustomMissile;
 import com.hbm.items.weapon.ItemMissile;

src/main/java/com/hbm/tileentity/machine/TileEntityAMSBase.java

@@ -6,9 +6,9 @@ import java.util.Random;
 
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.ItemCatalyst;
 import com.hbm.items.machine.ItemSatChip;

src/main/java/com/hbm/tileentity/machine/TileEntityAMSEmitter.java

@@ -7,9 +7,9 @@ import java.util.Random;
 import com.hbm.explosion.ExplosionLarge;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.items.ModItems;
 import com.hbm.lib.Library;
 import com.hbm.packet.AuxElectricityPacket;

src/main/java/com/hbm/tileentity/machine/TileEntityAMSLimiter.java

@@ -5,9 +5,9 @@ import java.util.Random;
 import com.hbm.explosion.ExplosionLarge;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.items.ModItems;
 import com.hbm.lib.Library;
 import com.hbm.packet.AuxElectricityPacket;

src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java

@@ -7,9 +7,9 @@ import java.util.Random;
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidSource;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.inventory.recipes.MachineRecipes;
 import com.hbm.lib.Library;
 import com.hbm.packet.NBTPacket;

src/main/java/com/hbm/tileentity/machine/TileEntityCondenser.java

@@ -5,9 +5,9 @@ import java.util.List;
 
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidSource;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.Library;
 import com.hbm.main.ModEventHandler;
 

src/main/java/com/hbm/tileentity/machine/TileEntityCore.java

@@ -4,9 +4,9 @@ import java.util.List;
 
 import com.hbm.entity.effect.EntityCloudFleijaRainbow;
 import com.hbm.entity.logic.EntityNukeExplosionMK3;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.ItemCatalyst;
 import com.hbm.lib.Library;

src/main/java/com/hbm/tileentity/machine/TileEntityCoreEmitter.java

@@ -3,9 +3,9 @@ package com.hbm.tileentity.machine;
 import java.util.List;
 
 import com.hbm.interfaces.IFluidAcceptor;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.ModDamageSource;
 import com.hbm.tileentity.TileEntityMachineBase;
 

src/main/java/com/hbm/tileentity/machine/TileEntityCoreInjector.java

@@ -1,9 +1,9 @@
 package com.hbm.tileentity.machine;
 
 import com.hbm.interfaces.IFluidAcceptor;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.tileentity.TileEntityMachineBase;
 
 import api.hbm.fluid.IFluidStandardReceiver;

src/main/java/com/hbm/tileentity/machine/TileEntityCoreReceiver.java

@@ -4,9 +4,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.hbm.interfaces.IFluidAcceptor;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.tileentity.TileEntityMachineBase;
 
 import api.hbm.block.ILaserable;

src/main/java/com/hbm/tileentity/machine/TileEntityDeuteriumExtractor.java

@@ -5,9 +5,9 @@ import java.util.List;
 
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidSource;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.Library;
 import com.hbm.packet.PacketDispatcher;
 import com.hbm.tileentity.TileEntityMachineBase;

src/main/java/com/hbm/tileentity/machine/TileEntityDeuteriumTower.java

@@ -1,9 +1,9 @@
 package com.hbm.tileentity.machine;
 
 import com.hbm.blocks.BlockDummyable;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.Library;
 import com.hbm.util.fauxpointtwelve.DirPos;
 

src/main/java/com/hbm/tileentity/machine/TileEntityElectrolyser.java

@@ -6,9 +6,9 @@ import java.util.List;
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidSource;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.Library;
 import com.hbm.tileentity.TileEntityMachineBase;
 

src/main/java/com/hbm/tileentity/machine/TileEntityFWatzCore.java

@@ -5,9 +5,9 @@ import java.util.Random;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
 import com.hbm.interfaces.IReactor;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.items.ModItems;
 import com.hbm.lib.Library;
 import com.hbm.packet.AuxElectricityPacket;

src/main/java/com/hbm/tileentity/machine/TileEntityHeaterOilburner.java

@@ -2,10 +2,10 @@ package com.hbm.tileentity.machine;
 
 import com.hbm.interfaces.IControlReceiver;
 import com.hbm.interfaces.IFluidAcceptor;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerOilburner;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.inventory.fluid.trait.FT_Flammable;
 import com.hbm.inventory.gui.GUIOilburner;
 import com.hbm.tileentity.IGUIProvider;

src/main/java/com/hbm/tileentity/machine/TileEntityITER.java

@@ -10,9 +10,9 @@ import com.hbm.explosion.ExplosionNT;
 import com.hbm.explosion.ExplosionNT.ExAttrib;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidSource;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.inventory.recipes.BreederRecipes;
 import com.hbm.inventory.recipes.FusionRecipes;
 import com.hbm.inventory.recipes.BreederRecipes.BreederRecipe;

src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssemfac.java

@@ -7,10 +7,10 @@ import java.util.Random;
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidSource;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.UpgradeManager;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.items.machine.ItemMachineUpgrade.UpgradeType;
 import com.hbm.lib.Library;
 import com.hbm.util.fauxpointtwelve.DirPos;

src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoiler.java

@@ -8,9 +8,9 @@ import com.hbm.blocks.machine.MachineBoiler;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
 import com.hbm.interfaces.IFluidSource;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.inventory.recipes.MachineRecipes;
 import com.hbm.lib.Library;
 import com.hbm.packet.AuxGaugePacket;

src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoilerElectric.java

@@ -8,9 +8,9 @@ import com.hbm.blocks.machine.MachineBoiler;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
 import com.hbm.interfaces.IFluidSource;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.inventory.recipes.MachineRecipes;
 import com.hbm.lib.Library;
 import com.hbm.packet.AuxElectricityPacket;

src/main/java/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java

@@ -2,9 +2,9 @@ package com.hbm.tileentity.machine;
 
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.items.ModItems;
 import com.hbm.lib.Library;
 import com.hbm.packet.AuxElectricityPacket;

src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemfac.java

@@ -7,10 +7,10 @@ import java.util.Random;
 
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.interfaces.IFluidAcceptor;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.UpgradeManager;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.items.machine.ItemMachineUpgrade.UpgradeType;
 import com.hbm.lib.Library;
 

src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java

@@ -6,11 +6,11 @@ import java.util.List;
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidSource;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.RecipesCommon.AStack;
 import com.hbm.inventory.UpgradeManager;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.inventory.recipes.ChemplantRecipes;
 import com.hbm.inventory.recipes.ChemplantRecipes.ChemRecipe;
 import com.hbm.items.ModItems;

src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplantBase.java

@@ -5,10 +5,10 @@ import java.util.List;
 
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidSource;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.RecipesCommon.AStack;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.inventory.recipes.ChemplantRecipes;
 import com.hbm.inventory.recipes.ChemplantRecipes.ChemRecipe;
 import com.hbm.items.ModItems;

src/main/java/com/hbm/tileentity/machine/TileEntityMachineCoal.java

@@ -13,9 +13,9 @@ import com.hbm.blocks.machine.MachineCoal;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
 import com.hbm.inventory.FluidContainerRegistry;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.items.ModItems;
 import com.hbm.lib.Library;
 import com.hbm.packet.AuxElectricityPacket;

src/main/java/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java

@@ -2,9 +2,9 @@ package com.hbm.tileentity.machine;
 
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.interfaces.IFluidAcceptor;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.inventory.recipes.CrystallizerRecipes;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.ItemMachineUpgrade;

src/main/java/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java

@@ -11,9 +11,9 @@ import com.hbm.explosion.ExplosionLarge;
 import com.hbm.explosion.ExplosionThermo;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidSource;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.inventory.recipes.CyclotronRecipes;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.ItemMachineUpgrade;

src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java

@@ -5,9 +5,9 @@ import java.util.HashMap;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
 import com.hbm.inventory.FluidContainerRegistry;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.inventory.fluid.trait.FT_Combustible;
 import com.hbm.inventory.fluid.trait.FT_Combustible.FuelGrade;
 import com.hbm.items.ModItems;

src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java

@@ -4,9 +4,9 @@ import java.util.HashMap;
 
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.interfaces.IFluidAcceptor;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.inventory.recipes.GasCentrifugeRecipes.PseudoFluidType;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.IItemFluidIdentifier;

src/main/java/com/hbm/tileentity/machine/TileEntityMachineGenerator.java

@@ -4,8 +4,8 @@ import java.util.Random;
 
 import com.hbm.blocks.machine.MachineGenerator;
 import com.hbm.explosion.ExplosionNukeGeneric;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.ItemFuelRod;
 import com.hbm.lib.Library;

src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java

@@ -2,9 +2,9 @@ package com.hbm.tileentity.machine;
 
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.interfaces.IFluidAcceptor;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.inventory.fluid.trait.FT_Flammable;
 import com.hbm.items.ModItems;
 import com.hbm.lib.Library;

src/main/java/com/hbm/tileentity/machine/TileEntityMachineInserter.java

@@ -6,9 +6,9 @@ import java.util.List;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
 import com.hbm.interfaces.IFluidSource;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.items.ModItems;
 import com.hbm.lib.Library;
 

src/main/java/com/hbm/tileentity/machine/TileEntityMachineLargeTurbine.java

@@ -7,9 +7,9 @@ import com.hbm.blocks.BlockDummyable;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
 import com.hbm.interfaces.IFluidSource;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.inventory.recipes.MachineRecipes;
 import com.hbm.lib.Library;
 import com.hbm.tileentity.TileEntityMachineBase;

src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java

@@ -8,10 +8,10 @@ import com.google.common.collect.Sets;
 import com.hbm.blocks.ModBlocks;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidSource;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.UpgradeManager;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.inventory.recipes.CentrifugeRecipes;
 import com.hbm.inventory.recipes.CrystallizerRecipes;
 import com.hbm.inventory.recipes.ShredderRecipes;

src/main/java/com/hbm/tileentity/machine/TileEntityMachinePlasmaHeater.java

@@ -7,9 +7,9 @@ import com.hbm.blocks.BlockDummyable;
 import com.hbm.blocks.ModBlocks;
 import com.hbm.blocks.machine.MachineITER;
 import com.hbm.interfaces.IFluidAcceptor;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.Library;
 import com.hbm.tileentity.TileEntityMachineBase;
 

src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java

@@ -9,9 +9,9 @@ import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
 import com.hbm.interfaces.IFluidSource;
 import com.hbm.inventory.FluidStack;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.inventory.recipes.RadiolysisRecipes;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.ItemRTGPellet;

src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java

@@ -11,9 +11,9 @@ import com.hbm.handler.radiation.ChunkRadiationManager;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
 import com.hbm.interfaces.IFluidSource;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.ItemFuelRod;
 import com.hbm.lib.Library;

src/main/java/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java

@@ -5,9 +5,9 @@ import java.util.HashMap;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
 import com.hbm.inventory.FluidContainerRegistry;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.inventory.fluid.trait.FT_Combustible;
 import com.hbm.inventory.fluid.trait.FT_Combustible.FuelGrade;
 import com.hbm.items.ModItems;

src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbine.java

@@ -6,9 +6,9 @@ import java.util.List;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
 import com.hbm.interfaces.IFluidSource;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.inventory.recipes.MachineRecipes;
 import com.hbm.lib.Library;
 import com.hbm.packet.AuxElectricityPacket;

src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java

@@ -4,10 +4,10 @@ import java.util.List;
 
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.UpgradeManager;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.inventory.fluid.trait.FT_Combustible;
 import com.hbm.inventory.fluid.trait.FT_Combustible.FuelGrade;
 import com.hbm.items.ModItems;

src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java

@@ -11,8 +11,8 @@ import com.hbm.config.MobConfig;
 import com.hbm.explosion.ExplosionNukeGeneric;
 import com.hbm.handler.radiation.ChunkRadiationManager;
 import com.hbm.interfaces.IControlReceiver;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.ItemPlateFuel;
 import com.hbm.lib.Library;

src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java

@@ -16,10 +16,10 @@ import com.hbm.interfaces.IControlReceiver;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
 import com.hbm.interfaces.IFluidSource;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.ItemZirnoxBreedingRod;
 import com.hbm.items.machine.ItemZirnoxRod;

src/main/java/com/hbm/tileentity/machine/TileEntitySILEX.java

@@ -5,10 +5,10 @@ import java.util.HashMap;
 import java.util.List;
 
 import com.hbm.interfaces.IFluidAcceptor;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.inventory.recipes.SILEXRecipes;
 import com.hbm.inventory.recipes.SILEXRecipes.SILEXRecipe;
 import com.hbm.items.ModItems;

src/main/java/com/hbm/tileentity/machine/TileEntitySolarBoiler.java

@@ -6,9 +6,9 @@ import java.util.List;
 
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidSource;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.Library;
 
 import api.hbm.fluid.IFluidStandardTransceiver;

src/main/java/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java

@@ -7,9 +7,9 @@ import com.hbm.handler.MissileStruct;
 import com.hbm.entity.missile.EntitySoyuz;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
-import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.items.ModItems;
 import com.hbm.lib.Library;
 import com.hbm.main.MainRegistry;