Revert "Fix rare possible npe in random hive trade"

This reverts commit 4ba3370fc9.

build.gradle

@@ -67,8 +67,7 @@ repositories {
 
 dependencies {
 	deobfCompile "mezz.jei:jei_${mcversion}:${jei_version}"
-//	deobfCompile "net.industrial-craft:industrialcraft-2:${ic2_version}:api"
-//	runtime "net.industrial-craft:industrialcraft-2:${ic2_version}:dev"
+	deobfCompile "net.industrial-craft:industrialcraft-2:${ic2_version}:api"
 }
 
 configurations {

gradle.properties

@@ -1,9 +1,10 @@
 mcversion=1.9.4
-forgeversion=12.17.0.1940
+forgeversion=12.17.0.1957
 mcp_mappings=snapshot_20160525
 
-jei_version=3.4.0.+
+jei_version=3.6.0.+
+ic2_version=2.5.5-ex19
 
 version_major=5
 version_minor=0
-version_patch=4
+version_patch=11

src/main/java/forestry/Forestry.java

@@ -49,7 +49,7 @@ import forestry.plugins.PluginManager;
 		name = "Forestry",
 		version = Constants.VERSION,
 		guiFactory = "forestry.core.config.ForestryGuiConfigFactory",
-		dependencies = "required-after:Forge@[12.17.0.1932,);"
+		dependencies = "required-after:Forge@[12.17.0.1949,);"
 				+ "after:Buildcraft|Core@[7.2,);"
 				+ "after:BuildCraft|Energy@[7.2,);"
 				+ "after:ExtrabiomesXL;"
@@ -57,6 +57,7 @@ import forestry.plugins.PluginManager;
 				+ "after:IC2@[2.3.235,);"
 				+ "after:Natura@[2.2.0,);"
 				+ "after:HardcoreEnderExpansion;"
+				+ "after:JEI@[3.6.0,);"
 				+ "after:basemetals;")
 public class Forestry {
 

src/main/java/forestry/api/farming/IFarmLogic.java

@@ -38,6 +38,8 @@ public interface IFarmLogic {
 	
 	String getName();
 	
-	@SideOnly(Side.CLIENT)
-	ItemStack getStack();
+	/**
+	 * @return the itemStack that represents this farm logic. Used as an icon for the farm logic.
+	 */
+	ItemStack getIconItemStack();
 }

src/main/java/forestry/api/genetics/IAlleleFactory.java

@@ -21,10 +21,10 @@ import net.minecraft.util.math.Vec3i;
  *
  * For example:
  * en_US
- * 	Forestry.allele.smallest=Smallest
+ * 	forestry.allele.smallest=Smallest
  * ru_RU
- * 	Forestry.allele.smallest=????? ?????????
- * 	Forestry.allele.height.smallest=????? ??????
+ * 	forestry.allele.smallest=????? ?????????
+ * 	forestry.allele.height.smallest=????? ??????
  */
 public interface IAlleleFactory {
 	/**

src/main/java/forestry/api/genetics/IAlyzerPlugin.java

@@ -1,6 +1,7 @@
 package forestry.api.genetics;
 
 import java.util.List;
+import java.util.Map;
 
 import net.minecraft.item.ItemStack;
 
@@ -20,5 +21,7 @@ public interface IAlyzerPlugin {
 	@SideOnly(Side.CLIENT)
 	void drawAnalyticsPage3(GuiAlyzer gui, ItemStack itemStack);
 
+	Map<String, ItemStack> getIconStacks();
+
 	List<String> getHints();
 }

src/main/java/forestry/api/greenhouse/IGreenhouseState.java

@@ -6,7 +6,7 @@
 package forestry.api.greenhouse;
 
 import java.util.Collection;
-import java.util.List;
+import java.util.Set;
 
 import forestry.api.core.EnumHumidity;
 import forestry.api.core.EnumTemperature;
@@ -22,7 +22,7 @@ public interface IGreenhouseState {
 
 	float getExactHumidity();
 	
-	List<IInternalBlock> getInternalBlocks();
+	Set<IInternalBlock> getInternalBlocks();
 	
 	Collection<IMultiblockComponent> getGreenhouseComponents();
 	

src/main/java/forestry/apiculture/PluginApiculture.java

@@ -92,6 +92,7 @@ import forestry.apiculture.multiblock.TileAlvearyStabiliser;
 import forestry.apiculture.multiblock.TileAlvearySwarmer;
 import forestry.apiculture.network.PacketRegistryApiculture;
 import forestry.apiculture.proxy.ProxyApiculture;
+import forestry.apiculture.proxy.ProxyApicultureClient;
 import forestry.apiculture.tiles.TileCandle;
 import forestry.apiculture.tiles.TileHive;
 import forestry.apiculture.worldgen.HiveDecorator;
@@ -127,19 +128,14 @@ public class PluginApiculture extends BlankForestryPlugin {
 	public static ProxyApiculture proxy;
 	private static final String CONFIG_CATEGORY = "apiculture";
 	public static String beekeepingMode = "NORMAL";
-	public static TextureAtlasSprite beeSprite;
 	private static float secondPrincessChance = 0;
 	public static final int ticksPerBeeWorkCycle = 550;
-	public static boolean fancyRenderedBees = false;
 
 	public static ItemRegistryApiculture items;
 	public static BlockRegistryApiculture blocks;
 
 	public static HiveRegistry hiveRegistry;
 
-	private final Map<String, String[]> defaultAcceptedFlowers = new HashMap<>();
-	private final Map<String, String[]> defaultPlantableFlowers = new HashMap<>();
-
 	public static VillagerRegistry.VillagerProfession villagerApiarist;
 
 	@Override
@@ -275,9 +271,12 @@ public class PluginApiculture extends BlankForestryPlugin {
 			villagerRegistry.register(villagerApiarist);
 
 			ItemStack wildcardPrincess = new ItemStack(items.beePrincessGE, 1);
+			ItemStack wildcardDrone = new ItemStack(items.beeDroneGE, 1);
 			ItemStack apiary = new ItemStack(blocks.apiary);
 			ItemStack provenFrames = items.frameProven.getItemStack();
 			ItemStack monasticDrone = BeeDefinition.MONASTIC.getMemberStack(EnumBeeType.DRONE);
+			ItemStack endDrone = BeeDefinition.ENDED.getMemberStack(EnumBeeType.DRONE);
+			ItemStack propolis = new ItemStack(PluginApiculture.items.propolis,1);
 
 			VillagerRegistry.VillagerCareer apiaristCareer = new VillagerRegistry.VillagerCareer(villagerApiarist, "apiarist");
 			apiaristCareer.addTrade(1,
@@ -287,19 +286,19 @@ public class PluginApiculture extends BlankForestryPlugin {
 			);
 			apiaristCareer.addTrade(2,
 					new VillagerTradeLists.GiveItemForEmeralds(new EntityVillager.PriceInfo(1, 4), new ItemStack(items.smoker), null),
-					new VillagerTradeLists.GiveItemForLogsAndEmeralds(apiary, new EntityVillager.PriceInfo(1, 1), new EntityVillager.PriceInfo(16, 32), new EntityVillager.PriceInfo(1, 2))
+					new VillagerTradeLists.GiveItemForLogsAndEmeralds(apiary, new EntityVillager.PriceInfo(1, 1), new EntityVillager.PriceInfo(16, 32), new EntityVillager.PriceInfo(1, 2)),
+					new VillagerApiaristTrades.GiveRandomHiveDroneForItems(propolis, null, wildcardDrone, new EntityVillager.PriceInfo(2, 4))
 			);
 			apiaristCareer.addTrade(3,
 					new VillagerTradeLists.GiveEmeraldForItems(wildcardPrincess, null),
 					new VillagerTradeLists.GiveItemForEmeralds(new EntityVillager.PriceInfo(1, 2), provenFrames, new EntityVillager.PriceInfo(1, 6))
 			);
 			apiaristCareer.addTrade(4,
-					new VillagerTradeLists.GiveItemForItemAndEmerald(wildcardPrincess, null, new EntityVillager.PriceInfo(10, 64), monasticDrone, null)
+					new VillagerTradeLists.GiveItemForItemAndEmerald(wildcardPrincess, null, new EntityVillager.PriceInfo(10, 64), monasticDrone, null),
+					new VillagerTradeLists.GiveItemForTwoItems(wildcardPrincess, null,new ItemStack(Items.ENDER_EYE),new EntityVillager.PriceInfo(12, 16),endDrone, null)
 			);
 		}
 
-		proxy.initializeRendering();
-
 		blocks.apiary.init();
 		blocks.beeHouse.init();
 		blocks.beeChest.init();
@@ -848,7 +847,7 @@ public class PluginApiculture extends BlankForestryPlugin {
 		for (int i = 0; i < ParticleSnow.sprites.length; i++) {
 			ParticleSnow.sprites[i] = event.getMap().registerSprite(new ResourceLocation("forestry:entity/particles/snow." + (i + 1)));
 		}
-		beeSprite = event.getMap().registerSprite(new ResourceLocation("forestry:entity/particles/swarm_bee"));
+		ProxyApicultureClient.beeSprite = event.getMap().registerSprite(new ResourceLocation("forestry:entity/particles/swarm_bee"));
 	}
 
 	private static class EndFlowerAcceptableRule implements IFlowerAcceptableRule {

src/main/java/forestry/apiculture/VillagerApiaristTrades.java

@@ -1,5 +1,6 @@
 package forestry.apiculture;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.util.Random;
 
@@ -8,6 +9,9 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.village.MerchantRecipe;
 import net.minecraft.village.MerchantRecipeList;
 
+import forestry.api.apiculture.EnumBeeType;
+import forestry.apiculture.genetics.BeeDefinition;
+
 public class VillagerApiaristTrades {
 
 	public static class GiveRandomCombsForItems implements EntityVillager.ITradeList {
@@ -24,7 +28,7 @@ public class VillagerApiaristTrades {
 		}
 
 		@Override
-		public void modifyMerchantRecipeList(MerchantRecipeList recipeList, Random random) {
+		public void modifyMerchantRecipeList(@Nonnull MerchantRecipeList recipeList, @Nonnull Random random) {
 			int sellAmount = 1;
 			if (this.priceInfo != null) {
 				sellAmount = this.priceInfo.getPrice(random);
@@ -41,5 +45,46 @@ public class VillagerApiaristTrades {
 			recipeList.add(new MerchantRecipe(itemToBuy, randomComb));
 		}
 	}
+	public static class GiveRandomHiveDroneForItems implements EntityVillager.ITradeList {
+		@Nonnull
+		public ItemStack buyingItemStack;
+		@Nullable
+		public EntityVillager.PriceInfo buyingPriceInfo;
+		@Nonnull
+		public ItemStack buyingItemStackTwo;
+		@Nullable
+		public EntityVillager.PriceInfo buyingPriceItemTwoInfo;
 
+		public GiveRandomHiveDroneForItems(
+				@Nonnull ItemStack buyingItemStack,
+				@Nullable EntityVillager.PriceInfo buyingPriceInfo,
+				@Nonnull ItemStack buyingItemStackTwo,
+				@Nullable EntityVillager.PriceInfo buyingPriceItemTwoInfo) {
+			this.buyingItemStack = buyingItemStack;
+			this.buyingPriceInfo = buyingPriceInfo;
+			this.buyingItemStackTwo = buyingItemStackTwo;
+			this.buyingPriceItemTwoInfo = buyingPriceItemTwoInfo;
+		}
+
+		@Override
+		public void modifyMerchantRecipeList(@Nonnull MerchantRecipeList recipeList, @Nonnull Random random) {
+
+			int buyAmount = 1;
+			if (this.buyingPriceInfo != null) {
+				buyAmount = this.buyingPriceInfo.getPrice(random);
+			}
+
+			int buyTwoAmount = 1;
+			if (this.buyingPriceItemTwoInfo != null) {
+				buyTwoAmount = this.buyingPriceItemTwoInfo.getPrice(random);
+			}
+			BeeDefinition [] forestryMundane = new BeeDefinition[] { BeeDefinition.FOREST, BeeDefinition.MEADOWS, BeeDefinition.MODEST, BeeDefinition.WINTRY, BeeDefinition.TROPICAL, BeeDefinition.MARSHY };
+			ItemStack randomHiveDrone = forestryMundane[random.nextInt(forestryMundane.length)].getMemberStack(EnumBeeType.DRONE);
+			ItemStack buyItemStack = this.buyingItemStack.copy();
+			buyItemStack.stackSize = buyAmount;
+			ItemStack buyItemStackTwo = this.buyingItemStackTwo.copy();
+			buyItemStackTwo.stackSize = buyTwoAmount;
+			recipeList.add(new MerchantRecipe(buyItemStack, buyItemStackTwo, randomHiveDrone));
+		}
+	}
 }

src/main/java/forestry/apiculture/blocks/BlockTypeApicultureTesr.java

@@ -33,12 +33,8 @@ public enum BlockTypeApicultureTesr implements IBlockTypeTesr {
 	@Nonnull
 	private final IMachinePropertiesTesr<?> machineProperties;
 
-	<T extends TileForestry> BlockTypeApicultureTesr(@Nonnull Class<T> teClass, @Nonnull String name, @Nullable TileEntitySpecialRenderer<? super T> renderer, @Nullable AxisAlignedBB boundingBox) {
-		if (boundingBox != null) {
-			this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, boundingBox, Constants.MOD_ID + ":blocks/" + name + ".0");
-		} else {
-			this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, Constants.MOD_ID + ":blocks/" + name + ".0");
-		}
+	<T extends TileForestry> BlockTypeApicultureTesr(@Nonnull Class<T> teClass, @Nonnull String name, @Nullable TileEntitySpecialRenderer<? super T> renderer, AxisAlignedBB boundingBox) {
+		this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, boundingBox, Constants.MOD_ID + ":blocks/" + name + ".0");
 	}
 
 	@Nonnull

src/main/java/forestry/apiculture/compat/ApicultureJeiPlugin.java

@@ -1,15 +1,20 @@
 package forestry.apiculture.compat;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.Arrays;
 import java.util.List;
 
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
 
+import forestry.api.genetics.IAlleleSpecies;
 import forestry.apiculture.PluginApiculture;
+import forestry.apiculture.genetics.BeeGenome;
 
 import mezz.jei.api.BlankModPlugin;
 import mezz.jei.api.IModRegistry;
+import mezz.jei.api.INbtRegistry;
 import mezz.jei.api.JEIPlugin;
 
 @JEIPlugin
@@ -34,5 +39,21 @@ public class ApicultureJeiPlugin extends BlankModPlugin {
 		registry.addDescription(new ItemStack(PluginApiculture.items.habitatLocator), "for.jei.description.habitat.locator");
 
 		registry.addDescription(new ItemStack(PluginApiculture.items.scoop), "for.jei.description.scoop");
+
+		INbtRegistry nbtRegistry = registry.getJeiHelpers().getNbtRegistry();
+		nbtRegistry.registerNbtInterpreter(PluginApiculture.items.beeDroneGE, BeeNbtInterpreter.INSTANCE);
+		nbtRegistry.registerNbtInterpreter(PluginApiculture.items.beePrincessGE, BeeNbtInterpreter.INSTANCE);
+		nbtRegistry.registerNbtInterpreter(PluginApiculture.items.beeQueenGE, BeeNbtInterpreter.INSTANCE);
+	}
+
+	private static class BeeNbtInterpreter implements INbtRegistry.INbtInterpreter {
+		public static BeeNbtInterpreter INSTANCE = new BeeNbtInterpreter();
+
+		@Nullable
+		@Override
+		public String getSubtypeInfoFromNbt(@Nonnull NBTTagCompound nbtTagCompound) {
+			IAlleleSpecies species = BeeGenome.getSpeciesDirectly(nbtTagCompound);
+			return species == null ? null : species.getUID();
+		}
 	}
 }

src/main/java/forestry/apiculture/entities/ParticleBeeExplore.java

@@ -12,20 +12,19 @@ package forestry.apiculture.entities;
 
 import net.minecraft.client.particle.Particle;
 import net.minecraft.client.renderer.VertexBuffer;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 
-import forestry.apiculture.PluginApiculture;
+import forestry.apiculture.proxy.ProxyApicultureClient;
 
 public class ParticleBeeExplore extends Particle {
 	private final Vec3d origin;
 
 	public ParticleBeeExplore(World world, Vec3d origin, BlockPos destination, int color) {
 		super(world, origin.xCoord, origin.yCoord, origin.zCoord, 0.0D, 0.0D, 0.0D);
-		setParticleTexture(PluginApiculture.beeSprite);
+		setParticleTexture(ProxyApicultureClient.beeSprite);
 		this.origin = origin;
 
 		this.motionX = (destination.getX() + 0.5 - this.posX) * 0.015;
@@ -124,6 +123,13 @@ public class ParticleBeeExplore extends Particle {
 		return 15728880;
 	}
 
+	// avoid calculating collisions
+	@Override
+	public void moveEntity(double x, double y, double z) {
+		this.setEntityBoundingBox(this.getEntityBoundingBox().offset(x, y, z));
+		this.resetPositionToBB();
+	}
+	
 	@Override
 	public int getFXLayer() {
 		return 1;

src/main/java/forestry/apiculture/entities/ParticleBeeRoundTrip.java

@@ -17,7 +17,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 
-import forestry.apiculture.PluginApiculture;
+import forestry.apiculture.proxy.ProxyApicultureClient;
 
 public class ParticleBeeRoundTrip extends Particle {
 	private final Vec3d origin;
@@ -25,7 +25,7 @@ public class ParticleBeeRoundTrip extends Particle {
 
 	public ParticleBeeRoundTrip(World world, Vec3d origin, BlockPos destination, int color) {
 		super(world, origin.xCoord, origin.yCoord, origin.zCoord, 0.0D, 0.0D, 0.0D);
-		setParticleTexture(PluginApiculture.beeSprite);
+		setParticleTexture(ProxyApicultureClient.beeSprite);
 		this.origin = origin;
 
 		this.destination = destination;
@@ -126,6 +126,13 @@ public class ParticleBeeRoundTrip extends Particle {
 		return 15728880;
 	}
 
+	// avoid calculating collisions
+	@Override
+	public void moveEntity(double x, double y, double z) {
+		this.setEntityBoundingBox(this.getEntityBoundingBox().offset(x, y, z));
+		this.resetPositionToBB();
+	}
+
 	@Override
 	public int getFXLayer() {
 		return 1;

src/main/java/forestry/apiculture/entities/ParticleBeeTargetEntity.java

@@ -13,11 +13,10 @@ package forestry.apiculture.entities;
 import net.minecraft.client.particle.Particle;
 import net.minecraft.client.renderer.VertexBuffer;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 
-import forestry.apiculture.PluginApiculture;
+import forestry.apiculture.proxy.ProxyApicultureClient;
 
 public class ParticleBeeTargetEntity extends Particle {
 	private final Vec3d origin;
@@ -25,7 +24,7 @@ public class ParticleBeeTargetEntity extends Particle {
 
 	public ParticleBeeTargetEntity(World world, Vec3d origin, Entity entity, int color) {
 		super(world, origin.xCoord, origin.yCoord, origin.zCoord, 0.0D, 0.0D, 0.0D);
-		setParticleTexture(PluginApiculture.beeSprite);
+		setParticleTexture(ProxyApicultureClient.beeSprite);
 
 		this.origin = origin;
 		this.entity = entity;

src/main/java/forestry/apiculture/genetics/BeeAlyzerPlugin.java

@@ -251,6 +251,11 @@ public class BeeAlyzerPlugin implements IAlyzerPlugin {
 		textLayout.endPage();
 	}
 
+	@Override
+	public Map<String, ItemStack> getIconStacks() {
+		return iconStacks;
+	}
+
 	@Override
 	public List<String> getHints() {
 		return Config.hints.get("beealyzer");

src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectCreeper.java

@@ -85,7 +85,7 @@ public class AlleleEffectCreeper extends AlleleEffectThrottled {
 			}
 
 			float pitch = (1.0F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F;
-			world.playSound((EntityPlayer)null, housingCoords.getX(), housingCoords.getY(), housingCoords.getZ(), SoundEvents.ENTITY_GENERIC_EXPLODE, SoundCategory.BLOCKS, 4.0F, pitch);
+			world.playSound(null, housingCoords.getX(), housingCoords.getY(), housingCoords.getZ(), SoundEvents.ENTITY_GENERIC_EXPLODE, SoundCategory.BLOCKS, 4.0F, pitch);
 			storedData.setInteger(indexExplosionTimer, 2); // Set explosion timer
 		}
 

src/main/java/forestry/apiculture/inventory/InventoryHygroregulator.java

@@ -12,10 +12,10 @@ package forestry.apiculture.inventory;
 
 import net.minecraft.item.ItemStack;
 
-import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidUtil;
 
 import forestry.apiculture.multiblock.TileAlvearyHygroregulator;
-import forestry.core.fluids.FluidHelper;
 import forestry.core.inventory.InventoryAdapterTile;
 
 public class InventoryHygroregulator extends InventoryAdapterTile<TileAlvearyHygroregulator> {
@@ -28,8 +28,8 @@ public class InventoryHygroregulator extends InventoryAdapterTile<TileAlvearyHyg
 	@Override
 	public boolean canSlotAccept(int slotIndex, ItemStack itemStack) {
 		if (slotIndex == SLOT_INPUT) {
-			Fluid fluid = FluidHelper.getFluidInContainer(itemStack);
-			return tile.getTankManager().accepts(fluid);
+			FluidStack fluid = FluidUtil.getFluidContained(itemStack);
+			return tile.getTankManager().canFillFluidType(fluid);
 		}
 		return false;
 	}

src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java

@@ -17,10 +17,10 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumFacing;
 
+import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.FluidTankInfo;
-import net.minecraftforge.fluids.IFluidHandler;
+import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
 
 import forestry.api.core.IClimateControlled;
 import forestry.api.multiblock.IAlvearyComponent;
@@ -36,7 +36,7 @@ import forestry.core.fluids.tanks.FilteredTank;
 import forestry.core.inventory.IInventoryAdapter;
 import forestry.core.tiles.ILiquidTankTile;
 
-public class TileAlvearyHygroregulator extends TileAlveary implements IInventory, ILiquidTankTile, IFluidHandler, IAlvearyComponent.Climatiser {
+public class TileAlvearyHygroregulator extends TileAlveary implements IInventory, ILiquidTankTile, IAlvearyComponent.Climatiser {
 	private final HygroregulatorRecipe[] recipes;
 
 	private final TankManager tankManager;
@@ -55,7 +55,8 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory
 		Fluid lava = Fluids.LAVA.getFluid();
 		Fluid liquidIce = Fluids.ICE.getFluid();
 
-		this.liquidTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, water, lava, liquidIce);
+		this.liquidTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY).setFilters(water, lava, liquidIce);
+
 		this.tankManager = new TankManager(this, liquidTank);
 
 		this.recipes = new HygroregulatorRecipe[]{new HygroregulatorRecipe(new FluidStack(water, 1), 1, 0.01f, -0.005f),
@@ -91,7 +92,7 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory
 			currentRecipe = getRecipe(liquidTank.getFluid());
 
 			if (currentRecipe != null) {
-				liquidTank.drain(currentRecipe.liquid.amount, true);
+				liquidTank.drainInternal(currentRecipe.liquid.amount, true);
 				transferTime = currentRecipe.transferTime;
 			}
 		}
@@ -150,33 +151,22 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory
 	}
 
 	@Override
-	public int fill(EnumFacing from, FluidStack resource, boolean doFill) {
-		return tankManager.fill(from, resource, doFill);
+	public boolean hasCapability(Capability<?> capability, EnumFacing facing) {
+		if (super.hasCapability(capability, facing)) {
+			return true;
+		}
+		return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY;
 	}
 
 	@Override
-	public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) {
-		return tankManager.drain(from, resource, doDrain);
-	}
-
-	@Override
-	public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) {
-		return tankManager.drain(from, maxDrain, doDrain);
-	}
-
-	@Override
-	public boolean canFill(EnumFacing from, Fluid fluid) {
-		return tankManager.canFill(from, fluid);
-	}
-
-	@Override
-	public boolean canDrain(EnumFacing from, Fluid fluid) {
-		return tankManager.canDrain(from, fluid);
-	}
-
-	@Override
-	public FluidTankInfo[] getTankInfo(EnumFacing from) {
-		return tankManager.getTankInfo(from);
+	public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
+		if (super.hasCapability(capability, facing)) {
+			return super.getCapability(capability, facing);
+		}
+		if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
+			return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tankManager);
+		}
+		return null;
 	}
 
 	@Override

src/main/java/forestry/apiculture/proxy/ProxyApiculture.java

@@ -12,7 +12,4 @@ package forestry.apiculture.proxy;
 
 public class ProxyApiculture {
 
-	public void initializeRendering() {
-	}
-
 }

src/main/java/forestry/apiculture/proxy/ProxyApicultureClient.java

@@ -10,10 +10,10 @@
  ******************************************************************************/
 package forestry.apiculture.proxy;
 
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+
 public class ProxyApicultureClient extends ProxyApiculture {
 
-	@Override
-	public void initializeRendering() {
-		// TODO: remove unused bee entity model completely
-	}
+	public static TextureAtlasSprite beeSprite;
+
 }

src/main/java/forestry/apiculture/render/ModelBee.java

@@ -160,9 +160,4 @@ public class ModelBee extends ModelBase {
 		model.rotateAngleZ = z;
 	}
 
-	@Override
-	public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) {
-		super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
-	}
-
 }

src/main/java/forestry/apiculture/tiles/TileHive.java

@@ -231,8 +231,7 @@ public class TileHive extends TileEntity implements ITickable, IHiveTile, IActiv
 		if (damage > 0) {
 			// Entities are not attacked if they wear a full set of apiarist's armor.
 			int count = BeeManager.armorApiaristHelper.wearsItems(entity, damageSourceBeeHive.damageType, true);
-			damage -= damage / 4.0f * count;
-			if (damage > 0) {
+			if (entity.worldObj.rand.nextInt(4) >= count) {
 				entity.attackEntityFrom(damageSourceBeeHive, damage);
 			}
 		}

src/main/java/forestry/apiculture/worldgen/HiveDecorator.java

@@ -34,7 +34,7 @@ import forestry.core.utils.Log;
 
 public abstract class HiveDecorator {
 
-	private static final EventType EVENT_TYPE = EnumHelper.addEnum(EventType.class, "FORESTRY_HIVES", new Class[0], new Object[0]);
+	private static final EventType EVENT_TYPE = EnumHelper.addEnum(EventType.class, "FORESTRY_HIVES", new Class[0]);
 
 	public static void decorateHives(IChunkGenerator chunkProvider, World world, Random rand, int chunkX, int chunkZ, boolean hasVillageGenerated) {
 		if (!TerrainGen.populate(chunkProvider, world, rand, chunkX, chunkZ, hasVillageGenerated, EVENT_TYPE)) {

src/main/java/forestry/apiculture/worldgen/VillageApiaristHouse.java

@@ -112,7 +112,7 @@ public class VillageApiaristHouse extends StructureVillagePieces.House1 {
 	}
 
 	public static VillageApiaristHouse buildComponent(StructureVillagePieces.Start startPiece, List<StructureComponent> par1List, Random random, int structureMinX, int structureMinY, int structureMinZ, EnumFacing facing, int componentType) {
-		StructureBoundingBox bbox = StructureBoundingBox.getComponentToAddBoundingBox(structureMinX, structureMinY, structureMinZ, 0, 0, 0, 10, 9, 11, facing);
+		StructureBoundingBox bbox = StructureBoundingBox.getComponentToAddBoundingBox(structureMinX, structureMinY, structureMinZ, -4, 0, 0, 12, 9, 12, facing);
 		if (!canVillageGoDeeper(bbox) || StructureComponent.findIntersecting(par1List, bbox) != null) {
 			return null;
 		}
@@ -129,7 +129,7 @@ public class VillageApiaristHouse extends StructureVillagePieces.House1 {
 				return true;
 			}
 
-			boundingBox.offset(0, averageGroundLevel - boundingBox.maxY + 8 - 1, 0);
+			boundingBox.offset(0, averageGroundLevel - boundingBox.maxY + 9 - 1, 0);
 		}
 
 		fillWithBlocks(world, structBoundingBox, 1, 1, 1, 7, 4, 4, Blocks.AIR.getDefaultState(), Blocks.AIR.getDefaultState(), false);

src/main/java/forestry/arboriculture/PluginArboriculture.java

@@ -71,7 +71,6 @@ import forestry.arboriculture.genetics.alleles.AlleleFruit;
 import forestry.arboriculture.genetics.alleles.AlleleGrowth;
 import forestry.arboriculture.genetics.alleles.AlleleLeafEffect;
 import forestry.arboriculture.items.ItemCharcoal;
-import forestry.arboriculture.items.ItemGermlingGE;
 import forestry.arboriculture.items.ItemRegistryArboriculture;
 import forestry.arboriculture.models.TextureLeaves;
 import forestry.arboriculture.network.PacketRegistryArboriculture;

src/main/java/forestry/arboriculture/blocks/BlockArbDoor.java

@@ -16,6 +16,7 @@ import java.util.Collections;
 import java.util.Random;
 
 import net.minecraft.block.BlockDoor;
+import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -40,7 +41,7 @@ public class BlockArbDoor extends BlockDoor implements IWoodTyped, IItemModelReg
 	private final EnumForestryWoodType woodType;
 
 	public BlockArbDoor(EnumForestryWoodType woodType) {
-		super(MaterialArbWood.ARB_WOOD);
+		super(Material.WOOD);
 		this.woodType = woodType;
 
 		setHarvestLevel("axe", 0);

src/main/java/forestry/arboriculture/blocks/BlockPile.java

@@ -47,7 +47,6 @@ import net.minecraftforge.common.property.IUnlistedProperty;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import forestry.api.arboriculture.EnumGermlingType;
 import forestry.api.arboriculture.EnumPileType;
 import forestry.api.arboriculture.IAlleleTreeSpecies;
 import forestry.api.arboriculture.ITree;
@@ -192,7 +191,7 @@ public abstract class BlockPile extends BlockStructure implements ITileEntityPro
 	
     @Override
 	public RayTraceResult collisionRayTrace(IBlockState blockState, World worldIn, BlockPos pos, Vec3d start, Vec3d end){
-        List<RayTraceResult> list = Lists.<RayTraceResult>newArrayList();
+        List<RayTraceResult> list = Lists.newArrayList();
 
         for (AxisAlignedBB axisalignedbb : getCollisionBoxList(this.getActualState(blockState, worldIn, pos)))
         {
@@ -229,7 +228,7 @@ public abstract class BlockPile extends BlockStructure implements ITileEntityPro
     }
 
     private static List<AxisAlignedBB> getCollisionBoxList(IBlockState state){
-        List<AxisAlignedBB> list = Lists.<AxisAlignedBB>newArrayList();
+        List<AxisAlignedBB> list = Lists.newArrayList();
         EnumPilePosition position = state.getValue(PILE_POSITION);
         
         if(position != EnumPilePosition.INTERIOR){
@@ -312,15 +311,15 @@ public abstract class BlockPile extends BlockStructure implements ITileEntityPro
 			float f2 = pos.getZ() + 0.5F;
 			float f3 = 0.52F;
 			float f4 = rand.nextFloat() * 0.6F - 0.3F;
-			world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, f + f3 - 0.5, f1 + 0.5, f2 + f4, 0.0D, 0.0D, 0.0D, new int[0]);
+			world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, f + f3 - 0.5, f1 + 0.5, f2 + f4, 0.0D, 0.0D, 0.0D);
 		}
 	}
 
 	@SideOnly(Side.CLIENT)
 	@Override
-	public void getSubBlocks(Item item, CreativeTabs tab, List subItems) {
+	public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> subItems) {
 		if(getPileType() == EnumPileType.WOOD){
-			List<ItemStack> woodPiles = new ArrayList();
+			List<ItemStack> woodPiles = new ArrayList<>();
 			for(ITree tree : TreeManager.treeRoot.getIndividualTemplates()) {
 				woodPiles.add(createWoodPile(tree));
 			}
@@ -407,7 +406,7 @@ public abstract class BlockPile extends BlockStructure implements ITileEntityPro
 
 	@Nonnull
 	private List<ItemStack> getPileDrop(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
-		ArrayList<ItemStack> list = new ArrayList<ItemStack>();
+		List<ItemStack> list = new ArrayList<>();
 		TileEntity tile = world.getTileEntity(pos);
 		if (tile instanceof ICharcoalPileComponent) {
 			ICharcoalPileComponent pile = (ICharcoalPileComponent) tile;

src/main/java/forestry/arboriculture/genetics/TreeAlyzerPlugin.java

@@ -291,6 +291,11 @@ public class TreeAlyzerPlugin implements IAlyzerPlugin {
 		textLayout.endPage();
 	}
 
+	@Override
+	public Map<String, ItemStack> getIconStacks() {
+		return iconStacks;
+	}
+
 	@Override
 	public List<String> getHints() {
 		return Config.hints.get("treealyzer");

src/main/java/forestry/arboriculture/items/ItemBlockPile.java

@@ -73,14 +73,16 @@ public class ItemBlockPile<B extends Block> extends ItemBlockForestry<Block> {
 	public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState newState) {
 		boolean placed = super.placeBlockAt(stack, player, world, pos, side, hitX, hitY, hitZ, newState);
 
-		if(block == PluginArboriculture.blocks.piles.get(EnumPileType.WOOD)){
-			if (block.hasTileEntity(newState)) {
-				if (stack.hasTagCompound()) {
-					TilePile tile = TileUtil.getTile(world, pos, TilePile.class);
-					if (tile != null) {
-						tile.readFromNBT(stack.getTagCompound());
-						tile.setPos(pos);
-						tile.markDirty();
+		if (placed) {
+			if (block == PluginArboriculture.blocks.piles.get(EnumPileType.WOOD)) {
+				if (block.hasTileEntity(newState)) {
+					if (stack.hasTagCompound()) {
+						TilePile tile = TileUtil.getTile(world, pos, TilePile.class);
+						if (tile != null) {
+							tile.readFromNBT(stack.getTagCompound());
+							tile.setPos(pos);
+							tile.markDirty();
+						}
 					}
 				}
 			}

src/main/java/forestry/arboriculture/items/ItemCharcoal.java

@@ -2,11 +2,8 @@ package forestry.arboriculture.items;
 
 import java.util.List;
 
-import forestry.api.arboriculture.ITree;
-import forestry.api.arboriculture.TreeManager;
 import forestry.api.core.IModelManager;
 import forestry.api.core.Tabs;
-import forestry.core.genetics.alleles.AlleleHelper;
 import forestry.core.items.ItemForestry;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;

src/main/java/forestry/arboriculture/models/ModelLeaves.java

@@ -92,14 +92,14 @@ public class ModelLeaves extends ModelBlockDefault<BlockForestryLeaves> {
 		TextureAtlasSprite leafSprite = map.getAtlasSprite(leafSpriteLocation.toString());
 		
 		// Render the plain leaf block.
-		baker.addBlockModel(block, Block.FULL_BLOCK_AABB, pos, leafSprite, 0);
+		baker.addBlockModel(block, Block.FULL_BLOCK_AABB, null, leafSprite, 0);
 
 		// Render overlay for fruit leaves.
 		ResourceLocation fruitSpriteLocation = tile.getFruitSprite();
 
 		if (fruitSpriteLocation != null) {
 			TextureAtlasSprite fruitSprite = map.getAtlasSprite(fruitSpriteLocation.toString());
-			baker.addBlockModel(block, Block.FULL_BLOCK_AABB, pos, fruitSprite, 1);
+			baker.addBlockModel(block, Block.FULL_BLOCK_AABB, null, fruitSprite, 1);
 		}
 		
 		// Set the particle sprite

src/main/java/forestry/arboriculture/worldgen/WorldGenBalsa.java

@@ -29,13 +29,6 @@ public class WorldGenBalsa extends WorldGenTree {
 		super(tree, 6, 6);
 	}
 
-	@Nonnull
-	@Override
-	public Set<BlockPos> generateTrunk(World world, Random rand, TreeBlockTypeLog wood, BlockPos startPos) {
-		WorldGenHelper.generateTreeTrunk(world, rand, wood, startPos, height, girth, 0, 0, null, 0);
-		return Collections.emptySet();
-	}
-
 	@Override
 	protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
 		BlockPos.MutableBlockPos leafCenter = new BlockPos.MutableBlockPos(startPos.add(0, height, 0));

src/main/java/forestry/arboriculture/worldgen/WorldGenDate.java

@@ -28,13 +28,6 @@ public class WorldGenDate extends WorldGenTree {
 		super(tree, 6, 2);
 	}
 
-	@Nonnull
-	@Override
-	public Set<BlockPos> generateTrunk(World world, Random rand, TreeBlockTypeLog wood, BlockPos startPos) {
-		WorldGenHelper.generateTreeTrunk(world, rand, wood, startPos, height, girth, 0, 0, null, 0);
-		return Collections.emptySet();
-	}
-
 	@Override
 	protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
 		int leafSpawn = height + 1;

src/main/java/forestry/arboriculture/worldgen/WorldGenLarch.java

@@ -28,13 +28,6 @@ public class WorldGenLarch extends WorldGenTree {
 		super(tree, 6, 5);
 	}
 
-	@Nonnull
-	@Override
-	public Set<BlockPos> generateTrunk(World world, Random rand, TreeBlockTypeLog wood, BlockPos startPos) {
-		WorldGenHelper.generateTreeTrunk(world, rand, wood, startPos, height, girth, 0, 0, null, 0);
-		return Collections.emptySet();
-	}
-
 	@Override
 	protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
 		int leafSpawn = height + 1;

src/main/java/forestry/arboriculture/worldgen/WorldGenLemon.java

@@ -28,13 +28,6 @@ public class WorldGenLemon extends WorldGenTree {
 		super(tree, 6, 3);
 	}
 
-	@Nonnull
-	@Override
-	public Set<BlockPos> generateTrunk(World world, Random rand, TreeBlockTypeLog wood, BlockPos startPos) {
-		WorldGenHelper.generateTreeTrunk(world, rand, wood, startPos, height, girth, 0, 0, null, 0);
-		return Collections.emptySet();
-	}
-
 	@Override
 	protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
 		int yCenter = height - girth;

src/main/java/forestry/arboriculture/worldgen/WorldGenPlum.java

@@ -28,13 +28,6 @@ public class WorldGenPlum extends WorldGenTree {
 		super(tree, 6, 3);
 	}
 
-	@Nonnull
-	@Override
-	public Set<BlockPos> generateTrunk(World world, Random rand, TreeBlockTypeLog wood, BlockPos startPos) {
-		WorldGenHelper.generateTreeTrunk(world, rand, wood, startPos, height, girth, 0, 0, null, 0);
-		return Collections.emptySet();
-	}
-
 	@Override
 	protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
 		int yCenter = height - girth;

src/main/java/forestry/arboriculture/worldgen/WorldGenPoplar.java

@@ -28,13 +28,6 @@ public class WorldGenPoplar extends WorldGenTree {
 		super(tree, 8, 3);
 	}
 
-	@Nonnull
-	@Override
-	public Set<BlockPos> generateTrunk(World world, Random rand, TreeBlockTypeLog wood, BlockPos startPos) {
-		WorldGenHelper.generateTreeTrunk(world, rand, wood, startPos, height, girth, 0, 0, null, 0);
-		return Collections.emptySet();
-	}
-
 	@Override
 	protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
 		int leafSpawn = height + 1;

src/main/java/forestry/core/PluginCore.java

@@ -17,6 +17,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
+import forestry.core.fluids.Fluids;
 import net.minecraft.command.ICommand;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -31,6 +32,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import net.minecraftforge.oredict.OreDictionary;
+import net.minecraftforge.oredict.RecipeSorter;
 
 import forestry.api.circuits.ChipsetManager;
 import forestry.api.core.ForestryAPI;
@@ -48,7 +50,6 @@ import forestry.core.commands.CommandPlugins;
 import forestry.core.commands.RootCommand;
 import forestry.core.config.Config;
 import forestry.core.config.Constants;
-import forestry.core.fluids.Fluids;
 import forestry.core.genetics.alleles.AlleleFactory;
 import forestry.core.genetics.alleles.AlleleHelper;
 import forestry.core.genetics.alleles.AlleleRegistry;
@@ -61,6 +62,7 @@ import forestry.core.network.IPacketRegistry;
 import forestry.core.network.PacketRegistryCore;
 import forestry.core.proxy.Proxies;
 import forestry.core.recipes.RecipeUtil;
+import forestry.core.recipes.ShapedRecipeCustom;
 import forestry.core.render.TextureManager;
 import forestry.core.utils.ClimateUtil;
 import forestry.core.utils.ForestryModEnvWarningCallable;
@@ -133,6 +135,8 @@ public class PluginCore extends BlankForestryPlugin {
 		AlleleHelper.instance.init();
 
 		Proxies.render.initRendering();
+
+		RecipeSorter.register("forestry:shaped", ShapedRecipeCustom.class, RecipeSorter.Category.SHAPED, "");
 	}
 
 	@Override
@@ -336,9 +340,9 @@ public class PluginCore extends BlankForestryPlugin {
 		int bogEarthOutputCan = ForestryAPI.activeMode.getIntegerSetting("recipe.output.bogearth.can");
 		if (bogEarthOutputCan > 0) {
 			ItemStack bogEarth = blocks.bogEarth.get(BlockBogEarth.SoilType.BOG_EARTH, bogEarthOutputCan);
-			ItemStack canWater = PluginFluids.items.getContainer(EnumContainerType.CAN, Fluids.WATER).getItemStack();
-			ItemStack waxCapsuleWater = PluginFluids.items.getContainer(EnumContainerType.CAPSULE, Fluids.WATER).getItemStack();
-			ItemStack refractoryWater = PluginFluids.items.getContainer(EnumContainerType.REFRACTORY, Fluids.WATER).getItemStack();
+			ItemStack canWater = PluginFluids.items.getContainer(EnumContainerType.CAN, Fluids.WATER);
+			ItemStack waxCapsuleWater = PluginFluids.items.getContainer(EnumContainerType.CAPSULE, Fluids.WATER);
+			ItemStack refractoryWater = PluginFluids.items.getContainer(EnumContainerType.REFRACTORY, Fluids.WATER);
 			RecipeUtil.addRecipe(bogEarth, "#Y#", "YXY", "#Y#", '#', Blocks.DIRT, 'X', canWater, 'Y', OreDictUtil.SAND);
 			RecipeUtil.addRecipe(bogEarth, "#Y#", "YXY", "#Y#", '#', Blocks.DIRT, 'X', waxCapsuleWater, 'Y', OreDictUtil.SAND);
 			RecipeUtil.addRecipe(bogEarth, "#Y#", "YXY", "#Y#", '#', Blocks.DIRT, 'X', refractoryWater, 'Y', OreDictUtil.SAND);

src/main/java/forestry/core/PluginFluids.java

@@ -12,13 +12,12 @@ package forestry.core;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fml.common.registry.GameData;
+import net.minecraftforge.fml.common.registry.ForgeRegistries;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
 import forestry.api.core.ForestryAPI;
@@ -28,9 +27,6 @@ import forestry.api.recipes.RecipeManagers;
 import forestry.core.config.Config;
 import forestry.core.config.Constants;
 import forestry.core.fluids.Fluids;
-import forestry.core.fluids.LiquidRegistryHelper;
-import forestry.core.items.EnumContainerType;
-import forestry.core.items.ItemLiquidContainer;
 import forestry.core.items.ItemRegistryFluids;
 import forestry.core.proxy.Proxies;
 import forestry.core.utils.Log;
@@ -68,14 +64,20 @@ public class PluginFluids extends BlankForestryPlugin {
 				if (fluidBlock != null) {
 					String name = "fluid." + forestryFluid.getTag();
 					fluidBlock.setUnlocalizedName("forestry." + name);
-					GameRegistry.registerBlock(fluidBlock, ItemBlock.class, name);
+					fluidBlock.setRegistryName(name);
+					GameRegistry.register(fluidBlock);
+
+					ItemBlock itemBlock = new ItemBlock(fluidBlock);
+					itemBlock.setRegistryName(name);
+					GameRegistry.register(itemBlock);
+
 					Proxies.render.registerFluidStateMapper(fluidBlock, forestryFluid);
 					if (forestryFluid.getOtherContainers().isEmpty()) {
 						FluidRegistry.addBucketForFluid(fluid);
 					}
 				}
 			} else {
-				ResourceLocation resourceLocation = GameData.getBlockRegistry().getNameForObject(fluidBlock);
+				ResourceLocation resourceLocation = ForgeRegistries.BLOCKS.getKey(fluidBlock);
 				Log.warning("Pre-existing {} fluid block detected, deferring to {}:{}, "
 						+ "this may cause issues if the server/client have different mod load orders, "
 						+ "recommended that you disable all but one instance of {} fluid blocks via your configs.", fluid.getName(), resourceLocation.getResourceDomain(), resourceLocation.getResourcePath(), fluid.getName());
@@ -99,25 +101,6 @@ public class PluginFluids extends BlankForestryPlugin {
 
 	@Override
 	public void doInit() {
-		for (Fluids fluidType : Fluids.values()) {
-			if (fluidType.getFluid() == null) {
-				continue;
-			}
-
-			for (EnumContainerType type : EnumContainerType.values()) {
-				ItemLiquidContainer container = items.getContainer(type, fluidType);
-				if (container == null) {
-					continue;
-				}
-
-				LiquidRegistryHelper.registerLiquidContainer(fluidType, container.getItemStack());
-			}
-
-			for (ItemStack filledContainer : fluidType.getOtherContainers()) {
-				LiquidRegistryHelper.registerLiquidContainer(fluidType, filledContainer);
-			}
-		}
-
 		if (RecipeManagers.squeezerManager != null) {
 			RecipeManagers.squeezerManager.addContainerRecipe(10, items.canEmpty.getItemStack(), PluginCore.items.ingotTin.copy(), 0.05f);
 			RecipeManagers.squeezerManager.addContainerRecipe(10, items.waxCapsuleEmpty.getItemStack(), PluginCore.items.beeswax.getItemStack(), 0.10f);

src/main/java/forestry/core/blocks/BlockBase.java

@@ -20,7 +20,6 @@ import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.particle.ParticleManager;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Items;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -40,7 +39,9 @@ import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraft.world.World;
 
-import net.minecraftforge.fluids.IFluidHandler;
+import net.minecraftforge.fluids.FluidUtil;
+import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
+import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
@@ -51,7 +52,6 @@ import forestry.api.core.IStateMapperRegister;
 import forestry.api.core.ITextureManager;
 import forestry.core.access.IAccessHandler;
 import forestry.core.circuits.ISocketable;
-import forestry.core.fluids.FluidHelper;
 import forestry.core.proxy.Proxies;
 import forestry.core.render.MachineParticleCallback;
 import forestry.core.render.MachineStateMapper;
@@ -124,6 +124,14 @@ public class BlockBase<P extends Enum<P> & IBlockType & IStringSerializable> ext
 		return definition.getBoundingBox(pos, blockState);
 	}
 
+	@Nonnull
+	@Override
+	@SideOnly(Side.CLIENT)
+	public AxisAlignedBB getSelectedBoundingBox(IBlockState state, World worldIn, BlockPos pos) {
+		IMachineProperties definition = getDefinition();
+		return definition.getBoundingBox(pos, state).offset(pos);
+	}
+
 	@Override
 	public RayTraceResult collisionRayTrace(IBlockState blockState, World worldIn, BlockPos pos, Vec3d start, Vec3d end) {
 		IMachineProperties definition = getDefinition();
@@ -139,10 +147,6 @@ public class BlockBase<P extends Enum<P> & IBlockType & IStringSerializable> ext
 	/* INTERACTION */
 	@Override
 	public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
-		if (playerIn.isSneaking()) {
-			return false;
-		}
-
 		TileBase tile = TileUtil.getTile(worldIn, pos, TileBase.class);
 		if (tile == null) {
 			return false;
@@ -154,9 +158,12 @@ public class BlockBase<P extends Enum<P> & IBlockType & IStringSerializable> ext
 
 		IAccessHandler access = tile.getAccessHandler();
 
-		if (heldItem != null && heldItem.getItem() != Items.BUCKET && tile instanceof IFluidHandler && access.allowsAlteration(playerIn)) {
-			if (FluidHelper.handleRightClick((IFluidHandler) tile, side, playerIn, true, tile.canDrainWithBucket())) {
-				return true;
+		if (!playerIn.isSneaking()) {
+			if (tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side)) {
+				IFluidHandler tileFluidHandler = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side);
+				if (FluidUtil.interactWithFluidHandler(heldItem, tileFluidHandler, playerIn)) {
+					return true;
+				}
 			}
 		}
 

src/main/java/forestry/core/blocks/BlockRegistry.java

@@ -10,8 +10,6 @@
  ******************************************************************************/
 package forestry.core.blocks;
 
-import javax.annotation.Nonnull;
-
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
@@ -20,7 +18,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.oredict.OreDictionary;
 
 import forestry.core.proxy.Proxies;
-import forestry.core.utils.OreDictUtil;
 import forestry.plugins.PluginManager;
 
 public abstract class BlockRegistry {

src/main/java/forestry/core/blocks/BlockResourceOre.java

@@ -35,7 +35,6 @@ import forestry.api.core.IItemModelRegister;
 import forestry.api.core.IModelManager;
 import forestry.core.CreativeTabForestry;
 import forestry.core.PluginCore;
-import forestry.core.utils.OreDictUtil;
 
 public class BlockResourceOre extends Block implements IItemModelRegister, IBlockWithMeta {
 	public static final PropertyEnum<EnumResourceType> ORE_RESOURCES = PropertyEnum.create("resource", EnumResourceType.class, new Predicate<EnumResourceType>(){

src/main/java/forestry/core/config/Config.java

@@ -297,7 +297,7 @@ public class Config {
 		try {
 			InputStream hintStream = Config.class.getResourceAsStream("/config/forestry/hints.properties");
 			prop.load(hintStream);
-		} catch (IOException e) {
+		} catch (IOException | NullPointerException e) {
 			Log.error("Failed to load hints file.", e);
 		}
 

src/main/java/forestry/core/config/Constants.java

@@ -13,6 +13,7 @@ package forestry.core.config;
 import net.minecraft.util.ResourceLocation;
 
 import forestry.api.core.IForestryConstants;
+import net.minecraftforge.fluids.Fluid;
 
 public class Constants implements IForestryConstants {
 	// System
@@ -25,7 +26,6 @@ public class Constants implements IForestryConstants {
 	public static final int FLAG_BLOCK_UPDATE = 1;
 	public static final int FLAG_BLOCK_SYNC = 2;
 
-	public static final int BUCKET_VOLUME = 1000;
 	public static final int FLUID_PER_HONEY_DROP = 100;
 
 	public static final int[] SLOTS_NONE = new int[0];
@@ -63,7 +63,7 @@ public class Constants implements IForestryConstants {
 	public static final int APIARY_BREEDING_TIME = 100;
 
 	// Energy
-	public static final int ENGINE_TANK_CAPACITY = 10 * BUCKET_VOLUME;
+	public static final int ENGINE_TANK_CAPACITY = 10 * Fluid.BUCKET_VOLUME;
 	public static final int ENGINE_CYCLE_DURATION_WATER = 1000;
 	public static final int ENGINE_CYCLE_DURATION_JUICE = 2500;
 	public static final int ENGINE_CYCLE_DURATION_HONEY = 2500;
@@ -101,7 +101,7 @@ public class Constants implements IForestryConstants {
 	public static final int ENGINE_TIN_MAX_EU_BATTERY = 100;
 
 	// Factory
-	public static final int PROCESSOR_TANK_CAPACITY = 10 * BUCKET_VOLUME;
+	public static final int PROCESSOR_TANK_CAPACITY = 10 * Fluid.BUCKET_VOLUME;
 
 	public static final int MACHINE_MAX_ENERGY = 5000;
 
@@ -117,7 +117,7 @@ public class Constants implements IForestryConstants {
 	public static final float ICE_COOLING_MULTIPLIER = 6f; // multiple of water's cooling value
 
 	// Storage
-	public static final int RAINTANK_TANK_CAPACITY = 30 * BUCKET_VOLUME;
+	public static final int RAINTANK_TANK_CAPACITY = 30 * Fluid.BUCKET_VOLUME;
 	public static final int RAINTANK_AMOUNT_PER_UPDATE = 10;
 	public static final int RAINTANK_FILLING_TIME = 12;
 	public static final int CARPENTER_CRATING_CYCLES = 5;

src/main/java/forestry/core/entities/EntitySelector.java

@@ -33,11 +33,6 @@ public abstract class EntitySelector<T extends Entity> implements Predicate<T> {
 		T castEntity = entityClass.cast(entity);
 		return isEntityApplicableTyped(castEntity);
 	}
-	
-	@Override
-	public boolean equals(Object obj) {
-		return super.equals(obj);
-	}
 
 	protected abstract boolean isEntityApplicableTyped(T entity);
 }

src/main/java/forestry/core/fluids/FakeTankManager.java

@@ -14,16 +14,12 @@ import java.util.List;
 
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.IContainerListener;
-import net.minecraft.util.EnumFacing;
 
-import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidTank;
+import net.minecraftforge.fluids.capability.templates.EmptyFluidHandler;
 
-import forestry.core.fluids.tanks.FakeTank;
-
-public class FakeTankManager implements ITankManager {
+public class FakeTankManager extends EmptyFluidHandler implements ITankManager {
 	public static final FakeTankManager instance = new FakeTankManager();
 
 	private FakeTankManager() {
@@ -47,41 +43,21 @@ public class FakeTankManager implements ITankManager {
 
 	@Override
 	public IFluidTank getTank(int tankIndex) {
-		return FakeTank.INSTANCE;
+		return EmptyFluidHandler.INSTANCE;
+	}
+
+	@Override
+	public boolean canFillFluidType(FluidStack fluidStack) {
+		return false;
+	}
+
+	@Override
+	public boolean canDrainFluidType(FluidStack fluidStack) {
+		return false;
 	}
 
 	@Override
 	public void processTankUpdate(int tankIndex, FluidStack contents) {
 
 	}
-
-	@Override
-	public int fill(EnumFacing from, FluidStack resource, boolean doFill) {
-		return FakeTank.INSTANCE.fill(resource, doFill);
-	}
-
-	@Override
-	public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) {
-		return FakeTank.INSTANCE.drain(resource.amount, doDrain);
-	}
-
-	@Override
-	public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) {
-		return FakeTank.INSTANCE.drain(maxDrain, doDrain);
-	}
-
-	@Override
-	public boolean canFill(EnumFacing from, Fluid fluid) {
-		return false;
-	}
-
-	@Override
-	public boolean canDrain(EnumFacing from, Fluid fluid) {
-		return false;
-	}
-
-	@Override
-	public FluidTankInfo[] getTankInfo(EnumFacing from) {
-		return FakeTank.INFO;
-	}
 }

src/main/java/forestry/core/fluids/FluidHelper.java

@@ -10,101 +10,22 @@
  ******************************************************************************/
 package forestry.core.fluids;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
 
 import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidContainerRegistry;
-import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.IFluidContainerItem;
-import net.minecraftforge.fluids.IFluidHandler;
+import net.minecraftforge.fluids.FluidUtil;
+import net.minecraftforge.fluids.capability.IFluidHandler;
+import net.minecraftforge.fluids.capability.IFluidTankProperties;
 
-import forestry.core.PluginFluids;
-import forestry.core.config.Constants;
 import forestry.core.utils.InventoryUtil;
-import forestry.core.utils.ItemStackUtil;
 
-/**
- * @author CovertJaguar <http://www.railcraft.info>
- */
 public final class FluidHelper {
 
 	private FluidHelper() {
 	}
 
-	public static boolean handleRightClick(IFluidHandler tank, EnumFacing side, EntityPlayer player, boolean fill, boolean drain) {
-		if (player == null) {
-			return false;
-		}
-		ItemStack current = player.inventory.getCurrentItem();
-		if (current != null) {
-
-			FluidStack liquid = getFluidStackInContainer(current);
-
-			if (fill && liquid != null) {
-				int canUseAmount = tank.fill(side, liquid, false);
-				if (canUseAmount == 0) {
-					return false;
-				}
-
-				ItemStack drainedContainer = getDrainedContainer(current, canUseAmount);
-				if (ItemStackUtil.isIdenticalItem(current, drainedContainer)) {
-					return false;
-				}
-
-				int usedAmount = tank.fill(side, liquid, true);
-				if (usedAmount > 0) {
-					if (!player.capabilities.isCreativeMode) {
-						if (current.stackSize > 1) {
-							player.inventory.decrStackSize(player.inventory.currentItem, 1);
-							if (drainedContainer != null && !player.inventory.addItemStackToInventory(drainedContainer)) {
-								player.dropItem(drainedContainer, false);
-							}
-						} else {
-							player.inventory.setInventorySlotContents(player.inventory.currentItem, drainedContainer);
-						}
-						player.inventory.markDirty();
-					}
-					return true;
-				}
-
-			} else if (drain) {
-
-				FluidStack available = tank.drain(side, Integer.MAX_VALUE, false);
-				if (available != null) {
-					ItemStack filled = getFilledContainer(available, current);
-
-					liquid = getFluidStackInContainer(filled);
-					if (liquid != null) {
-
-						if (current.stackSize > 1) {
-							if (!player.inventory.addItemStackToInventory(filled)) {
-								return false;
-							}
-							player.inventory.setInventorySlotContents(player.inventory.currentItem, InventoryUtil.depleteItem(current));
-							player.inventory.markDirty();
-						} else {
-							player.inventory.setInventorySlotContents(player.inventory.currentItem, InventoryUtil.depleteItem(current));
-							player.inventory.setInventorySlotContents(player.inventory.currentItem, filled);
-							player.inventory.markDirty();
-						}
-
-						tank.drain(side, liquid.amount, true);
-						return true;
-					}
-				}
-			}
-		}
-		return false;
-	}
-
 	public static boolean areFluidStacksEqual(FluidStack fluidStack1, FluidStack fluidStack2) {
 		if (fluidStack1 == null) {
 			return fluidStack2 == null;
@@ -117,10 +38,6 @@ public final class FluidHelper {
 		SUCCESS, INVALID_INPUT, NO_FLUID, NO_SPACE
 	}
 
-	public static FillStatus fillContainers(IFluidHandler fluidHandler, IInventory inv, int inputSlot, int outputSlot, Fluid fluidToFill) {
-		return fillContainers(fluidHandler, inv, inputSlot, outputSlot, fluidToFill, true);
-	}
-
 	public static FillStatus fillContainers(IFluidHandler fluidHandler, IInventory inv, int inputSlot, int outputSlot, Fluid fluidToFill, boolean doFill) {
 		if (fluidToFill == null) {
 			return FillStatus.INVALID_INPUT;
@@ -132,30 +49,33 @@ public final class FluidHelper {
 		}
 		ItemStack output = inv.getStackInSlot(outputSlot);
 
-		int containerCapacity = getFluidCapacity(fluidToFill, input);
+		ItemStack filled = input.copy();
+		filled.stackSize = 1;
+
+		IFluidHandler fluidFilledHandler = FluidUtil.getFluidHandler(filled);
+		if (fluidFilledHandler == null) {
+			return FillStatus.INVALID_INPUT;
+		}
+
+		int containerCapacity = fluidFilledHandler.fill(new FluidStack(fluidToFill, Integer.MAX_VALUE), false);
 		if (containerCapacity <= 0) {
 			return FillStatus.INVALID_INPUT;
 		}
 
-		int fillAmount = containerCapacity;
-		if (input.getItem() instanceof IFluidContainerItem) {
-			fillAmount = Math.min(Constants.BUCKET_VOLUME, containerCapacity);
-		}
-
-		FluidStack canDrain = fluidHandler.drain(null, new FluidStack(fluidToFill, fillAmount), false);
+		FluidStack canDrain = fluidHandler.drain(new FluidStack(fluidToFill, containerCapacity), false);
 		if (canDrain == null || canDrain.amount == 0) {
 			return FillStatus.NO_FLUID;
 		}
 
-		ItemStack filled = getFilledContainer(canDrain, input);
-		if (filled == null) {
+		if (fluidFilledHandler.fill(canDrain, true) <= 0) {
 			return FillStatus.NO_FLUID; // standard containers will not fill if there isn't enough fluid
 		}
 
-		FluidStack fluidInContainer = getFluidStackInContainer(filled);
+		FluidStack fluidInContainer = fluidFilledHandler.drain(Integer.MAX_VALUE, false);
 		if (fluidInContainer == null) {
 			return FillStatus.INVALID_INPUT;
 		}
+
 		boolean moveToOutput = fluidInContainer.amount >= containerCapacity;
 		if (moveToOutput) {
 			if (output != null && (output.stackSize >= output.getMaxStackSize() || !InventoryUtil.isItemEqual(filled, output))) {
@@ -168,7 +88,7 @@ public final class FluidHelper {
 		}
 
 		if (doFill) {
-			fluidHandler.drain(null, canDrain, true);
+			fluidHandler.drain(canDrain, true);
 			if (moveToOutput) {
 				if (output == null) {
 					inv.setInventorySlotContents(outputSlot, filled);
@@ -184,101 +104,93 @@ public final class FluidHelper {
 		return FillStatus.SUCCESS;
 	}
 
-	public static boolean drainContainers(IFluidHandler fluidHandler, IInventory inv, int slot) {
-		return drainContainers(fluidHandler, inv, slot, slot);
-	}
-
-	public static boolean drainContainers(IFluidHandler fluidHandler, IInventory inv, int inputSlot, int outputSlot) {
+	public static boolean drainContainers(IFluidHandler fluidHandler, IInventory inv, int inputSlot) {
 		ItemStack input = inv.getStackInSlot(inputSlot);
-		ItemStack output = inv.getStackInSlot(outputSlot);
-
 		if (input == null) {
 			return false;
 		}
 
-		FluidStack fluidInContainer = getFluidStackInContainer(input);
-		if (fluidInContainer == null) {
+		ItemStack drainedItemSimulated = FluidUtil.tryEmptyContainer(input, fluidHandler, Fluid.BUCKET_VOLUME, null, false);
+		if (drainedItemSimulated == null) {
 			return false;
 		}
 
-		if (input.getItem() instanceof IFluidContainerItem) {
-			if (fluidInContainer.amount > Constants.BUCKET_VOLUME) {
-				fluidInContainer.amount = Constants.BUCKET_VOLUME;
-			}
-		}
-
-		int used = fluidHandler.fill(null, fluidInContainer, false);
-
-		ItemStack drainedItem = getDrainedContainer(input, used);
-		if (ItemStack.areItemStacksEqual(input, drainedItem)) {
-			return false;
-		}
-
-		// consume forestry containers if there is only one slot
-		if (outputSlot == inputSlot && drainedItem != null) {
-			Item item = drainedItem.getItem();
-			if (PluginFluids.items.canEmpty == item || PluginFluids.items.waxCapsuleEmpty == item || PluginFluids.items.refractoryEmpty == item) {
-				drainedItem = null;
-			}
-		}
-
-		if (!hasRoomForDrainedContainer(input, output, drainedItem, inputSlot, outputSlot)) {
-			return false;
-		}
-
-		fluidHandler.fill(null, fluidInContainer, true);
-
-		if (drainedItem != null) {
-			if (outputSlot == inputSlot) {
-				inv.setInventorySlotContents(outputSlot, drainedItem);
+		if (input.stackSize == 1 || drainedItemSimulated.stackSize == 0) {
+			ItemStack drainedItem = FluidUtil.tryEmptyContainer(input, fluidHandler, Fluid.BUCKET_VOLUME, null, true);
+			if (drainedItem != null) {
+				if (drainedItem.stackSize > 0) {
+					inv.setInventorySlotContents(inputSlot, drainedItem);
+				} else {
+					inv.decrStackSize(inputSlot, 1);
+				}
 				return true;
 			}
+		}
 
-			if (output == null) {
-				inv.setInventorySlotContents(outputSlot, drainedItem);
-			} else {
-				output.stackSize++;
+		return false;
+	}
+
+	public static boolean isFillableContainerWithRoom(ItemStack container) {
+		IFluidHandler fluidHandler = FluidUtil.getFluidHandler(container);
+		if (fluidHandler == null) {
+			return false;
+		}
+
+		IFluidTankProperties[] tankProperties = fluidHandler.getTankProperties();
+		for (IFluidTankProperties properties : tankProperties) {
+			if (properties.canFill() && properties.getCapacity() > 0) {
+				FluidStack contents = properties.getContents();
+				if (contents == null) {
+					return true;
+				} else if (contents.amount < properties.getCapacity()) {
+					return true;
+				}
 			}
 		}
-		inv.decrStackSize(inputSlot, 1);
+
+		return false;
+	}
+
+	public static boolean isFillableEmptyContainer(ItemStack empty) {
+		IFluidHandler fluidHandler = FluidUtil.getFluidHandler(empty);
+		if (fluidHandler == null) {
+			return false;
+		}
+
+		IFluidTankProperties[] tankProperties = fluidHandler.getTankProperties();
+		for (IFluidTankProperties properties : tankProperties) {
+			if (!properties.canFill()) {
+				return false;
+			}
+
+			FluidStack contents = properties.getContents();
+			if (contents != null && contents.amount > 0) {
+				return false;
+			}
+		}
+
 		return true;
 	}
 
-	private static boolean hasRoomForDrainedContainer(ItemStack input, ItemStack output, ItemStack drainedItem, int inputSlot, int outputSlot) {
-		if (output == null || drainedItem == null) {
-			return true;
-		}
-
-		if (outputSlot == inputSlot) {
-			return input.stackSize == 1;
-		}
-
-		if (!ItemStackUtil.isIdenticalItem(output, drainedItem)) {
+	public static boolean isDrainableFilledContainer(ItemStack container) {
+		IFluidHandler fluidHandler = FluidUtil.getFluidHandler(container);
+		if (fluidHandler == null) {
 			return false;
 		}
 
-		return output.stackSize + drainedItem.stackSize <= output.getMaxStackSize();
-	}
+		IFluidTankProperties[] tankProperties = fluidHandler.getTankProperties();
+		for (IFluidTankProperties properties : tankProperties) {
+			if (!properties.canDrain()) {
+				return false;
+			}
 
-	public static boolean isEmptyContainer(ItemStack empty) {
-		Item item = empty.getItem();
-		if (item instanceof IFluidContainerItem) {
-			IFluidContainerItem containerItem = (IFluidContainerItem) item;
-			FluidStack fluid = containerItem.getFluid(empty);
-			return fluid == null || fluid.amount == 0;
+			FluidStack contents = properties.getContents();
+			if (contents == null || contents.amount < properties.getCapacity()) {
+				return false;
+			}
 		}
 
-		return FluidContainerRegistry.isEmptyContainer(empty);
-	}
-
-	public static boolean isFillableContainer(ItemStack container) {
-		FluidStack fluid = getFluidStackInContainer(container);
-		if (fluid == null || fluid.amount == 0) {
-			return isEmptyContainer(container);
-		}
-
-		int capacity = getFluidCapacity(fluid.getFluid(), container);
-		return fluid.amount < capacity;
+		return true;
 	}
 
 	public static ItemStack getDrainedContainer(ItemStack container, int drainAmount) {
@@ -290,127 +202,38 @@ public final class FluidHelper {
 			return container;
 		}
 
-		Item item = container.getItem();
-		if (item == null) {
+		container = container.copy();
+		container.stackSize = 1;
+
+		IFluidHandler fluidHandler = FluidUtil.getFluidHandler(container);
+		if (fluidHandler == null) {
 			return null;
 		}
 
-		if (item instanceof IFluidContainerItem) {
-			ItemStack drained = container.copy();
-			drained.stackSize = 1;
-			IFluidContainerItem containerItem = (IFluidContainerItem) item;
-			containerItem.drain(drained, drainAmount, true);
-			return drained;
-		} else {
-			int capacity = FluidContainerRegistry.getContainerCapacity(container);
-			if (capacity > 0) {
-				if (drainAmount < capacity) {
-					return container;
-				}
-				return FluidContainerRegistry.drainFluidContainer(container);
-			}
+		fluidHandler.drain(drainAmount, true);
+		if (container.stackSize <= 0) {
+			return null;
 		}
 
+		return container;
+	}
+
+	public static ItemStack getFilledContainer(FluidStack liquid, ItemStack stack) {
+		if (liquid == null || stack == null) {
+			return null;
+		}
+
+		stack = stack.copy();
+		stack.stackSize = 1;
+
+		IFluidHandler fluidHandler = FluidUtil.getFluidHandler(stack);
+		if (fluidHandler == null) {
+			return null;
+		}
+
+		if (fluidHandler.fill(liquid, true) > 0) {
+			return stack;
+		}
 		return null;
 	}
-
-	public static ItemStack getEmptyContainer(ItemStack container) {
-		if (container == null) {
-			return null;
-		}
-		FluidStack fluidStack = FluidHelper.getFluidStackInContainer(container);
-		if (fluidStack == null) {
-			return null;
-		}
-
-		return FluidHelper.getDrainedContainer(container, fluidStack.amount);
-	}
-
-	public static List<ItemStack> getAllFilledContainers(ItemStack empty) {
-		List<ItemStack> filledContainers = new ArrayList<>();
-		for (Fluid fluid : FluidRegistry.getRegisteredFluids().values()) {
-			ItemStack filledContainer = getFilledContainer(fluid, empty);
-			if (filledContainer != null) {
-				filledContainers.add(filledContainer);
-			}
-		}
-		return filledContainers;
-	}
-
-	public static ItemStack getFilledContainer(Fluid fluid, ItemStack empty) {
-		if (fluid == null) {
-			return null;
-		}
-
-		FluidStack fluidToFill = new FluidStack(fluid, Integer.MAX_VALUE);
-
-		return getFilledContainer(fluidToFill, empty);
-	}
-
-	public static ItemStack getFilledContainer(FluidStack liquid, ItemStack empty) {
-		if (liquid == null || empty == null) {
-			return null;
-		}
-
-		Item item = empty.getItem();
-		if (item instanceof IFluidContainerItem) {
-			ItemStack full = ItemStackUtil.createSplitStack(empty, 1);
-			IFluidContainerItem containerItem = (IFluidContainerItem) item;
-			containerItem.fill(full, liquid, true);
-			return full;
-		}
-
-		return FluidContainerRegistry.fillFluidContainer(liquid, empty);
-	}
-
-	public static FluidStack getFluidStackInContainer(ItemStack stack) {
-		if (stack == null) {
-			return null;
-		}
-		Item item = stack.getItem();
-		if (item instanceof IFluidContainerItem) {
-			IFluidContainerItem containerItem = (IFluidContainerItem) item;
-			return containerItem.getFluid(stack);
-		}
-
-		return FluidContainerRegistry.getFluidForFilledItem(stack);
-	}
-
-	public static Fluid getFluidInContainer(ItemStack stack) {
-		FluidStack fluidStack = getFluidStackInContainer(stack);
-		return fluidStack != null ? fluidStack.getFluid() : null;
-	}
-
-	public static boolean containsFluidStack(ItemStack stack, FluidStack fluidStack) {
-		Item item = stack.getItem();
-		if (item instanceof IFluidContainerItem) {
-			IFluidContainerItem containerItem = (IFluidContainerItem) item;
-			FluidStack contained = containerItem.getFluid(stack);
-			return contained != null && contained.containsFluid(fluidStack);
-		}
-
-		return FluidContainerRegistry.containsFluid(stack, fluidStack);
-	}
-
-	public static boolean containsFluid(ItemStack stack, Fluid fluid) {
-		return containsFluidStack(stack, new FluidStack(fluid, 1));
-	}
-
-	public static int getFluidCapacity(Fluid fluid, ItemStack container) {
-		if (container == null) {
-			return 0;
-		}
-		Item item = container.getItem();
-		if (item instanceof IFluidContainerItem) {
-			IFluidContainerItem containerItem = (IFluidContainerItem) item;
-			return containerItem.getCapacity(container);
-		}
-
-		if (fluid == null) {
-			return FluidContainerRegistry.getContainerCapacity(container);
-		} else {
-			return FluidContainerRegistry.getContainerCapacity(new FluidStack(fluid, Constants.BUCKET_VOLUME), container);
-		}
-	}
-
 }

src/main/java/forestry/core/fluids/Fluids.java

@@ -15,7 +15,6 @@ import javax.annotation.Nullable;
 import java.awt.Color;
 import java.io.IOException;
 import java.util.Collections;
-import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -30,10 +29,11 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidUtil;
 import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.relauncher.Side;
+
 import forestry.core.items.DrinkProperties;
-import forestry.core.items.EnumContainerType;
 import forestry.core.proxy.Proxies;
 import forestry.core.render.ForestryResource;
 
@@ -44,32 +44,12 @@ public enum Fluids {
 		public Block makeBlock() {
 			return new BlockForestryFluid(this, 300, true);
 		}
-
-		@Nonnull
-		@Override
-		public EnumSet<EnumContainerType> getContainerTypes() {
-			return EnumSet.of(
-					EnumContainerType.CAN,
-					EnumContainerType.CAPSULE,
-					EnumContainerType.REFRACTORY
-			);
-		}
 	},
 	BIOMASS(new Color(100, 132, 41), 400, 6560) {
 		@Override
 		public Block makeBlock() {
 			return new BlockForestryFluid(this, 100, true);
 		}
-
-		@Nonnull
-		@Override
-		public EnumSet<EnumContainerType> getContainerTypes() {
-			return EnumSet.of(
-					EnumContainerType.CAN,
-					EnumContainerType.CAPSULE,
-					EnumContainerType.REFRACTORY
-			);
-		}
 	},
 	GLASS(new Color(164, 164, 164), 2400, 10000) {
 		@Override
@@ -88,16 +68,6 @@ public enum Fluids {
 			return new BlockForestryFluid(this);
 		}
 
-		@Nonnull
-		@Override
-		public EnumSet<EnumContainerType> getContainerTypes() {
-			return EnumSet.of(
-					EnumContainerType.CAN,
-					EnumContainerType.CAPSULE,
-					EnumContainerType.REFRACTORY
-			);
-		}
-
 		@Override
 		public DrinkProperties getDrinkProperties() {
 			return new DrinkProperties(2, 0.2f, 64);
@@ -113,16 +83,6 @@ public enum Fluids {
 		public Block makeBlock() {
 			return new BlockForestryFluid(this);
 		}
-
-		@Nonnull
-		@Override
-		public EnumSet<EnumContainerType> getContainerTypes() {
-			return EnumSet.of(
-					EnumContainerType.CAN,
-					EnumContainerType.CAPSULE,
-					EnumContainerType.REFRACTORY
-			);
-		}
 	},
 	JUICE(new Color(168, 201, 114)) {
 		@Override
@@ -130,16 +90,6 @@ public enum Fluids {
 			return new BlockForestryFluid(this);
 		}
 
-		@Nonnull
-		@Override
-		public EnumSet<EnumContainerType> getContainerTypes() {
-			return EnumSet.of(
-					EnumContainerType.CAN,
-					EnumContainerType.CAPSULE,
-					EnumContainerType.REFRACTORY
-			);
-		}
-
 		@Override
 		public DrinkProperties getDrinkProperties() {
 			return new DrinkProperties(2, 0.2f, 32);
@@ -164,16 +114,6 @@ public enum Fluids {
 		public Block makeBlock() {
 			return new BlockForestryFluid(this, 2, true);
 		}
-
-		@Nonnull
-		@Override
-		public EnumSet<EnumContainerType> getContainerTypes() {
-			return EnumSet.of(
-					EnumContainerType.CAN,
-					EnumContainerType.CAPSULE,
-					EnumContainerType.REFRACTORY
-			);
-		}
 	},
 	SHORT_MEAD(new Color(239, 154, 56), 1000, 1200) {
 		@Override
@@ -182,50 +122,11 @@ public enum Fluids {
 		}
 	},
 	// Vanilla
-	WATER(new Color(0x2432ec)) {
-		@Nonnull
-		@Override
-		public EnumSet<EnumContainerType> getContainerTypes() {
-			return EnumSet.of(
-					EnumContainerType.CAN,
-					EnumContainerType.CAPSULE,
-					EnumContainerType.REFRACTORY
-			);
-		}
-	},
-	LAVA(new Color(0xfd461f)) {
-		@Nonnull
-		@Override
-		public EnumSet<EnumContainerType> getContainerTypes() {
-			return EnumSet.of(
-					EnumContainerType.CAN,
-					EnumContainerType.REFRACTORY
-			);
-		}
-	},
+	WATER(new Color(0x2432ec)),
+	LAVA(new Color(0xfd461f)),
 	// BuildCraft
-	FUEL(new Color(0xffff00)) {
-		@Nonnull
-		@Override
-		public EnumSet<EnumContainerType> getContainerTypes() {
-			return EnumSet.of(
-					EnumContainerType.CAN,
-					EnumContainerType.CAPSULE,
-					EnumContainerType.REFRACTORY
-			);
-		}
-	},
-	OIL(new Color(0x404040)) {
-		@Nonnull
-		@Override
-		public EnumSet<EnumContainerType> getContainerTypes() {
-			return EnumSet.of(
-					EnumContainerType.CAN,
-					EnumContainerType.CAPSULE,
-					EnumContainerType.REFRACTORY
-			);
-		}
-	},
+	FUEL(new Color(0xffff00)),
+	OIL(new Color(0x404040)),
 	// Railcraft
 	CREOSOTE(new Color(0x635c03)),
 	STEAM(new Color(0x91938F));
@@ -309,7 +210,8 @@ public enum Fluids {
 	}
 
 	public final boolean isContained(ItemStack containerStack) {
-		return containerStack != null && FluidHelper.containsFluid(containerStack, getFluid());
+		FluidStack fluidStackInContainer = FluidUtil.getFluidContained(containerStack);
+		return fluidStackInContainer != null && fluidStackInContainer.getFluid() == getFluid();
 	}
 
 	public static boolean areEqual(Fluid fluid, FluidStack fluidStack) {
@@ -344,10 +246,19 @@ public enum Fluids {
 		return Fluids.WATER.getColor();
 	}
 
-	/** FluidBlock and Container registration */
-	@Nonnull
-	public EnumSet<EnumContainerType> getContainerTypes() {
-		return EnumSet.noneOf(EnumContainerType.class);
+	@Nullable
+	public static Fluids getFluidDefinition(FluidStack fluidStack) {
+		if (fluidStack != null) {
+			Fluid fluid = fluidStack.getFluid();
+			if (fluid != null) {
+				Fluids fluidDefinition = tagToFluid.get(fluid.getName());
+				if (fluidDefinition != null) {
+					return fluidDefinition;
+				}
+			}
+		}
+
+		return null;
 	}
 
 	/**
@@ -367,7 +278,7 @@ public enum Fluids {
 	}
 
 	/**
-	 * Get the properties for an ItemLiquidContainer before it gets registered.
+	 * Get the properties for an ItemFluidContainerForestry before it gets registered.
 	 */
 	@Nullable
 	public DrinkProperties getDrinkProperties() {

src/main/java/forestry/core/fluids/ITankManager.java

@@ -16,8 +16,8 @@ import net.minecraft.inventory.Container;
 import net.minecraft.inventory.IContainerListener;
 
 import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.IFluidHandler;
 import net.minecraftforge.fluids.IFluidTank;
+import net.minecraftforge.fluids.capability.IFluidHandler;
 
 public interface ITankManager extends IFluidHandler {
 	void containerAdded(Container container, IContainerListener crafter);
@@ -28,6 +28,10 @@ public interface ITankManager extends IFluidHandler {
 
 	IFluidTank getTank(int tankIndex);
 
+	boolean canFillFluidType(FluidStack fluidStack);
+
+	boolean canDrainFluidType(FluidStack fluidStack);
+
 	/**
 	 * For updating tanks on the client
 	 */

src/main/java/forestry/core/fluids/LiquidRegistryHelper.java

@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser Public License v3
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * Various Contributors including, but not limited to:
- * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
- ******************************************************************************/
-package forestry.core.fluids;
-
-import java.util.EnumMap;
-
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemBucket;
-import net.minecraft.item.ItemStack;
-
-import net.minecraftforge.fluids.FluidContainerRegistry;
-import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;
-import net.minecraftforge.fluids.FluidStack;
-import forestry.core.PluginFluids;
-import forestry.core.config.Constants;
-import forestry.core.items.EnumContainerType;
-import forestry.core.items.ItemLiquidContainer;
-import forestry.core.utils.Log;
-
-public class LiquidRegistryHelper {
-
-	private static final EnumMap<EnumContainerType, ItemLiquidContainer> emptyContainers = new EnumMap<>(EnumContainerType.class);
-
-	static {
-		emptyContainers.put(EnumContainerType.CAN, PluginFluids.items.canEmpty);
-		emptyContainers.put(EnumContainerType.CAPSULE, PluginFluids.items.waxCapsuleEmpty);
-		emptyContainers.put(EnumContainerType.REFRACTORY, PluginFluids.items.refractoryEmpty);
-	}
-
-	public static void registerLiquidContainer(Fluids fluid, ItemStack filled) {
-		Item item = filled.getItem();
-		ItemStack empty = null;
-
-		if (item.getContainerItem() instanceof ItemBucket) {
-			empty = new ItemStack(Items.BUCKET);
-		} else if (item instanceof ItemLiquidContainer) {
-			ItemLiquidContainer liquidContainer = (ItemLiquidContainer) item;
-			EnumContainerType containerType = liquidContainer.getType();
-			ItemLiquidContainer emptyContainer = emptyContainers.get(containerType);
-			empty = emptyContainer.getItemStack();
-		}
-
-		if (empty == null) {
-			Log.warning("Unable to inject liquid container: " + filled);
-		} else {
-			registerLiquidContainer(fluid, Constants.BUCKET_VOLUME, filled, empty);
-		}
-	}
-
-	public static void registerLiquidContainer(Fluids fluid, int volume, ItemStack filled, ItemStack empty) {
-		FluidStack contained = fluid.getFluid(volume);
-		if (contained == null) {
-			throw new IllegalArgumentException(String.format("Attempted to inject a liquid container for the non-existent liquid '%s'.", fluid));
-		}
-
-		FluidContainerData container = new FluidContainerData(contained, filled, empty);
-		FluidContainerRegistry.registerFluidContainer(container);
-	}
-
-}

src/main/java/forestry/core/fluids/TankManager.java

@@ -14,6 +14,7 @@ import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.Table;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -26,16 +27,16 @@ import net.minecraft.inventory.Container;
 import net.minecraft.inventory.IContainerListener;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
-import net.minecraft.util.EnumFacing;
 
-import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidTank;
+import net.minecraftforge.fluids.capability.FluidTankPropertiesWrapper;
+import net.minecraftforge.fluids.capability.IFluidTankProperties;
+import net.minecraftforge.fluids.capability.templates.EmptyFluidHandler;
 
 import forestry.api.core.INbtReadable;
 import forestry.api.core.INbtWritable;
-import forestry.core.fluids.tanks.FakeTank;
 import forestry.core.fluids.tanks.StandardTank;
 import forestry.core.network.DataInputStreamForestry;
 import forestry.core.network.DataOutputStreamForestry;
@@ -206,14 +207,14 @@ public class TankManager implements ITankManager, ITankUpdateHandler, IStreamabl
 	}
 
 	@Override
-	public int fill(EnumFacing from, FluidStack resource, boolean doFill) {
+	public int fill(FluidStack resource, boolean doFill) {
 		for (StandardTank tank : tanks) {
 			if (tankAcceptsFluid(tank, resource)) {
 				return fill(tank.getTankIndex(), resource, doFill);
 			}
 		}
 
-		return FakeTank.INSTANCE.fill(resource, doFill);
+		return EmptyFluidHandler.INSTANCE.fill(resource, doFill);
 	}
 
 	public int fill(int tankIndex, FluidStack resource, boolean doFill) {
@@ -222,7 +223,7 @@ public class TankManager implements ITankManager, ITankUpdateHandler, IStreamabl
 		}
 
 		StandardTank tank = tanks.get(tankIndex);
-		if (!tank.canBeFilledExternally()) {
+		if (!tank.canFill()) {
 			return 0;
 		}
 
@@ -250,14 +251,15 @@ public class TankManager implements ITankManager, ITankUpdateHandler, IStreamabl
 		}
 	}
 
+	@Nullable
 	@Override
-	public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) {
+	public FluidStack drain(int maxDrain, boolean doDrain) {
 		for (StandardTank tank : tanks) {
 			if (tankCanDrain(tank)) {
 				return drain(tank.getTankIndex(), maxDrain, doDrain);
 			}
 		}
-		return FakeTank.INSTANCE.drain(maxDrain, doDrain);
+		return EmptyFluidHandler.INSTANCE.drain(maxDrain, doDrain);
 	}
 
 	public FluidStack drain(int tankIndex, int maxDrain, boolean doDrain) {
@@ -266,13 +268,14 @@ public class TankManager implements ITankManager, ITankUpdateHandler, IStreamabl
 		}
 
 		StandardTank tank = tanks.get(tankIndex);
-		if (!tank.canBeDrainedExternally()) {
+		if (!tank.canDrain()) {
 			return null;
 		}
 
 		return tank.drain(maxDrain, doDrain);
 	}
 
+	@Override
 	public FluidStack drain(FluidStack resource, boolean doDrain) {
 		for (StandardTank tank : tanks) {
 			if (tankCanDrainFluid(tank, resource)) {
@@ -283,31 +286,12 @@ public class TankManager implements ITankManager, ITankUpdateHandler, IStreamabl
 	}
 
 	@Override
-	public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) {
-		return drain(resource, doDrain);
-	}
-
-	@Override
-	public boolean canFill(EnumFacing from, Fluid fluid) {
-		return true;
-	}
-
-	@Override
-	public boolean canDrain(EnumFacing from, Fluid fluid) {
-		return true;
-	}
-
-	@Override
-	public FluidTankInfo[] getTankInfo(EnumFacing direction) {
-		FluidTankInfo[] info = new FluidTankInfo[tanks.size()];
+	public IFluidTankProperties[] getTankProperties() {
+		IFluidTankProperties[] properties = new IFluidTankProperties[tanks.size()];
 		for (int i = 0; i < tanks.size(); i++) {
-			info[i] = tanks.get(i).getInfo();
+			properties[i] = new FluidTankPropertiesWrapper(tanks.get(i));
 		}
-		return info;
-	}
-
-	public FluidTankInfo[] getTankInfo() {
-		return getTankInfo(null);
+		return properties;
 	}
 
 	public FluidTankInfo getTankInfo(int tankIndex) {
@@ -322,13 +306,29 @@ public class TankManager implements ITankManager, ITankUpdateHandler, IStreamabl
 		return tanks.get(tankIndex).getFluidAmount();
 	}
 
-	public boolean accepts(Fluid fluid) {
-		if (fluid == null) {
+	@Override
+	public boolean canFillFluidType(FluidStack fluidStack) {
+		if (fluidStack == null) {
 			return false;
 		}
-		
+
 		for (StandardTank tank : tanks) {
-			if (tank.accepts(fluid)) {
+			if (tank.canFillFluidType(fluidStack)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	@Override
+	public boolean canDrainFluidType(FluidStack fluidStack) {
+		if (fluidStack == null) {
+			return false;
+		}
+
+		for (StandardTank tank : tanks) {
+			if (tank.canDrainFluidType(fluidStack)) {
 				return true;
 			}
 		}
@@ -340,14 +340,14 @@ public class TankManager implements ITankManager, ITankUpdateHandler, IStreamabl
 		if (fluidStack == null) {
 			return false;
 		}
-		if (!tank.canBeFilledExternally()) {
+		if (!tank.canFill()) {
 			return false;
 		}
 		return tank.fill(fluidStack, false) > 0;
 	}
 
 	private static boolean tankCanDrain(StandardTank tank) {
-		if (!tank.canBeDrainedExternally()) {
+		if (!tank.canDrain()) {
 			return false;
 		}
 		FluidStack drained = tank.drain(1, false);

src/main/java/forestry/core/fluids/tanks/FakeTank.java

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser Public License v3
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * Various Contributors including, but not limited to:
- * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
- ******************************************************************************/
-package forestry.core.fluids.tanks;
-
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.FluidTankInfo;
-
-/**
- * @author CovertJaguar <http://www.railcraft.info>
- */
-public final class FakeTank extends StandardTank {
-
-	public static final FakeTank INSTANCE = new FakeTank();
-	public static final FakeTank[] ARRAY = new FakeTank[]{INSTANCE};
-	public static final FluidTankInfo[] INFO = new FluidTankInfo[]{INSTANCE.getInfo()};
-
-	private FakeTank() {
-		super(1);
-	}
-
-	@Override
-	public int fill(FluidStack resource, boolean doFill) {
-		return 0;
-	}
-
-	@Override
-	public FluidStack drain(int maxDrain, boolean doDrain) {
-		return null;
-	}
-
-}

src/main/java/forestry/core/fluids/tanks/FilteredTank.java

@@ -16,7 +16,6 @@ import java.util.HashSet;
 import java.util.Set;
 
 import net.minecraft.item.EnumRarity;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.text.TextFormatting;
 
 import net.minecraftforge.fluids.Fluid;
@@ -33,41 +32,38 @@ public class FilteredTank extends StandardTank {
 
 	private final Set<String> filters = new HashSet<>(); // FluidNames
 
-	public FilteredTank(int capacity, Fluid... filters) {
-		this(capacity, Arrays.asList(filters), null);
+	public FilteredTank(int capacity) {
+		super(capacity);
 	}
 
-	public FilteredTank(int capacity, Collection<Fluid> filters) {
-		this(capacity, filters, null);
+	public FilteredTank(int capacity, boolean canFill, boolean canDrain) {
+		super(capacity, canFill, canDrain);
 	}
 
-	public FilteredTank(int capacity, Collection<Fluid> filters, TileEntity tile) {
-		super(capacity, tile);
-		setFilters(filters);
+	public FilteredTank setFilters(Fluid... filters) {
+		return setFilters(Arrays.asList(filters));
 	}
 
-	public void setFilters(Collection<Fluid> filters) {
+	public FilteredTank setFilters(Collection<Fluid> filters) {
 		this.filters.clear();
 		for (Fluid fluid : filters) {
 			this.filters.add(fluid.getName());
 		}
+		return this;
 	}
 
 	@Override
-	public int fill(FluidStack resource, boolean doFill) {
-		if (liquidMatchesFilter(resource)) {
-			return super.fill(resource, doFill);
-		}
-		return 0;
+	public boolean canFillFluidType(FluidStack fluid) {
+		return fluidMatchesFilter(fluid);
 	}
 
 	@Override
-	public boolean accepts(Fluid fluid) {
-		return filters.contains(fluid.getName());
+	public boolean canDrainFluidType(FluidStack fluid) {
+		return fluidMatchesFilter(fluid);
 	}
 
-	private boolean liquidMatchesFilter(FluidStack resource) {
-		if (resource == null || filters == null) {
+	private boolean fluidMatchesFilter(FluidStack resource) {
+		if (resource == null || resource.getFluid() == null) {
 			return false;
 		}
 		return filters.contains(resource.getFluid().getName());

src/main/java/forestry/core/fluids/tanks/StandardTank.java

@@ -14,14 +14,12 @@ import javax.annotation.Nonnull;
 import java.io.IOException;
 
 import net.minecraft.item.EnumRarity;
-import net.minecraft.tileentity.TileEntity;
 
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTank;
 
 import forestry.core.fluids.FakeTankUpdateHandler;
-import forestry.core.fluids.FluidHelper;
 import forestry.core.fluids.ITankUpdateHandler;
 import forestry.core.fluids.TankManager;
 import forestry.core.gui.tooltips.ToolTip;
@@ -34,37 +32,21 @@ import forestry.core.utils.Translator;
  * @author CovertJaguar <http://www.railcraft.info>
  */
 public class StandardTank extends FluidTank implements IStreamable {
-	// defines how the tank responds to IFluidHandler requests
-	public enum TankMode {
-		DEFAULT, OUTPUT, INPUT, INTERNAL
-	}
-
-	public TankMode tankMode = TankMode.DEFAULT;
 	private static final int DEFAULT_COLOR = 0xFFFFFF;
 	@Nonnull
 	private ITankUpdateHandler tankUpdateHandler = FakeTankUpdateHandler.instance;
 	private int tankIndex;
 
+	public StandardTank(int capacity, boolean canFill, boolean canDrain) {
+		super(capacity);
+		setCanFill(canFill);
+		setCanDrain(canDrain);
+	}
+
 	public StandardTank(int capacity) {
 		super(capacity);
 	}
 
-	public StandardTank(FluidStack fluid, int capacity) {
-		this(capacity);
-		setFluid(fluid);
-	}
-
-	public StandardTank(int capacity, TileEntity tile) {
-		this(capacity);
-		this.tile = tile;
-	}
-
-	public StandardTank(FluidStack fluid, int capacity, TileEntity tile) {
-		this(capacity);
-		this.tile = tile;
-		setFluid(fluid);
-	}
-
 	public void setTankIndex(int index) {
 		this.tankIndex = index;
 	}
@@ -102,75 +84,17 @@ public class StandardTank extends FluidTank implements IStreamable {
 	}
 
 	@Override
-	public int fill(final FluidStack resource, final boolean doFill) {
-		if (resource == null) {
-			return 0;
-		}
-		if (resource.amount <= 0) {
-			return 0;
-		}
-		if (!accepts(resource.getFluid())) {
-			return 0;
-		}
-		int filled = super.fill(resource, doFill);
+	public int fillInternal(FluidStack resource, boolean doFill) {
+		int filled = super.fillInternal(resource, doFill);
 		if (doFill && filled > 0) {
 			tankUpdateHandler.updateTankLevels(this);
 		}
 		return filled;
 	}
 
-	public boolean accepts(Fluid fluid) {
-		return fluid != null;
-	}
-
-	@SuppressWarnings("incomplete-switch")
-	public boolean canBeFilledExternally() {
-		switch (tankMode) {
-			case DEFAULT:
-			case INPUT:
-				return true;
-		}
-		return false;
-	}
-
-	@SuppressWarnings("incomplete-switch")
-	public boolean canBeDrainedExternally() {
-		switch (tankMode) {
-			case DEFAULT:
-			case OUTPUT:
-				return true;
-		}
-		return false;
-	}
-
-	public boolean canFill(Fluid fluid, int amount) {
-		if (fluid == null) {
-			return false;
-		}
-		FluidStack fluidStack = new FluidStack(fluid, amount);
-		return canFill(fluidStack);
-	}
-
-	public boolean canFill(FluidStack fluidStack) {
-		return fill(fluidStack, false) == fluidStack.amount;
-	}
-
-	public boolean canDrain(int amount) {
-		FluidStack drained = drain(amount, false);
-		return drained != null && drained.amount == amount;
-	}
-
-	public boolean canDrain(FluidStack toDrain) {
-		FluidStack drained = drain(toDrain.amount, false);
-		return FluidHelper.areFluidStacksEqual(drained, toDrain);
-	}
-
 	@Override
-	public FluidStack drain(int maxDrain, boolean doDrain) {
-		if (maxDrain <= 0) {
-			return null;
-		}
-		FluidStack drained = super.drain(maxDrain, doDrain);
+	public FluidStack drainInternal(int maxDrain, boolean doDrain) {
+		FluidStack drained = super.drainInternal(maxDrain, doDrain);
 		if (doDrain && drained != null && drained.amount > 0) {
 			tankUpdateHandler.updateTankLevels(this);
 		}

src/main/java/forestry/core/genetics/GenericRatings.java

@@ -17,19 +17,19 @@ public class GenericRatings {
 
 	public static String rateMetabolism(int metabolism) {
 		if (metabolism >= 19) {
-			return Translator.translateToLocal("Forestry.allele.highest");
+			return Translator.translateToLocal("forestry.allele.highest");
 		} else if (metabolism >= 16) {
-			return Translator.translateToLocal("Forestry.allele.higher");
+			return Translator.translateToLocal("forestry.allele.higher");
 		} else if (metabolism >= 13) {
-			return Translator.translateToLocal("Forestry.allele.high");
+			return Translator.translateToLocal("forestry.allele.high");
 		} else if (metabolism >= 10) {
-			return Translator.translateToLocal("Forestry.allele.average");
+			return Translator.translateToLocal("forestry.allele.average");
 		} else if (metabolism >= 7) {
-			return Translator.translateToLocal("Forestry.allele.slow");
+			return Translator.translateToLocal("forestry.allele.slow");
 		} else if (metabolism >= 4) {
-			return Translator.translateToLocal("Forestry.allele.slower");
+			return Translator.translateToLocal("forestry.allele.slower");
 		} else {
-			return Translator.translateToLocal("Forestry.allele.slowest");
+			return Translator.translateToLocal("forestry.allele.slowest");
 		}
 	}
 

src/main/java/forestry/core/genetics/Genome.java

@@ -115,11 +115,15 @@ public abstract class Genome implements IGenome {
 	 * Quickly gets the species without loading the whole genome.
 	 * We need this because the client uses the species for rendering.
 	 */
-	protected static IAlleleSpecies getSpeciesDirectly(ItemStack itemStack) {
+	public static IAlleleSpecies getSpeciesDirectly(ItemStack itemStack) {
 		NBTTagCompound nbtTagCompound = itemStack.getTagCompound();
 		if (nbtTagCompound == null) {
 			return null;
 		}
+		return getSpeciesDirectly(nbtTagCompound);
+	}
+
+	public static IAlleleSpecies getSpeciesDirectly(@Nonnull NBTTagCompound nbtTagCompound) {
 
 		NBTTagCompound genomeNBT = nbtTagCompound.getCompoundTag("Genome");
 		if (genomeNBT == null) {

src/main/java/forestry/core/genetics/alleles/AlleleCategorized.java

@@ -9,9 +9,9 @@ import forestry.core.utils.Translator;
  * For example, temperature tolerances or speeds are categories with several values.
  *
  * This class helps localization by allowing specific names like
- * Forestry.allele.speed.fast
+ * forestry.allele.speed.fast
  * and can fall back on generic names like
- * Forestry.allele.fast
+ * forestry.allele.fast
  */
 public abstract class AlleleCategorized extends Allele {
 	protected AlleleCategorized(String modId, String category, String valueName, boolean isDominant) {

src/main/java/forestry/core/gui/ContainerLiquidTanksHelper.java

@@ -17,6 +17,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 
 import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidTank;
 import net.minecraftforge.fluids.IFluidTank;
 
 import forestry.api.core.IToolPipette;
@@ -60,17 +61,21 @@ public class ContainerLiquidTanksHelper<T extends TileEntity & ILiquidTankTile>
 
 		if (pipette.canPipette(itemstack) && liquidAmount > 0) {
 			if (liquidAmount > 0) {
-				FluidStack fillAmount = tank.drain(1000, false);
-				int filled = pipette.fill(itemstack, fillAmount, true);
-				tank.drain(filled, true);
-				player.updateHeldItem();
+				if (tank instanceof FluidTank) {
+					FluidStack fillAmount = ((FluidTank) tank).drainInternal(1000, false);
+					int filled = pipette.fill(itemstack, fillAmount, true);
+					tank.drain(filled, true);
+					player.updateHeldItem();
+				}
 			}
 		} else {
 			FluidStack potential = pipette.drain(itemstack, pipette.getCapacity(itemstack), false);
 			if (potential != null) {
-				int fill = tank.fill(potential, true);
-				pipette.drain(itemstack, fill, true);
-				player.updateHeldItem();
+				if (tank instanceof FluidTank) {
+					int fill = ((FluidTank) tank).fillInternal(potential, true);
+					pipette.drain(itemstack, fill, true);
+					player.updateHeldItem();
+				}
 			}
 		}
 	}

src/main/java/forestry/core/gui/GuiAlyzer.java

@@ -51,8 +51,6 @@ public class GuiAlyzer extends GuiForestry<ContainerAlyzer, IInventory> {
 	public static final int COLUMN_1 = 90;
 	public static final int COLUMN_2 = 155;
 
-	protected final Map<String, ItemStack> iconStacks = new HashMap<>();
-
 	public GuiAlyzer(EntityPlayer player, ItemInventoryAlyzer inventory) {
 		super(Constants.TEXTURE_PATH_GUI + "/portablealyzer.png", new ContainerAlyzer(inventory, player), inventory);
 
@@ -104,6 +102,8 @@ public class GuiAlyzer extends GuiForestry<ContainerAlyzer, IInventory> {
 		textLayout.drawLine(text0, textLayout.column0);
 		int columnwidth = textLayout.column2 - textLayout.column1 - 2;
 
+		Map<String, ItemStack> iconStacks = chromosome.getSpeciesRoot().getAlyzerPlugin().getIconStacks();
+
 		GuiUtil.drawItemStack(this, iconStacks.get(primary.getUID()), guiLeft + textLayout.column1 + columnwidth - 20, guiTop + 10);
 		GuiUtil.drawItemStack(this, iconStacks.get(secondary.getUID()), guiLeft + textLayout.column2 + columnwidth - 20, guiTop + 10);
 
@@ -335,6 +335,8 @@ public class GuiAlyzer extends GuiForestry<ContainerAlyzer, IInventory> {
 
 	public void drawMutationInfo(IMutation combination, IAllele species, int x, IBreedingTracker breedingTracker) {
 
+		Map<String, ItemStack> iconStacks = combination.getRoot().getAlyzerPlugin().getIconStacks();
+		
 		ItemStack partnerBee = iconStacks.get(combination.getPartner(species).getUID());
 		widgetManager.add(new ItemStackWidget(widgetManager, x, textLayout.getLineY(), partnerBee));
 

src/main/java/forestry/core/inventory/InventoryAnalyzer.java

@@ -13,12 +13,12 @@ package forestry.core.inventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 
-import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidUtil;
 
 import forestry.api.arboriculture.TreeManager;
 import forestry.api.core.ForestryAPI;
 import forestry.api.genetics.AlleleManager;
-import forestry.core.fluids.FluidHelper;
 import forestry.core.tiles.TileAnalyzer;
 import forestry.core.utils.GeneticsUtil;
 import forestry.core.utils.SlotUtil;
@@ -41,8 +41,8 @@ public class InventoryAnalyzer extends InventoryAdapterTile<TileAnalyzer> {
 		if (SlotUtil.isSlotInRange(slotIndex, SLOT_INPUT_1, SLOT_INPUT_COUNT)) {
 			return AlleleManager.alleleRegistry.isIndividual(itemStack) || GeneticsUtil.getGeneticEquivalent(itemStack) != null;
 		} else if (slotIndex == SLOT_CAN) {
-			Fluid fluid = FluidHelper.getFluidInContainer(itemStack);
-			return tile.getTankManager().accepts(fluid);
+			FluidStack fluid = FluidUtil.getFluidContained(itemStack);
+			return tile.getTankManager().canFillFluidType(fluid);
 		}
 
 		return false;

src/main/java/forestry/core/items/FluidHandlerItemForestry.java

@@ -0,0 +1,51 @@
+package forestry.core.items;
+
+import net.minecraft.item.ItemStack;
+
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.capability.templates.FluidHandlerItemStackSimple;
+
+public class FluidHandlerItemForestry extends FluidHandlerItemStackSimple.Consumable {
+	private final EnumContainerType containerType;
+
+	public FluidHandlerItemForestry(ItemStack container, EnumContainerType containerType) {
+		super(container, Fluid.BUCKET_VOLUME);
+		this.containerType = containerType;
+	}
+
+	private boolean contentsAllowed(FluidStack fluidStack) {
+		if (fluidStack == null) {
+			return false;
+		}
+
+		Fluid fluid = fluidStack.getFluid();
+		if (fluid == null) {
+			return false;
+		}
+
+		switch (containerType) {
+			case CAPSULE:
+				return fluid.getTemperature(fluidStack) < 310.15; // melting point of wax in kelvin
+			default:
+				return true;
+		}
+	}
+
+	@Override
+	public boolean canFillFluidType(FluidStack fluid) {
+		return contentsAllowed(fluid);
+	}
+
+	@Override
+	public boolean canDrainFluidType(FluidStack fluid) {
+		return contentsAllowed(fluid);
+	}
+
+	@Override
+	protected void setFluid(FluidStack fluid) {
+		super.setFluid(fluid);
+		container.setItemDamage(1); // show the filled container model
+	}
+}
+

src/main/java/forestry/core/items/ItemBlockForestry.java

@@ -58,18 +58,20 @@ public class ItemBlockForestry<B extends Block> extends ItemBlock {
 	public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState newState) {
 		boolean placed = super.placeBlockAt(stack, player, world, pos, side, hitX, hitY, hitZ, newState);
 
-		if (block.hasTileEntity(newState)) {
-			if (stack.getItem() instanceof ItemBlockNBT && stack.hasTagCompound()) {
-				TileForestry tile = TileUtil.getTile(world, pos, TileForestry.class);
-				if (tile != null) {
-					tile.readFromNBT(stack.getTagCompound());
-					tile.setPos(pos);
+		if (placed) {
+			if (block.hasTileEntity(newState)) {
+				if (stack.getItem() instanceof ItemBlockNBT && stack.hasTagCompound()) {
+					TileForestry tile = TileUtil.getTile(world, pos, TileForestry.class);
+					if (tile != null) {
+						tile.readFromNBT(stack.getTagCompound());
+						tile.setPos(pos);
+					}
 				}
 			}
-		}
 
-		if (block instanceof BlockBase) {
-			((BlockBase) block).rotateAfterPlacement(player, world, pos, side);
+			if (block instanceof BlockBase) {
+				((BlockBase) block).rotateAfterPlacement(player, world, pos, side);
+			}
 		}
 
 		return placed;

src/main/java/forestry/core/items/ItemFluidContainerForestry.java

@@ -0,0 +1,195 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2014 SirSengir.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v3
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/lgpl-3.0.txt
+ *
+ * Various Contributors including, but not limited to:
+ * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
+ ******************************************************************************/
+package forestry.core.items;
+
+import java.util.List;
+import java.util.Locale;
+
+import forestry.core.fluids.Fluids;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.SoundEvents;
+import net.minecraft.item.EnumAction;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
+import net.minecraft.stats.StatList;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.EnumActionResult;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.FoodStats;
+import net.minecraft.util.SoundCategory;
+import net.minecraft.world.World;
+import net.minecraftforge.common.capabilities.ICapabilityProvider;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.capability.IFluidHandler;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import forestry.api.core.IModelManager;
+import forestry.core.CreativeTabForestry;
+import forestry.core.utils.Translator;
+
+public class ItemFluidContainerForestry extends ItemForestry implements IColoredItem {
+	private final EnumContainerType type;
+
+	public ItemFluidContainerForestry(EnumContainerType type) {
+		super(CreativeTabForestry.tabForestry);
+		this.type = type;
+	}
+
+	/* Models */
+	@SideOnly(Side.CLIENT)
+	@Override
+	public void registerModel(Item item, IModelManager manager) {
+		manager.registerItemModel(item, 0, "liquids/" + type.toString().toLowerCase(Locale.ENGLISH) + "_empty");
+		manager.registerItemModel(item, 1, "liquids/" + type.toString().toLowerCase(Locale.ENGLISH));
+	}
+
+	@SideOnly(Side.CLIENT)
+	@Override
+	public void getSubItems(Item itemIn, CreativeTabs tab, List<ItemStack> subItems) {
+		// empty
+		subItems.add(new ItemStack(itemIn));
+
+		// filled
+		for (Fluid fluid : FluidRegistry.getRegisteredFluids().values()) {
+			ItemStack itemStack = new ItemStack(itemIn);
+			IFluidHandler fluidHandler = new FluidHandlerItemForestry(itemStack, type);
+			if (fluidHandler.fill(new FluidStack(fluid, Fluid.BUCKET_VOLUME), true) == Fluid.BUCKET_VOLUME) {
+				subItems.add(itemStack);
+			}
+		}
+	}
+
+	@Override
+	public int getColorFromItemstack(ItemStack itemStack, int tintIndex) {
+		if (tintIndex > 0) {
+			FluidStack fluidStack = getContained(itemStack);
+			return Fluids.getFluidColor(fluidStack).getRGB();
+		} else {
+			return 0xffffff;
+		}
+	}
+
+	public EnumContainerType getType() {
+		return type;
+	}
+
+	protected FluidStack getContained(ItemStack itemStack) {
+		if (itemStack.stackSize != 1) {
+			itemStack = itemStack.copy();
+			itemStack.stackSize = 1;
+		}
+		IFluidHandler fluidHandler = new FluidHandlerItemForestry(itemStack, type);
+		return fluidHandler.drain(Integer.MAX_VALUE, false);
+	}
+
+	@Override
+	public String getItemStackDisplayName(ItemStack stack) {
+		Item item = stack.getItem();
+		if (item instanceof ItemFluidContainerForestry) {
+			FluidStack fluid = getContained(stack);
+			if (fluid != null) {
+				String exactTranslationKey = "item.for." + type.getName() + '.' + fluid.getFluid().getName() + ".name";
+				if (Translator.canTranslateToLocal(exactTranslationKey)) {
+					return Translator.translateToLocal(exactTranslationKey);
+				} else {
+					String grammarKey = "item.for." + type.getName() + ".grammar";
+					return Translator.translateToLocalFormatted(grammarKey, fluid.getLocalizedName());
+				}
+			} else {
+				String unlocalizedname = "item.for." + type.getName() + ".empty.name";
+				return Translator.translateToLocal(unlocalizedname);
+			}
+		}
+		return super.getItemStackDisplayName(stack);
+	}
+
+	/** DRINKS */
+	@Override
+	public ItemStack onItemUseFinish(ItemStack stack, World worldIn, EntityLivingBase entityLiving) {
+		DrinkProperties drinkProperties = getDrinkProperties(stack);
+		if (drinkProperties != null) {
+			if (entityLiving instanceof EntityPlayer && !((EntityPlayer) entityLiving).capabilities.isCreativeMode) {
+				EntityPlayer player = (EntityPlayer) entityLiving;
+				if (!player.capabilities.isCreativeMode) {
+					--stack.stackSize;
+				}
+
+				if (!worldIn.isRemote) {
+					FoodStats foodStats = player.getFoodStats();
+					foodStats.addStats(drinkProperties.getHealAmount(), drinkProperties.getSaturationModifier());
+					worldIn.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_PLAYER_BURP, SoundCategory.PLAYERS, 0.5F, worldIn.rand.nextFloat() * 0.1F + 0.9F);
+				}
+
+				player.addStat(StatList.getObjectUseStats(this));
+			}
+		}
+		return stack;
+	}
+
+	protected DrinkProperties getDrinkProperties(ItemStack itemStack) {
+		FluidStack contained = getContained(itemStack);
+		if (contained != null) {
+			Fluids definition = Fluids.getFluidDefinition(contained);
+			if (definition != null) {
+				return definition.getDrinkProperties();
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public int getMaxItemUseDuration(ItemStack itemstack) {
+		DrinkProperties drinkProperties = getDrinkProperties(itemstack);
+		if (drinkProperties != null) {
+			return drinkProperties.getMaxItemUseDuration();
+		} else {
+			return super.getMaxItemUseDuration(itemstack);
+		}
+	}
+
+	@Override
+	public EnumAction getItemUseAction(ItemStack itemstack) {
+		DrinkProperties drinkProperties = getDrinkProperties(itemstack);
+		if (drinkProperties != null) {
+			return EnumAction.DRINK;
+		} else {
+			return EnumAction.NONE;
+		}
+	}
+
+	@Override
+	public ActionResult<ItemStack> onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn, EnumHand hand) {
+		DrinkProperties drinkProperties = getDrinkProperties(itemStackIn);
+		if (drinkProperties != null) {
+			if (playerIn.canEat(false)) {
+				playerIn.setActiveHand(hand);
+				return new ActionResult<>(EnumActionResult.SUCCESS, itemStackIn);
+			} else {
+				return new ActionResult<>(EnumActionResult.FAIL, itemStackIn);
+			}
+		} else {
+			return super.onItemRightClick(itemStackIn, worldIn, playerIn, hand);
+		}
+	}
+
+	@Override
+	public ICapabilityProvider initCapabilities(ItemStack stack, NBTTagCompound nbt)
+	{
+		return new FluidHandlerItemForestry(stack, type);
+	}
+}

src/main/java/forestry/core/items/ItemLiquidContainer.java

@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser Public License v3
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * Various Contributors including, but not limited to:
- * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
- ******************************************************************************/
-package forestry.core.items;
-
-import java.util.Locale;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ActionResult;
-import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.world.World;
-
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.IFluidBlock;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import forestry.api.core.IModelManager;
-import forestry.core.CreativeTabForestry;
-import forestry.core.fluids.FluidHelper;
-import forestry.core.proxy.Proxies;
-import forestry.core.utils.Translator;
-
-public class ItemLiquidContainer extends ItemForestry implements IColoredItem {
-	private final EnumContainerType type;
-	private final int color;
-
-	public ItemLiquidContainer(EnumContainerType type, int color) {
-		super(CreativeTabForestry.tabForestry);
-		this.type = type;
-		this.color = color;
-	}
-
-	private static int getMatchingSlot(EntityPlayer player, ItemStack stack) {
-
-		for (int slot = 0; slot < player.inventory.mainInventory.length; slot++) {
-			ItemStack slotStack = player.inventory.getStackInSlot(slot);
-
-			if (slotStack == null) {
-				return slot;
-			}
-
-			if (!slotStack.isItemEqual(stack)) {
-				continue;
-			}
-
-			int space = slotStack.getMaxStackSize() - slotStack.stackSize;
-			if (space >= stack.stackSize) {
-				return slot;
-			}
-		}
-
-		return -1;
-	}
-
-	@Override
-	public ActionResult<ItemStack> onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn, EnumHand hand) {
-		if (worldIn.isRemote) {
-			return ActionResult.newResult(EnumActionResult.PASS, itemStackIn);
-		}
-
-		RayTraceResult rayTraceResult = this.rayTrace(worldIn, playerIn, true);
-		if (rayTraceResult == null || rayTraceResult.typeOfHit != RayTraceResult.Type.BLOCK) {
-			return ActionResult.newResult(EnumActionResult.PASS, itemStackIn);
-		}
-
-		BlockPos pos = rayTraceResult.getBlockPos();
-		Block targetedBlock = worldIn.getBlockState(pos).getBlock();
-
-		FluidStack fluid = null;
-
-		if (targetedBlock instanceof IFluidBlock) {
-			fluid = ((IFluidBlock) targetedBlock).drain(worldIn, pos, false);
-		} else {
-			if (targetedBlock == Blocks.WATER || targetedBlock == Blocks.FLOWING_WATER) {
-				fluid = new FluidStack(FluidRegistry.WATER, 1000);
-			} else if (targetedBlock == Blocks.LAVA || targetedBlock == Blocks.FLOWING_LAVA) {
-				fluid = new FluidStack(FluidRegistry.LAVA, 1000);
-			}
-		}
-
-		if (fluid == null) {
-			return ActionResult.newResult(EnumActionResult.FAIL, itemStackIn);
-		}
-
-		ItemStack filledContainer = FluidHelper.getFilledContainer(fluid.getFluid(), itemStackIn);
-		if (filledContainer == null) {
-			return ActionResult.newResult(EnumActionResult.FAIL, itemStackIn);
-		}
-
-		// Search for a slot to stow a filled container in player's
-		// inventory
-		int slot = getMatchingSlot(playerIn, filledContainer);
-		if (slot < 0) {
-			return ActionResult.newResult(EnumActionResult.FAIL, itemStackIn);
-		}
-
-		if (playerIn.inventory.getStackInSlot(slot) == null) {
-			playerIn.inventory.setInventorySlotContents(slot, filledContainer.copy());
-		} else {
-			playerIn.inventory.getStackInSlot(slot).stackSize++;
-		}
-
-		// Remove consumed liquid block in world
-		if (targetedBlock instanceof IFluidBlock) {
-			((IFluidBlock) targetedBlock).drain(worldIn, pos, true);
-		} else {
-			worldIn.setBlockToAir(pos);
-		}
-
-		// Remove consumed empty container
-		itemStackIn.stackSize--;
-
-		// Notify player that his inventory has changed.
-		Proxies.net.inventoryChangeNotify(playerIn);
-
-		return ActionResult.newResult(EnumActionResult.SUCCESS, itemStackIn);
-	}
-
-	/* Models */
-	@SideOnly(Side.CLIENT)
-	@Override
-	public void registerModel(Item item, IModelManager manager) {
-		if(color == 0){
-			manager.registerItemModel(item, 0, "liquids/" + type.toString().toLowerCase(Locale.ENGLISH)+ "_empty");
-		}else{
-			manager.registerItemModel(item, 0, "liquids/" + type.toString().toLowerCase(Locale.ENGLISH));
-		}
-	}
-
-	@Override
-	public int getColorFromItemstack(ItemStack itemstack, int j) {
-		if (j > 0) {
-			return color;
-		} else {
-			return 0xffffff;
-		}
-	}
-
-	public EnumContainerType getType() {
-		return type;
-	}
-
-	@Override
-	public String getItemStackDisplayName(ItemStack stack) {
-		Item item = stack.getItem();
-		if (item instanceof ItemLiquidContainer) {
-			FluidStack fluid = FluidHelper.getFluidStackInContainer(stack);
-			if (fluid != null) {
-				String exactTranslationKey = "item.for." + type.getName() + '.' + fluid.getFluid().getName() + ".name";
-				if (Translator.canTranslateToLocal(exactTranslationKey)) {
-					return Translator.translateToLocal(exactTranslationKey);
-				} else {
-					String grammarKey = "item.for." + type.getName() + ".grammar";
-					return Translator.translateToLocalFormatted(grammarKey, fluid.getLocalizedName());
-				}
-			}
-		}
-		return super.getItemStackDisplayName(stack);
-	}
-}

src/main/java/forestry/core/items/ItemLiquidContainerDrinkable.java

@@ -1,63 +0,0 @@
-package forestry.core.items;
-
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.SoundEvents;
-import net.minecraft.item.EnumAction;
-import net.minecraft.item.ItemStack;
-import net.minecraft.stats.StatList;
-import net.minecraft.util.ActionResult;
-import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.FoodStats;
-import net.minecraft.util.SoundCategory;
-import net.minecraft.world.World;
-
-public class ItemLiquidContainerDrinkable extends ItemLiquidContainer {
-	private final DrinkProperties properties;
-
-	public ItemLiquidContainerDrinkable(EnumContainerType type, int color, DrinkProperties properties) {
-		super(type, color);
-		this.properties = properties;
-	}
-
-	@Override
-	public ItemStack onItemUseFinish(ItemStack stack, World worldIn, EntityLivingBase entityLiving) {
-		if (entityLiving instanceof EntityPlayer && !((EntityPlayer)entityLiving).capabilities.isCreativeMode) {
-			EntityPlayer player = (EntityPlayer) entityLiving;
-			if (!player.capabilities.isCreativeMode) {
-				--stack.stackSize;
-			}
-
-			if (!worldIn.isRemote) {
-				FoodStats foodStats = player.getFoodStats();
-				foodStats.addStats(properties.getHealAmount(), properties.getSaturationModifier());
-				worldIn.playSound((EntityPlayer)null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_PLAYER_BURP, SoundCategory.PLAYERS, 0.5F, worldIn.rand.nextFloat() * 0.1F + 0.9F);
-			}
-
-			player.addStat(StatList.getObjectUseStats(this));
-		}
-
-		return stack;
-	}
-
-	@Override
-	public int getMaxItemUseDuration(ItemStack itemstack) {
-		return properties.getMaxItemUseDuration();
-	}
-
-	@Override
-	public EnumAction getItemUseAction(ItemStack itemstack) {
-		return EnumAction.DRINK;
-	}
-
-	@Override
-	public ActionResult<ItemStack> onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn, EnumHand hand) {
-		if (playerIn.canEat(false)) {
-			playerIn.setActiveHand(hand);
-			return new ActionResult<>(EnumActionResult.SUCCESS, itemStackIn);
-		} else {
-			return new ActionResult<>(EnumActionResult.FAIL, itemStackIn);
-		}
-	}
-}

src/main/java/forestry/core/items/ItemPipette.java

@@ -20,6 +20,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
 
+import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidContainerItem;
 import net.minecraftforge.fml.relauncher.Side;
@@ -27,7 +28,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
 
 import forestry.api.core.IModelManager;
 import forestry.api.core.IToolPipette;
-import forestry.core.config.Constants;
 import forestry.core.fluids.PipetteContents;
 
 public class ItemPipette extends ItemForestry implements IToolPipette, IFluidContainerItem {
@@ -163,6 +163,6 @@ public class ItemPipette extends ItemForestry implements IToolPipette, IFluidCon
 
 	@Override
 	public int getCapacity(ItemStack pipette) {
-		return Constants.BUCKET_VOLUME;
+		return Fluid.BUCKET_VOLUME;
 	}
 }

src/main/java/forestry/core/items/ItemRegistryFluids.java

@@ -10,51 +10,36 @@
  ******************************************************************************/
 package forestry.core.items;
 
-import com.google.common.collect.HashBasedTable;
-import com.google.common.collect.Table;
+import java.util.EnumMap;
+import java.util.Map;
 
 import forestry.core.fluids.Fluids;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidUtil;
+import net.minecraftforge.fluids.capability.IFluidHandler;
 
 public class ItemRegistryFluids extends ItemRegistry {
-	public final ItemLiquidContainer canEmpty;
-	public final ItemLiquidContainer waxCapsuleEmpty;
-	public final ItemLiquidContainer refractoryEmpty;
+	public final ItemFluidContainerForestry canEmpty;
+	public final ItemFluidContainerForestry waxCapsuleEmpty;
+	public final ItemFluidContainerForestry refractoryEmpty;
 
-	private final Table<EnumContainerType, String, ItemLiquidContainer> containers = HashBasedTable.create();
+	private final Map<EnumContainerType, ItemFluidContainerForestry> containers = new EnumMap<>(EnumContainerType.class);
 
-	public ItemLiquidContainer getContainer(EnumContainerType type, Fluids fluid) {
-		return containers.get(type, fluid.getFluid().getName());
+	public ItemStack getContainer(EnumContainerType type, Fluids fluid) {
+		ItemStack container = new ItemStack(containers.get(type));
+		IFluidHandler fluidHandler = FluidUtil.getFluidHandler(container);
+		fluidHandler.fill(fluid.getFluid(Integer.MAX_VALUE), true);
+		return container;
 	}
 
 	public ItemRegistryFluids() {
-		canEmpty = registerEmptyContainer(EnumContainerType.CAN, "can.empty");
-		waxCapsuleEmpty = registerEmptyContainer(EnumContainerType.CAPSULE, "capsule.empty");
-		refractoryEmpty = registerEmptyContainer(EnumContainerType.REFRACTORY, "refractory.empty");
+		canEmpty = registerItem(new ItemFluidContainerForestry(EnumContainerType.CAN), "can");
+		waxCapsuleEmpty = registerItem(new ItemFluidContainerForestry(EnumContainerType.CAPSULE), "capsule");
+		refractoryEmpty = registerItem(new ItemFluidContainerForestry(EnumContainerType.REFRACTORY), "refractory");
 
-		for (Fluids fluidType : Fluids.values()) {
-			if (fluidType.getFluid() == null) {
-				continue;
-			}
-			for (EnumContainerType type : fluidType.getContainerTypes()) {
-				int color = fluidType.getColor().getRGB();
-
-				DrinkProperties drinkProperties = fluidType.getDrinkProperties();
-				ItemLiquidContainer liquidContainer;
-				if (drinkProperties == null) {
-					liquidContainer = new ItemLiquidContainer(type, color);
-				} else {
-					liquidContainer = new ItemLiquidContainerDrinkable(type, color, drinkProperties);
-				}
-
-				String name = type.getName() + '.' + fluidType.getTag();
-				registerItem(liquidContainer, name);
-
-				containers.put(type, fluidType.getFluid().getName(), liquidContainer);
-			}
-		}
+		containers.put(EnumContainerType.CAN, canEmpty);
+		containers.put(EnumContainerType.CAPSULE, waxCapsuleEmpty);
+		containers.put(EnumContainerType.REFRACTORY, refractoryEmpty);
 	}
 
-	private static ItemLiquidContainer registerEmptyContainer(EnumContainerType type, String name) {
-		return registerItem(new ItemLiquidContainer(type, 0), name);
-	}
 }

src/main/java/forestry/core/models/ModelCrate.java

@@ -178,7 +178,7 @@ public class ModelCrate extends BlankItemModel {
 	 * Bake the crate model.
 	 */
 	private List<IBakedModel> bakeModel(ItemCrated crateItem, IBakedModel crateModel) {
-		List<IBakedModel> models = new ArrayList();
+		List<IBakedModel> models = new ArrayList<>();
 
 		IBakedModel containedModel = getModel(crateItem.getContained());
 
@@ -235,7 +235,7 @@ public class ModelCrate extends BlankItemModel {
 		
 		@Override
 		public List<BakedQuad> getQuads(IBlockState state, EnumFacing side, long rand) {
-			List<BakedQuad> quads = new ArrayList();
+			List<BakedQuad> quads = new ArrayList<>();
 			for(IBakedModel bakedModel : models){
 				quads.addAll(bakedModel.getQuads(null, side, rand++));	
 			}

src/main/java/forestry/core/models/baker/ModelBakerModel.java

@@ -11,6 +11,7 @@
 package forestry.core.models.baker;
 
 import java.util.ArrayList;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -56,14 +57,14 @@ public class ModelBakerModel implements IModelBakerModel {
 
 	public ModelBakerModel(IModelState modelState) {
 		models = new ArrayList<>();
-		faceQuads = new HashMap<>();
+		faceQuads = new EnumMap<>(EnumFacing.class);
 		generalQuads = new ArrayList<>();
 		isGui3d = true;
 		isAmbientOcclusion = false;
 		setModelState(modelState);
 		
 		for(EnumFacing face : EnumFacing.VALUES){
-			faceQuads.put(face, new ArrayList());
+			faceQuads.put(face, new ArrayList<>());
 		}
 	}
 

src/main/java/forestry/core/multiblock/MultiblockTileEntityForestry.java

@@ -194,7 +194,7 @@ public abstract class MultiblockTileEntityForestry<T extends IMultiblockLogic> e
 	}
 
 	/* IMultiblockComponent */
-	@Nullable
+	@Nonnull
 	@Override
 	public final GameProfile getOwner() {
 		return owner;

src/main/java/forestry/core/proxy/ProxyRender.java

@@ -23,7 +23,6 @@ import net.minecraft.client.resources.IResourceManager;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3i;
 import net.minecraft.world.World;
 
 import net.minecraftforge.common.animation.ITimeValue;

src/main/java/forestry/core/tiles/TileAnalyzer.java

@@ -20,10 +20,9 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumFacing;
 
-import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.FluidTankInfo;
-import net.minecraftforge.fluids.IFluidHandler;
+import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
 
 import forestry.api.arboriculture.TreeManager;
 import forestry.api.core.ForestryAPI;
@@ -47,7 +46,7 @@ import forestry.core.utils.GeneticsUtil;
 import forestry.core.utils.InventoryUtil;
 import forestry.plugins.ForestryPluginUids;
 
-public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiquidTankTile, IFluidHandler, IItemStackDisplay {
+public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiquidTankTile, IItemStackDisplay {
 	private static final int TIME_TO_ANALYZE = 125;
 	private static final int HONEY_REQUIRED = 100;
 	private static final int ENERGY_PER_WORK_CYCLE = 20320;
@@ -64,7 +63,7 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui
 	public TileAnalyzer() {
 		super("analyzer", 800, Constants.MACHINE_MAX_ENERGY);
 		setInternalInventory(new InventoryAnalyzer(this));
-		resourceTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, Fluids.FOR_HONEY.getFluid());
+		resourceTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY).setFilters(Fluids.FOR_HONEY.getFluid());
 		tankManager = new TankManager(this, resourceTank);
 		invInput = new InventoryMapper(getInternalInventory(), InventoryAnalyzer.SLOT_INPUT_1, InventoryAnalyzer.SLOT_INPUT_COUNT);
 		invOutput = new InventoryMapper(getInternalInventory(), InventoryAnalyzer.SLOT_OUTPUT_1, InventoryAnalyzer.SLOT_OUTPUT_COUNT);
@@ -109,7 +108,8 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui
 		}
 
 		if (!specimenToAnalyze.isAnalyzed()) {
-			if (!resourceTank.canDrain(HONEY_REQUIRED)) {
+			FluidStack drained = resourceTank.drain(HONEY_REQUIRED, false);
+			if (drained == null || drained.amount != HONEY_REQUIRED) {
 				return false;
 			}
 			resourceTank.drain(HONEY_REQUIRED, true);
@@ -182,7 +182,8 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui
 			hasSpace = InventoryUtil.tryAddStack(invOutput, specimen, true, false);
 
 			if (!specimenToAnalyze.isAnalyzed()) {
-				hasResource = resourceTank.canDrain(HONEY_REQUIRED);
+				FluidStack drained = resourceTank.drain(HONEY_REQUIRED, false);
+				hasResource = drained != null && drained.amount == HONEY_REQUIRED;
 			}
 		}
 
@@ -249,35 +250,23 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui
 		return tankManager;
 	}
 
-	/* IFluidHandler */
 	@Override
-	public int fill(EnumFacing from, FluidStack resource, boolean doFill) {
-		return tankManager.fill(from, resource, doFill);
+	public boolean hasCapability(Capability<?> capability, EnumFacing facing) {
+		if (super.hasCapability(capability, facing)) {
+			return true;
+		}
+		return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY;
 	}
 
 	@Override
-	public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) {
-		return tankManager.drain(from, resource, doDrain);
-	}
-
-	@Override
-	public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) {
-		return tankManager.drain(from, maxDrain, doDrain);
-	}
-
-	@Override
-	public boolean canFill(EnumFacing from, Fluid fluid) {
-		return tankManager.canFill(from, fluid);
-	}
-
-	@Override
-	public boolean canDrain(EnumFacing from, Fluid fluid) {
-		return tankManager.canDrain(from, fluid);
-	}
-
-	@Override
-	public FluidTankInfo[] getTankInfo(EnumFacing from) {
-		return tankManager.getTankInfo(from);
+	public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
+		if (super.hasCapability(capability, facing)) {
+			return super.getCapability(capability, facing);
+		}
+		if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
+			return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tankManager);
+		}
+		return null;
 	}
 
 	@Override

src/main/java/forestry/core/tiles/TileNaturalistChest.java

@@ -89,7 +89,7 @@ public abstract class TileNaturalistChest extends TileBase implements IPagedInve
 	}
 
 	private void playLidSound(String sound) {
-		this.worldObj.playSound((EntityPlayer)null, getPos(), SoundEvents.BLOCK_CHEST_OPEN, SoundCategory.BLOCKS, 0.5F, this.worldObj.rand.nextFloat() * 0.1F + 0.9F);
+		this.worldObj.playSound(null, getPos(), SoundEvents.BLOCK_CHEST_OPEN, SoundCategory.BLOCKS, 0.5F, this.worldObj.rand.nextFloat() * 0.1F + 0.9F);
 	}
 
 	@Override

src/main/java/forestry/core/utils/ItemStackUtil.java

@@ -23,12 +23,12 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-import net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry;
-import net.minecraftforge.fml.common.registry.GameData;
+import net.minecraftforge.fml.common.registry.ForgeRegistries;
+import net.minecraftforge.fml.common.registry.IForgeRegistry;
 import net.minecraftforge.oredict.OreDictionary;
 
 public abstract class ItemStackUtil {
@@ -68,8 +68,8 @@ public abstract class ItemStackUtil {
 		if (item == null) {
 			return null;
 		}
-		FMLControlledNamespacedRegistry<Item> itemRegistry = GameData.getItemRegistry();
-		return itemRegistry.getNameForObject(item);
+		IForgeRegistry<Item> itemRegistry = ForgeRegistries.ITEMS;
+		return itemRegistry.getKey(item);
 	}
 	
 	/**
@@ -125,12 +125,8 @@ public abstract class ItemStackUtil {
 		if (itemName == null) {
 			return null;
 		}
-		FMLControlledNamespacedRegistry<Item> itemRegistry = GameData.getItemRegistry();
-		int registryID = itemRegistry.getId(itemName);
-		if (registryID == -1) {
-			return null;
-		}
-		return itemRegistry.getRaw(registryID);
+		IForgeRegistry<Item> itemRegistry = ForgeRegistries.ITEMS;
+		return itemRegistry.getValue(itemName);
 	}
 	
 	/**
@@ -141,8 +137,8 @@ public abstract class ItemStackUtil {
 		if (block == null) {
 			return null;
 		}
-		FMLControlledNamespacedRegistry<Block> blockRegistry = GameData.getBlockRegistry();
-		return blockRegistry.getNameForObject(block);
+		IForgeRegistry<Block> blockRegistry = ForgeRegistries.BLOCKS;
+		return blockRegistry.getKey(block);
 	}
 	
 	/**
@@ -169,12 +165,8 @@ public abstract class ItemStackUtil {
 		if (itemName == null) {
 			return null;
 		}
-		FMLControlledNamespacedRegistry<Block> blockRegistry = GameData.getBlockRegistry();
-		int registryID = blockRegistry.getId(itemName);
-		if (registryID == -1) {
-			return null;
-		}
-		return blockRegistry.getRaw(registryID);
+		IForgeRegistry<Block> blockRegistry = ForgeRegistries.BLOCKS;
+		return blockRegistry.getValue(itemName);
 	}
 
 	/**

src/main/java/forestry/core/utils/OreDictUtil.java

@@ -1,12 +1,5 @@
 package forestry.core.utils;
 
-import javax.annotation.Nullable;
-import java.util.List;
-
-import net.minecraft.item.ItemStack;
-
-import net.minecraftforge.oredict.OreDictionary;
-
 public class OreDictUtil {
 	public static final String ORE_COPPER = "oreCopper";
 	public static final String ORE_TIN = "oreTin";

src/main/java/forestry/core/utils/VectUtil.java

@@ -100,7 +100,7 @@ public final class VectUtil {
 			do {
 				pos = nextPos();
 			}
-			while (pos != null && (pos.getX() > maxPos.getX() || pos.getZ() > maxPos.getZ() || pos.getX() < minPos.getX() || pos.getZ() < minPos.getZ()));
+			while (pos != null && (pos.getX() > maxPos.getX() || pos.getY() > maxPos.getY() || pos.getZ() > maxPos.getZ() || pos.getX() < minPos.getX() || pos.getY() < minPos.getY() || pos.getZ() < minPos.getZ()));
 
 			return pos;
 		}

src/main/java/forestry/core/utils/VillagerTradeLists.java

@@ -174,4 +174,59 @@ public class VillagerTradeLists {
 			recipeList.add(new MerchantRecipe(randomLog, new ItemStack(Items.EMERALD, emeraldsAmount), itemToSell));
 		}
 	}
+	public static class GiveItemForTwoItems implements EntityVillager.ITradeList {
+		@Nonnull
+		public ItemStack buyingItemStack;
+		@Nullable
+		public EntityVillager.PriceInfo buyingPriceInfo;
+		@Nonnull
+		public ItemStack buyingItemStackTwo;
+		@Nullable
+		public EntityVillager.PriceInfo buyingPriceItemTwoInfo;
+		@Nonnull
+		public ItemStack sellingItemstack;
+		@Nullable
+		public EntityVillager.PriceInfo sellingPriceInfo;
+
+		public GiveItemForTwoItems(
+				@Nonnull ItemStack buyingItemStack,
+				@Nullable EntityVillager.PriceInfo buyingPriceInfo,
+				@Nonnull ItemStack buyingItemStackTwo,
+				@Nullable EntityVillager.PriceInfo buyingPriceItemTwoInfo,
+				@Nonnull ItemStack sellingItemstack,
+				@Nullable EntityVillager.PriceInfo sellingPriceInfo) {
+			this.buyingItemStack = buyingItemStack;
+			this.buyingPriceInfo = buyingPriceInfo;
+			this.buyingItemStackTwo = buyingItemStackTwo;
+			this.buyingPriceItemTwoInfo = buyingPriceItemTwoInfo;
+			this.sellingItemstack = sellingItemstack;
+			this.sellingPriceInfo = sellingPriceInfo;
+		}
+
+		@Override
+		public void modifyMerchantRecipeList(MerchantRecipeList recipeList, Random random) {
+			int buyAmount = 1;
+			if (this.buyingPriceInfo != null) {
+				buyAmount = this.buyingPriceInfo.getPrice(random);
+			}
+
+			int buyTwoAmount = 1;
+			if (this.buyingPriceItemTwoInfo != null) {
+				buyTwoAmount = this.buyingPriceItemTwoInfo.getPrice(random);
+			}
+
+			int sellAmount = 1;
+			if (this.sellingPriceInfo != null) {
+				sellAmount = this.sellingPriceInfo.getPrice(random);
+			}
+
+			ItemStack buyItemStack = this.buyingItemStack.copy();
+			buyItemStack.stackSize = buyAmount;
+			ItemStack buyItemStackTwo = this.buyingItemStackTwo.copy();
+			buyItemStackTwo.stackSize = buyTwoAmount;
+			ItemStack sellItemStack = this.sellingItemstack.copy();
+			sellItemStack.stackSize = sellAmount;
+			recipeList.add(new MerchantRecipe(buyItemStack, buyItemStackTwo, sellItemStack));
+		}
+	}
 }

src/main/java/forestry/energy/gui/GuiEngineElectric.java

@@ -14,9 +14,9 @@ import net.minecraft.entity.player.InventoryPlayer;
 
 import forestry.core.config.Constants;
 import forestry.core.gui.widgets.SocketWidget;
+import forestry.core.render.EnumTankLevel;
 import forestry.energy.tiles.TileEngineElectric;
 
-// TODO: IC2 for 1.9
 public class GuiEngineElectric extends GuiEngine<ContainerEngineElectric, TileEngineElectric> {
 
 	public GuiEngineElectric(InventoryPlayer inventory, TileEngineElectric tile) {
@@ -24,23 +24,23 @@ public class GuiEngineElectric extends GuiEngine<ContainerEngineElectric, TileEn
 		widgetManager.add(new SocketWidget(this.widgetManager, 30, 40, tile, 0));
 	}
 
-//	@Override
-//	protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) {
-//		super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY);
-//
-//		TileEngineElectric engine = inventory;
-//		int storageHeight = engine.getStorageScaled(46);
-//		int storageMaxHeight = engine.getStorageScaled(100);
-//		EnumTankLevel rated = EnumTankLevel.rateTankLevel(storageMaxHeight);
-//
-//		drawHealthMeter(guiLeft + 74, guiTop + 25, storageHeight, rated);
-//	}
-//
-//	private void drawHealthMeter(int x, int y, int height, EnumTankLevel rated) {
-//		int i = 176 + rated.getLevelScaled(16);
-//		int k = 0;
-//
-//		this.drawTexturedModalRect(x, y + 46 - height, i, k + 46 - height, 4, height);
-//	}
+	@Override
+	protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) {
+		super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY);
+
+		TileEngineElectric engine = inventory;
+		int storageHeight = engine.getStorageScaled(46);
+		int storageMaxHeight = engine.getStorageScaled(100);
+		EnumTankLevel rated = EnumTankLevel.rateTankLevel(storageMaxHeight);
+
+		drawHealthMeter(guiLeft + 74, guiTop + 25, storageHeight, rated);
+	}
+
+	private void drawHealthMeter(int x, int y, int height, EnumTankLevel rated) {
+		int i = 176 + rated.getLevelScaled(16);
+		int k = 0;
+
+		this.drawTexturedModalRect(x, y + 46 - height, i, k + 46 - height, 4, height);
+	}
 
 }

src/main/java/forestry/energy/gui/GuiGenerator.java

@@ -17,7 +17,6 @@ import forestry.core.gui.GuiForestryTitled;
 import forestry.core.gui.widgets.TankWidget;
 import forestry.energy.tiles.TileEuGenerator;
 
-// TODO: IC2 for 1.9
 public class GuiGenerator extends GuiForestryTitled<ContainerGenerator, TileEuGenerator> {
 
 	public GuiGenerator(InventoryPlayer inventory, TileEuGenerator tile) {
@@ -25,14 +24,14 @@ public class GuiGenerator extends GuiForestryTitled<ContainerGenerator, TileEuGe
 		widgetManager.add(new TankWidget(this.widgetManager, 49, 17, 0));
 	}
 
-//	@Override
-//	protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) {
-//		super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY);
-//
-//		int progress = inventory.getStoredScaled(49);
-//		if (progress > 0) {
-//			drawTexturedModalRect(guiLeft + 108, guiTop + 38, 176, 91, progress, 18);
-//		}
-//	}
+	@Override
+	protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) {
+		super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY);
+
+		int progress = inventory.getStoredScaled(49);
+		if (progress > 0) {
+			drawTexturedModalRect(guiLeft + 108, guiTop + 38, 176, 91, progress, 18);
+		}
+	}
 
 }

src/main/java/forestry/energy/inventory/InventoryEngineBiogas.java

@@ -12,9 +12,9 @@ package forestry.energy.inventory;
 
 import net.minecraft.item.ItemStack;
 
-import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidUtil;
 
-import forestry.core.fluids.FluidHelper;
 import forestry.core.inventory.InventoryAdapterTile;
 import forestry.energy.tiles.TileEngineBiogas;
 
@@ -28,8 +28,8 @@ public class InventoryEngineBiogas extends InventoryAdapterTile<TileEngineBiogas
 	@Override
 	public boolean canSlotAccept(int slotIndex, ItemStack itemStack) {
 		if (slotIndex == SLOT_CAN) {
-			Fluid fluid = FluidHelper.getFluidInContainer(itemStack);
-			return tile.getTankManager().accepts(fluid);
+			FluidStack fluid = FluidUtil.getFluidContained(itemStack);
+			return tile.getTankManager().canFillFluidType(fluid);
 		}
 
 		return false;

src/main/java/forestry/energy/inventory/InventoryEngineElectric.java

@@ -15,7 +15,8 @@ import net.minecraft.item.ItemStack;
 import forestry.core.inventory.InventoryAdapterTile;
 import forestry.energy.tiles.TileEngineElectric;
 
-// TODO: IC2 for 1.9
+import ic2.api.item.ElectricItem;
+
 public class InventoryEngineElectric extends InventoryAdapterTile<TileEngineElectric> {
 	public static final short SLOT_BATTERY = 0;
 
@@ -25,9 +26,9 @@ public class InventoryEngineElectric extends InventoryAdapterTile<TileEngineElec
 
 	@Override
 	public boolean canSlotAccept(int slotIndex, ItemStack itemStack) {
-//		if (slotIndex == SLOT_BATTERY) {
-//			return ElectricItem.manager.getCharge(itemStack) > 0;
-//		}
+		if (slotIndex == SLOT_BATTERY) {
+			return ElectricItem.manager.getCharge(itemStack) > 0;
+		}
 		return false;
 	}
 }

src/main/java/forestry/energy/inventory/InventoryGenerator.java

@@ -12,9 +12,9 @@ package forestry.energy.inventory;
 
 import net.minecraft.item.ItemStack;
 
-import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidUtil;
 
-import forestry.core.fluids.FluidHelper;
 import forestry.core.inventory.InventoryAdapterTile;
 import forestry.energy.tiles.TileEuGenerator;
 
@@ -28,8 +28,8 @@ public class InventoryGenerator extends InventoryAdapterTile<TileEuGenerator> {
 	@Override
 	public boolean canSlotAccept(int slotIndex, ItemStack itemStack) {
 		if (slotIndex == SLOT_CAN) {
-			Fluid fluid = FluidHelper.getFluidInContainer(itemStack);
-			return tile.getTankManager().accepts(fluid);
+			FluidStack fluid = FluidUtil.getFluidContained(itemStack);
+			return tile.getTankManager().canFillFluidType(fluid);
 		}
 
 		return false;

src/main/java/forestry/energy/tiles/TileEngineBiogas.java

@@ -20,11 +20,11 @@ import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumFacing;
 
+import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.FluidTankInfo;
-import net.minecraftforge.fluids.IFluidHandler;
+import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
 
 import forestry.api.core.IErrorLogic;
 import forestry.api.fuels.EngineBronzeFuel;
@@ -44,7 +44,7 @@ import forestry.energy.gui.ContainerEngineBiogas;
 import forestry.energy.gui.GuiEngineBiogas;
 import forestry.energy.inventory.InventoryEngineBiogas;
 
-public class TileEngineBiogas extends TileEngine implements ISidedInventory, ILiquidTankTile, IFluidHandler {
+public class TileEngineBiogas extends TileEngine implements ISidedInventory, ILiquidTankTile {
 	private final FilteredTank fuelTank;
 	private final FilteredTank heatingTank;
 	private final StandardTank burnTank;
@@ -57,12 +57,10 @@ public class TileEngineBiogas extends TileEngine implements ISidedInventory, ILi
 
 		setInternalInventory(new InventoryEngineBiogas(this));
 
-		fuelTank = new FilteredTank(Constants.ENGINE_TANK_CAPACITY, FuelManager.bronzeEngineFuel.keySet());
-		fuelTank.tankMode = StandardTank.TankMode.DEFAULT;
-		heatingTank = new FilteredTank(Constants.ENGINE_TANK_CAPACITY, FluidRegistry.LAVA);
-		heatingTank.tankMode = StandardTank.TankMode.INPUT;
-		burnTank = new StandardTank(Constants.BUCKET_VOLUME);
-		burnTank.tankMode = StandardTank.TankMode.INTERNAL;
+		fuelTank = new FilteredTank(Constants.ENGINE_TANK_CAPACITY).setFilters(FuelManager.bronzeEngineFuel.keySet());
+		heatingTank = new FilteredTank(Constants.ENGINE_TANK_CAPACITY, true, false).setFilters(FluidRegistry.LAVA);
+		burnTank = new StandardTank(Fluid.BUCKET_VOLUME, false, false);
+
 		this.tankManager = new TankManager(this, fuelTank, heatingTank, burnTank);
 	}
 
@@ -103,7 +101,7 @@ public class TileEngineBiogas extends TileEngine implements ISidedInventory, ILi
 
 		currentOutput = 0;
 
-		if (isRedstoneActivated() && (fuelTank.getFluidAmount() >= Constants.BUCKET_VOLUME || burnTank.getFluidAmount() > 0)) {
+		if (isRedstoneActivated() && (fuelTank.getFluidAmount() >= Fluid.BUCKET_VOLUME || burnTank.getFluidAmount() > 0)) {
 
 			double heatStage = getHeatLevel();
 
@@ -115,18 +113,18 @@ public class TileEngineBiogas extends TileEngine implements ISidedInventory, ILi
 			{
 				if (heatingTank.getFluidAmount() > 0 && Fluids.LAVA.is(heatingTank.getFluid())) {
 					addHeat(Constants.ENGINE_HEAT_VALUE_LAVA);
-					heatingTank.drain(1, true);
+					heatingTank.drainInternal(1, true);
 				}
 			}
 
 			// We need a minimum temperature to generate energy
 			if (heatStage > 0.2) {
 				if (burnTank.getFluidAmount() > 0) {
-					FluidStack drained = burnTank.drain(1, true);
+					FluidStack drained = burnTank.drainInternal(1, true);
 					currentOutput = determineFuelValue(drained.getFluid());
 					energyManager.generateEnergy(currentOutput);
 				} else {
-					FluidStack fuel = fuelTank.drain(Constants.BUCKET_VOLUME, true);
+					FluidStack fuel = fuelTank.drainInternal(Fluid.BUCKET_VOLUME, true);
 					int burnTime = determineBurnTime(fuel.getFluid());
 					fuel.amount = burnTime;
 					burnTank.setCapacity(burnTime);
@@ -295,35 +293,23 @@ public class TileEngineBiogas extends TileEngine implements ISidedInventory, ILi
 		iCrafting.sendProgressBarUpdate(containerEngine, 3, burnTank.getCapacity());
 	}
 
-	// IFluidHandler
 	@Override
-	public int fill(EnumFacing from, FluidStack resource, boolean doFill) {
-		return tankManager.fill(from, resource, doFill);
+	public boolean hasCapability(Capability<?> capability, EnumFacing facing) {
+		if (super.hasCapability(capability, facing)) {
+			return true;
+		}
+		return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY;
 	}
 
 	@Override
-	public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) {
-		return tankManager.drain(from, resource, doDrain);
-	}
-
-	@Override
-	public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) {
-		return tankManager.drain(from, maxDrain, doDrain);
-	}
-
-	@Override
-	public boolean canFill(EnumFacing from, Fluid fluid) {
-		return tankManager.canFill(from, fluid);
-	}
-
-	@Override
-	public boolean canDrain(EnumFacing from, Fluid fluid) {
-		return tankManager.canDrain(from, fluid);
-	}
-
-	@Override
-	public FluidTankInfo[] getTankInfo(EnumFacing from) {
-		return tankManager.getTankInfo(from);
+	public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
+		if (super.hasCapability(capability, facing)) {
+			return super.getCapability(capability, facing);
+		}
+		if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
+			return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tankManager);
+		}
+		return null;
 	}
 
 	@Override

src/main/java/forestry/energy/tiles/TileEngineElectric.java

@@ -27,6 +27,7 @@ import forestry.api.circuits.ICircuitSocketType;
 import forestry.api.core.IErrorLogic;
 import forestry.core.circuits.ISocketable;
 import forestry.core.config.Constants;
+import forestry.core.errors.EnumErrorCode;
 import forestry.core.inventory.InventoryAdapter;
 import forestry.core.network.DataInputStreamForestry;
 import forestry.core.network.DataOutputStreamForestry;
@@ -36,8 +37,10 @@ import forestry.core.tiles.TileEngine;
 import forestry.energy.gui.ContainerEngineElectric;
 import forestry.energy.gui.GuiEngineElectric;
 import forestry.energy.inventory.InventoryEngineElectric;
+import forestry.plugins.compat.PluginIC2;
+
+import ic2.api.energy.prefab.BasicSink;
 
-// TODO: IC2 for 1.9
 public class TileEngineElectric extends TileEngine implements ISocketable, IInventory, IStreamableGui {
 	protected static class EuConfig {
 
@@ -55,16 +58,16 @@ public class TileEngineElectric extends TileEngine implements ISocketable, IInve
 	private final InventoryAdapter sockets = new InventoryAdapter(1, "sockets");
 	private final EuConfig euConfig = new EuConfig();
 
-//	private BasicSink ic2EnergySink;
+	private BasicSink ic2EnergySink;
 
 	public TileEngineElectric() {
 		super("engine.tin", Constants.ENGINE_ELECTRIC_HEAT_MAX, 100000);
 
 		setInternalInventory(new InventoryEngineElectric(this));
 
-//		if (PluginIC2.instance.isAvailable()) {
-//			ic2EnergySink = new BasicSink(this, euConfig.euStorage, 3);
-//		}
+		if (PluginIC2.instance.isAvailable()) {
+			ic2EnergySink = new BasicSink(this, euConfig.euStorage, 3);
+		}
 	}
 
 	// / SAVING / LOADING
@@ -72,9 +75,9 @@ public class TileEngineElectric extends TileEngine implements ISocketable, IInve
 	public void readFromNBT(NBTTagCompound nbttagcompound) {
 		super.readFromNBT(nbttagcompound);
 
-//		if (ic2EnergySink != null) {
-//			ic2EnergySink.readFromNBT(nbttagcompound);
-//		}
+		if (ic2EnergySink != null) {
+			ic2EnergySink.readFromNBT(nbttagcompound);
+		}
 		sockets.readFromNBT(nbttagcompound);
 
 		ItemStack chip = sockets.getStackInSlot(0);
@@ -91,27 +94,27 @@ public class TileEngineElectric extends TileEngine implements ISocketable, IInve
 	public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) {
 		nbttagcompound = super.writeToNBT(nbttagcompound);
 
-//		if (ic2EnergySink != null) {
-//			ic2EnergySink.writeToNBT(nbttagcompound);
-//		}
+		if (ic2EnergySink != null) {
+			ic2EnergySink.writeToNBT(nbttagcompound);
+		}
 		sockets.writeToNBT(nbttagcompound);
 		return nbttagcompound;
 	}
 
 	@Override
 	public void onChunkUnload() {
-//		if (ic2EnergySink != null) {
-//			ic2EnergySink.onChunkUnload();
-//		}
+		if (ic2EnergySink != null) {
+			ic2EnergySink.onChunkUnload();
+		}
 
 		super.onChunkUnload();
 	}
 
 	@Override
 	public void invalidate() {
-//		if (ic2EnergySink != null) {
-//			ic2EnergySink.invalidate();
-//		}
+		if (ic2EnergySink != null) {
+			ic2EnergySink.invalidate();
+		}
 
 		super.invalidate();
 	}
@@ -159,11 +162,11 @@ public class TileEngineElectric extends TileEngine implements ISocketable, IInve
 		IErrorLogic errorLogic = getErrorLogic();
 
 		// No work to be done if IC2 is unavailable.
-//		if (errorLogic.setCondition(ic2EnergySink == null, EnumErrorCode.NO_ENERGY_NET)) {
-//			return;
-//		}
-//
-//		ic2EnergySink.update();
+		if (errorLogic.setCondition(ic2EnergySink == null, EnumErrorCode.NO_ENERGY_NET)) {
+			return;
+		}
+
+		ic2EnergySink.update();
 
 		super.updateServerSide();
 
@@ -180,8 +183,8 @@ public class TileEngineElectric extends TileEngine implements ISocketable, IInve
 			return;
 		}
 
-//		boolean canUseEnergy = ic2EnergySink.canUseEnergy(euConfig.euForCycle);
-//		errorLogic.setCondition(!canUseEnergy, EnumErrorCode.NO_FUEL);
+		boolean canUseEnergy = ic2EnergySink.canUseEnergy(euConfig.euForCycle);
+		errorLogic.setCondition(!canUseEnergy, EnumErrorCode.NO_FUEL);
 	}
 
 	@Override
@@ -193,10 +196,10 @@ public class TileEngineElectric extends TileEngine implements ISocketable, IInve
 			return;
 		}
 
-//		if (ic2EnergySink.useEnergy(euConfig.euForCycle)) {
-//			currentOutput = euConfig.rfPerCycle;
-//			energyManager.generateEnergy(euConfig.rfPerCycle);
-//		}
+		if (ic2EnergySink.useEnergy(euConfig.euForCycle)) {
+			currentOutput = euConfig.rfPerCycle;
+			energyManager.generateEnergy(euConfig.rfPerCycle);
+		}
 
 	}
 
@@ -205,23 +208,22 @@ public class TileEngineElectric extends TileEngine implements ISocketable, IInve
 			return;
 		}
 
-//		ic2EnergySink.discharge(getStackInSlot(slot), euConfig.euForCycle * 3);
+		ic2EnergySink.discharge(getStackInSlot(slot), euConfig.euForCycle * 3);
 	}
 
 	// / STATE INFORMATION
 	@Override
 	protected boolean isBurning() {
-		// TODO: IC2 for 1.9
-		return mayBurn();// && ic2EnergySink != null && ic2EnergySink.canUseEnergy(euConfig.euForCycle);
+		return mayBurn() && ic2EnergySink != null && ic2EnergySink.canUseEnergy(euConfig.euForCycle);
 	}
 
-//	public int getStorageScaled(int i) {
-//		if (ic2EnergySink == null) {
-//			return 0;
-//		}
-//
-//		return Math.min(i, (int) (ic2EnergySink.getEnergyStored() * i) / ic2EnergySink.getCapacity());
-//	}
+	public int getStorageScaled(int i) {
+		if (ic2EnergySink == null) {
+			return 0;
+		}
+
+		return Math.min(i, (int) (ic2EnergySink.getEnergyStored() * i) / ic2EnergySink.getCapacity());
+	}
 
 	// / SMP GUI
 	@Override
@@ -230,11 +232,11 @@ public class TileEngineElectric extends TileEngine implements ISocketable, IInve
 		data.writeVarInt(heat);
 		sockets.writeData(data);
 		energyManager.writeData(data);
-//		final boolean hasIc2EnergySink = (ic2EnergySink != null);
-//		data.writeBoolean(hasIc2EnergySink);
-//		if (hasIc2EnergySink) {
-//			data.writeVarInt((int) ic2EnergySink.getEnergyStored());
-//		}
+		final boolean hasIc2EnergySink = (ic2EnergySink != null);
+		data.writeBoolean(hasIc2EnergySink);
+		if (hasIc2EnergySink) {
+			data.writeVarInt((int) ic2EnergySink.getEnergyStored());
+		}
 	}
 
 	@Override
@@ -243,11 +245,11 @@ public class TileEngineElectric extends TileEngine implements ISocketable, IInve
 		heat = data.readVarInt();
 		sockets.readData(data);
 		energyManager.readData(data);
-//		final boolean hasIc2EnergySink = data.readBoolean();
-//		if (hasIc2EnergySink) {
-//			final int energyStored = data.readVarInt();
-//			ic2EnergySink.setEnergyStored(energyStored);
-//		}
+		final boolean hasIc2EnergySink = data.readBoolean();
+		if (hasIc2EnergySink) {
+			final int energyStored = data.readVarInt();
+			ic2EnergySink.setEnergyStored(energyStored);
+		}
 	}
 
 	@Override
@@ -266,9 +268,9 @@ public class TileEngineElectric extends TileEngine implements ISocketable, IInve
 		euConfig.rfPerCycle += rfChange;
 		euConfig.euStorage += storageChange;
 
-//		if (ic2EnergySink != null) {
-//			ic2EnergySink.setCapacity(euConfig.euStorage);
-//		}
+		if (ic2EnergySink != null) {
+			ic2EnergySink.setCapacity(euConfig.euStorage);
+		}
 	}
 
 	/* ISocketable */

src/main/java/forestry/energy/tiles/TileEuGenerator.java

@@ -20,16 +20,16 @@ import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumFacing;
 
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.FluidTankInfo;
-import net.minecraftforge.fluids.IFluidHandler;
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
 
 import forestry.api.core.IErrorLogic;
 import forestry.api.fuels.FuelManager;
+import forestry.api.fuels.GeneratorFuel;
 import forestry.core.config.Constants;
 import forestry.core.errors.EnumErrorCode;
 import forestry.core.fluids.FluidHelper;
+import forestry.core.fluids.ITankManager;
 import forestry.core.fluids.TankManager;
 import forestry.core.fluids.tanks.FilteredTank;
 import forestry.core.network.DataInputStreamForestry;
@@ -41,9 +41,11 @@ import forestry.core.tiles.TileBase;
 import forestry.energy.gui.ContainerGenerator;
 import forestry.energy.gui.GuiGenerator;
 import forestry.energy.inventory.InventoryGenerator;
+import forestry.plugins.compat.PluginIC2;
 
-// TODO: IC2 for 1.9
-public class TileEuGenerator extends TileBase implements ISidedInventory, ILiquidTankTile, IFluidHandler, IRenderableTile {
+import ic2.api.energy.prefab.BasicSource;
+
+public class TileEuGenerator extends TileBase implements ISidedInventory, ILiquidTankTile, IRenderableTile {
 	private static final int maxEnergy = 30000;
 
 	private final TankManager tankManager;
@@ -51,19 +53,21 @@ public class TileEuGenerator extends TileBase implements ISidedInventory, ILiqui
 
 	private int tickCount = 0;
 
-//	private BasicSource ic2EnergySource;
+	private BasicSource ic2EnergySource;
 
 	public TileEuGenerator() {
 		super("generator");
 
 		setInternalInventory(new InventoryGenerator(this));
 
-		resourceTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, FuelManager.generatorFuel.keySet());
+		resourceTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY);
+		resourceTank.setFilters(FuelManager.generatorFuel.keySet());
+
 		tankManager = new TankManager(this, resourceTank);
 
-//		if (PluginIC2.instance.isAvailable()) {
-//			ic2EnergySource = new BasicSource(this, maxEnergy, 1);
-//		}
+		if (PluginIC2.instance.isAvailable()) {
+			ic2EnergySource = new BasicSource(this, maxEnergy, 1);
+		}
 	}
 
 	@Nonnull
@@ -71,9 +75,9 @@ public class TileEuGenerator extends TileBase implements ISidedInventory, ILiqui
 	public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) {
 		nbttagcompound = super.writeToNBT(nbttagcompound);
 
-//		if (ic2EnergySource != null) {
-//			ic2EnergySource.writeToNBT(nbttagcompound);
-//		}
+		if (ic2EnergySource != null) {
+			ic2EnergySource.writeToNBT(nbttagcompound);
+		}
 
 		tankManager.writeToNBT(nbttagcompound);
 		return nbttagcompound;
@@ -83,9 +87,9 @@ public class TileEuGenerator extends TileBase implements ISidedInventory, ILiqui
 	public void readFromNBT(NBTTagCompound nbttagcompound) {
 		super.readFromNBT(nbttagcompound);
 
-//		if (ic2EnergySource != null) {
-//			ic2EnergySource.readFromNBT(nbttagcompound);
-//		}
+		if (ic2EnergySource != null) {
+			ic2EnergySource.readFromNBT(nbttagcompound);
+		}
 
 		tankManager.readFromNBT(nbttagcompound);
 	}
@@ -104,18 +108,18 @@ public class TileEuGenerator extends TileBase implements ISidedInventory, ILiqui
 
 	@Override
 	public void onChunkUnload() {
-//		if (ic2EnergySource != null) {
-//			ic2EnergySource.onChunkUnload();
-//		}
+		if (ic2EnergySource != null) {
+			ic2EnergySource.onChunkUnload();
+		}
 
 		super.onChunkUnload();
 	}
 
 	@Override
 	public void invalidate() {
-//		if (ic2EnergySource != null) {
-//			ic2EnergySource.invalidate();
-//		}
+		if (ic2EnergySource != null) {
+			ic2EnergySource.invalidate();
+		}
 
 		super.invalidate();
 	}
@@ -129,25 +133,25 @@ public class TileEuGenerator extends TileBase implements ISidedInventory, ILiqui
 		IErrorLogic errorLogic = getErrorLogic();
 
 		// No work to be done if IC2 is unavailable.
-//		if (errorLogic.setCondition(ic2EnergySource == null, EnumErrorCode.NO_ENERGY_NET)) {
-//			return;
-//		}
-//
-//		ic2EnergySource.update();
-//
-//		if (resourceTank.getFluidAmount() > 0) {
-//			GeneratorFuel fuel = FuelManager.generatorFuel.get(resourceTank.getFluid().getFluid());
-//			if (resourceTank.canDrain(fuel.fuelConsumed) && ic2EnergySource.getFreeCapacity() >= fuel.eu) {
-//				ic2EnergySource.addEnergy(fuel.eu);
-//				this.tickCount++;
-//
-//				if (tickCount >= fuel.rate) {
-//					tickCount = 0;
-//					resourceTank.drain(fuel.fuelConsumed.amount, true);
-//				}
-//			}
-//
-//		}
+		if (errorLogic.setCondition(ic2EnergySource == null, EnumErrorCode.NO_ENERGY_NET)) {
+			return;
+		}
+
+		ic2EnergySource.update();
+
+		if (resourceTank.getFluidAmount() > 0) {
+			GeneratorFuel fuel = FuelManager.generatorFuel.get(resourceTank.getFluid().getFluid());
+			if (resourceTank.canDrainFluidType(fuel.fuelConsumed) && ic2EnergySource.getFreeCapacity() >= fuel.eu) {
+				ic2EnergySource.addEnergy(fuel.eu);
+				this.tickCount++;
+
+				if (tickCount >= fuel.rate) {
+					tickCount = 0;
+					resourceTank.drain(fuel.fuelConsumed.amount, true);
+				}
+			}
+
+		}
 
 		boolean hasFuel = resourceTank.getFluidAmount() > 0;
 		errorLogic.setCondition(!hasFuel, EnumErrorCode.NO_FUEL);
@@ -161,13 +165,13 @@ public class TileEuGenerator extends TileBase implements ISidedInventory, ILiqui
 		return (resourceTank.getFluidAmount() * i) / Constants.PROCESSOR_TANK_CAPACITY;
 	}
 
-//	public int getStoredScaled(int i) {
-//		if (ic2EnergySource == null) {
-//			return 0;
-//		}
-//
-//		return (int) (ic2EnergySource.getEnergyStored() * i) / maxEnergy;
-//	}
+	public int getStoredScaled(int i) {
+		if (ic2EnergySource == null) {
+			return 0;
+		}
+
+		return (int) (ic2EnergySource.getEnergyStored() * i) / maxEnergy;
+	}
 
 	@Override
 	public TankRenderInfo getResourceTankInfo() {
@@ -182,53 +186,16 @@ public class TileEuGenerator extends TileBase implements ISidedInventory, ILiqui
 	/* SMP GUI */
 	public void getGUINetworkData(int i, int j) {
 		if (i == 0) {
-//			if (ic2EnergySource != null) {
-//				ic2EnergySource.setEnergyStored(j);
-//			}
+			if (ic2EnergySource != null) {
+				ic2EnergySource.setEnergyStored(j);
+			}
 		}
 	}
 
 	public void sendGUINetworkData(Container container, IContainerListener iCrafting) {
-//		if (ic2EnergySource != null) {
-//			iCrafting.sendProgressBarUpdate(container, 0, (short) ic2EnergySource.getEnergyStored());
-//		}
-	}
-
-	/* ILiquidTankTile */
-	@Override
-	public int fill(EnumFacing from, FluidStack resource, boolean doFill) {
-		return tankManager.fill(from, resource, doFill);
-	}
-
-	@Nonnull
-	@Override
-	public TankManager getTankManager() {
-		return tankManager;
-	}
-
-	@Override
-	public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) {
-		return tankManager.drain(from, resource, doDrain);
-	}
-
-	@Override
-	public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) {
-		return tankManager.drain(from, maxDrain, doDrain);
-	}
-
-	@Override
-	public boolean canFill(EnumFacing from, Fluid fluid) {
-		return tankManager.canFill(from, fluid);
-	}
-
-	@Override
-	public boolean canDrain(EnumFacing from, Fluid fluid) {
-		return tankManager.canDrain(from, fluid);
-	}
-
-	@Override
-	public FluidTankInfo[] getTankInfo(EnumFacing from) {
-		return tankManager.getTankInfo(from);
+		if (ic2EnergySource != null) {
+			iCrafting.sendProgressBarUpdate(container, 0, (short) ic2EnergySource.getEnergyStored());
+		}
 	}
 
 	@Override
@@ -240,4 +207,29 @@ public class TileEuGenerator extends TileBase implements ISidedInventory, ILiqui
 	public Object getContainer(EntityPlayer player, int data) {
 		return new ContainerGenerator(player.inventory, this);
 	}
+
+	@Nonnull
+	@Override
+	public ITankManager getTankManager() {
+		return tankManager;
+	}
+
+	@Override
+	public boolean hasCapability(Capability<?> capability, EnumFacing facing) {
+		if (super.hasCapability(capability, facing)) {
+			return true;
+		}
+		return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY;
+	}
+
+	@Override
+	public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
+		if (super.hasCapability(capability, facing)) {
+			return super.getCapability(capability, facing);
+		}
+		if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
+			return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tankManager);
+		}
+		return null;
+	}
 }

src/main/java/forestry/factory/PluginFactory.java

@@ -16,6 +16,7 @@ import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
+import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
 import forestry.api.circuits.ChipsetManager;
@@ -242,8 +243,8 @@ public class PluginFactory extends BlankForestryPlugin {
 
 		if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) {
 			ItemRegistryApiculture beeItems = PluginApiculture.items;
-			FluidStack liquidGlass = Fluids.GLASS.getFluid(Constants.BUCKET_VOLUME);
-			FluidStack liquidGlassX4 = Fluids.GLASS.getFluid(Constants.BUCKET_VOLUME * 4);
+			FluidStack liquidGlass = Fluids.GLASS.getFluid(Fluid.BUCKET_VOLUME);
+			FluidStack liquidGlassX4 = Fluids.GLASS.getFluid(Fluid.BUCKET_VOLUME * 4);
 			for (int i = 0; i < 16; i++) {
 				RecipeManagers.fabricatorManager.addRecipe(beeItems.waxCast.getWildcard(), liquidGlass, new ItemStack(Blocks.STAINED_GLASS, 4, 15 - i), new Object[]{
 						"#", "X",

src/main/java/forestry/factory/inventory/InventoryBottler.java

@@ -15,6 +15,7 @@ import net.minecraft.util.EnumFacing;
 
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidUtil;
 
 import forestry.core.fluids.FluidHelper;
 import forestry.core.inventory.InventoryAdapterTile;
@@ -32,9 +33,9 @@ public class InventoryBottler extends InventoryAdapterTile<TileBottler> {
 	@Override
 	public boolean canSlotAccept(int slotIndex, ItemStack itemStack) {
 		if (slotIndex == SLOT_INPUT_EMPTY_CAN) {
-			return FluidHelper.isFillableContainer(itemStack);
+			return FluidHelper.isFillableContainerWithRoom(itemStack);
 		} else if (slotIndex == SLOT_INPUT_FULL_CAN) {
-			FluidStack fluidStack = FluidHelper.getFluidStackInContainer(itemStack);
+			FluidStack fluidStack = FluidUtil.getFluidContained(itemStack);
 			return fluidStack != null && FluidRegistry.isFluidRegistered(fluidStack.getFluid());
 		}
 		return false;

src/main/java/forestry/factory/inventory/InventoryCarpenter.java

@@ -13,9 +13,9 @@ package forestry.factory.inventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 
-import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidUtil;
 
-import forestry.core.fluids.FluidHelper;
 import forestry.core.inventory.InventoryAdapterTile;
 import forestry.core.utils.SlotUtil;
 import forestry.factory.recipes.CarpenterRecipeManager;
@@ -36,8 +36,8 @@ public class InventoryCarpenter extends InventoryAdapterTile<TileCarpenter> {
 	@Override
 	public boolean canSlotAccept(int slotIndex, ItemStack itemStack) {
 		if (slotIndex == SLOT_CAN_INPUT) {
-			Fluid fluid = FluidHelper.getFluidInContainer(itemStack);
-			return tile.getTankManager().accepts(fluid);
+			FluidStack fluid = FluidUtil.getFluidContained(itemStack);
+			return tile.getTankManager().canFillFluidType(fluid);
 		} else if (slotIndex == SLOT_BOX) {
 			return CarpenterRecipeManager.isBox(itemStack);
 		} else if (canSlotAccept(SLOT_CAN_INPUT, itemStack) || canSlotAccept(SLOT_BOX, itemStack)) {

src/main/java/forestry/factory/inventory/InventoryFermenter.java

@@ -13,7 +13,8 @@ package forestry.factory.inventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 
-import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidUtil;
 
 import forestry.api.fuels.FuelManager;
 import forestry.core.fluids.FluidHelper;
@@ -37,10 +38,10 @@ public class InventoryFermenter extends InventoryAdapterTile<TileFermenter> {
 		if (slotIndex == SLOT_RESOURCE) {
 			return FermenterRecipeManager.isResource(itemStack);
 		} else if (slotIndex == SLOT_INPUT) {
-			Fluid fluid = FluidHelper.getFluidInContainer(itemStack);
-			return tile.getTankManager().accepts(fluid);
+			FluidStack fluid = FluidUtil.getFluidContained(itemStack);
+			return tile.getTankManager().canFillFluidType(fluid);
 		} else if (slotIndex == SLOT_CAN_INPUT) {
-			return FluidHelper.isFillableContainer(itemStack);
+			return FluidHelper.isFillableContainerWithRoom(itemStack);
 		} else if (slotIndex == SLOT_FUEL) {
 			return FuelManager.fermenterFuel.containsKey(itemStack);
 		}

src/main/java/forestry/factory/inventory/InventoryMoistener.java

@@ -13,10 +13,10 @@ package forestry.factory.inventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 
-import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidUtil;
 
 import forestry.api.fuels.FuelManager;
-import forestry.core.fluids.FluidHelper;
 import forestry.core.inventory.InventoryAdapterTile;
 import forestry.core.utils.SlotUtil;
 import forestry.factory.recipes.MoistenerRecipeManager;
@@ -46,8 +46,8 @@ public class InventoryMoistener extends InventoryAdapterTile<TileMoistener> {
 		}
 
 		if (slotIndex == SLOT_PRODUCT) {
-			Fluid fluid = FluidHelper.getFluidInContainer(itemStack);
-			return tile.getTankManager().accepts(fluid);
+			FluidStack fluid = FluidUtil.getFluidContained(itemStack);
+			return tile.getTankManager().canFillFluidType(fluid);
 		}
 
 		return false;

src/main/java/forestry/factory/inventory/InventoryRaintank.java

@@ -13,8 +13,11 @@ package forestry.factory.inventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 
-import forestry.core.fluids.FluidHelper;
-import forestry.core.fluids.Fluids;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidUtil;
+import net.minecraftforge.fluids.capability.IFluidHandler;
+
 import forestry.core.inventory.InventoryAdapterTile;
 import forestry.factory.tiles.TileRaintank;
 
@@ -29,7 +32,10 @@ public class InventoryRaintank extends InventoryAdapterTile<TileRaintank> {
 	@Override
 	public boolean canSlotAccept(int slotIndex, ItemStack itemStack) {
 		if (slotIndex == SLOT_RESOURCE) {
-			return FluidHelper.getFilledContainer(Fluids.WATER.getFluid(1000), itemStack) != null;
+			IFluidHandler fluidHandler = FluidUtil.getFluidHandler(itemStack);
+			if (fluidHandler != null) {
+				return fluidHandler.fill(new FluidStack(FluidRegistry.WATER, Integer.MAX_VALUE), false) > 0;
+			}
 		}
 		return false;
 	}

src/main/java/forestry/factory/inventory/InventorySqueezer.java

@@ -40,11 +40,11 @@ public class InventorySqueezer extends InventoryAdapterTile<TileSqueezer> {
 	@Override
 	public boolean canSlotAccept(int slotIndex, ItemStack itemStack) {
 		if (slotIndex == SLOT_CAN_INPUT) {
-			return FluidHelper.isEmptyContainer(itemStack);
+			return FluidHelper.isFillableEmptyContainer(itemStack);
 		}
 
 		if (slotIndex >= SLOT_RESOURCE_1 && slotIndex < SLOT_RESOURCE_1 + SLOTS_RESOURCE_COUNT) {
-			if (FluidHelper.isEmptyContainer(itemStack)) {
+			if (FluidHelper.isFillableEmptyContainer(itemStack)) {
 				return false;
 			}
 
@@ -82,6 +82,6 @@ public class InventorySqueezer extends InventoryAdapterTile<TileSqueezer> {
 		if (getStackInSlot(SLOT_CAN_INPUT) == null || fluidStack == null) {
 			return;
 		}
-		FluidHelper.fillContainers(tankManager, this, SLOT_CAN_INPUT, SLOT_CAN_OUTPUT, fluidStack.getFluid());
+		FluidHelper.fillContainers(tankManager, this, SLOT_CAN_INPUT, SLOT_CAN_OUTPUT, fluidStack.getFluid(), true);
 	}
 }

src/main/java/forestry/factory/inventory/InventoryStill.java

@@ -13,7 +13,8 @@ package forestry.factory.inventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 
-import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidUtil;
 
 import forestry.core.fluids.FluidHelper;
 import forestry.core.inventory.InventoryAdapterTile;
@@ -31,10 +32,10 @@ public class InventoryStill extends InventoryAdapterTile<TileStill> {
 	@Override
 	public boolean canSlotAccept(int slotIndex, ItemStack itemStack) {
 		if (slotIndex == SLOT_RESOURCE) {
-			return FluidHelper.isEmptyContainer(itemStack);
+			return FluidHelper.isFillableEmptyContainer(itemStack);
 		} else if (slotIndex == SLOT_CAN) {
-			Fluid fluid = FluidHelper.getFluidInContainer(itemStack);
-			return tile.getTankManager().accepts(fluid);
+			FluidStack fluid = FluidUtil.getFluidContained(itemStack);
+			return tile.getTankManager().canFillFluidType(fluid);
 		}
 		return false;
 	}

src/main/java/forestry/factory/recipes/BottlerRecipe.java

@@ -12,59 +12,44 @@ package forestry.factory.recipes;
 
 import net.minecraft.item.ItemStack;
 
+import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.IFluidContainerItem;
-
-import forestry.core.config.Constants;
-import forestry.core.fluids.FluidHelper;
+import net.minecraftforge.fluids.FluidUtil;
+import net.minecraftforge.fluids.capability.IFluidHandler;
 
 public class BottlerRecipe {
+	public static BottlerRecipe create(Fluid res, ItemStack empty) {
+		if (res == null || empty == null) {
+			return null;
+		}
+
+		ItemStack filled = empty.copy();
+		filled.stackSize = 1;
+
+		IFluidHandler fluidHandler = FluidUtil.getFluidHandler(filled);
+		if (fluidHandler == null) {
+			return null;
+		}
+
+		int fillAmount = fluidHandler.fill(new FluidStack(res, Integer.MAX_VALUE), true);
+		if (fillAmount > 0) {
+			return new BottlerRecipe(empty, new FluidStack(res, fillAmount), filled);
+		}
+
+		return null;
+	}
+
 	public final FluidStack input;
 	public final ItemStack empty;
 	public final ItemStack filled;
 
 	private BottlerRecipe(ItemStack empty, FluidStack input, ItemStack filled) {
 		this.input = input;
-		if (empty.getItem() instanceof IFluidContainerItem) {
-			FluidStack emptyFluid = FluidHelper.getFluidStackInContainer(empty);
-			if (emptyFluid != null) {
-				this.input.amount -= emptyFluid.amount;
-			}
-			if (this.input.amount > Constants.BUCKET_VOLUME) {
-				this.input.amount = Constants.BUCKET_VOLUME;
-			}
-		}
 		this.empty = empty;
 		this.filled = filled;
 	}
 
 	public boolean matches(ItemStack emptyCan, FluidStack resource) {
-		if (emptyCan == null || resource == null || !emptyCan.isItemEqual(empty)) {
-			return false;
-		}
-
-		if (empty.getItem() instanceof IFluidContainerItem) {
-			return true;
-		} else {
-			return resource.containsFluid(input);
-		}
-	}
-
-	public static BottlerRecipe getRecipe(FluidStack res, ItemStack empty) {
-		if (res == null || empty == null) {
-			return null;
-		}
-
-		ItemStack filled = FluidHelper.getFilledContainer(res.getFluid(), empty);
-		if (filled == null) {
-			return null;
-		}
-
-		FluidStack input = FluidHelper.getFluidStackInContainer(filled);
-		if (input == null) {
-			return null;
-		}
-
-		return new BottlerRecipe(empty, input, filled);
+		return emptyCan != null && resource != null && emptyCan.isItemEqual(empty) && resource.containsFluid(input);
 	}
 }

src/main/java/forestry/factory/recipes/SqueezerContainerRecipe.java

@@ -13,9 +13,9 @@ package forestry.factory.recipes;
 import net.minecraft.item.ItemStack;
 
 import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidUtil;
 
 import forestry.api.recipes.ISqueezerRecipe;
-import forestry.core.fluids.FluidHelper;
 import forestry.core.utils.ItemStackUtil;
 
 public class SqueezerContainerRecipe implements ISqueezerContainerRecipe {
@@ -57,7 +57,7 @@ public class SqueezerContainerRecipe implements ISqueezerContainerRecipe {
 		if (filledContainer == null) {
 			return null;
 		}
-		FluidStack fluidOutput = FluidHelper.getFluidStackInContainer(filledContainer);
+		FluidStack fluidOutput = FluidUtil.getFluidContained(filledContainer);
 		if (fluidOutput == null) {
 			return null;
 		}

src/main/java/forestry/factory/recipes/SqueezerRecipeManager.java

@@ -48,12 +48,11 @@ public class SqueezerRecipeManager implements ISqueezerManager {
 
 	@Nullable
 	public static ISqueezerContainerRecipe findMatchingContainerRecipe(ItemStack filledContainer) {
-		ItemStack emptyContainer = FluidHelper.getEmptyContainer(filledContainer);
-		if (emptyContainer == null) {
+		if (!FluidHelper.isDrainableFilledContainer(filledContainer)) {
 			return null;
 		}
 
-		return containerRecipes.get(emptyContainer);
+		return containerRecipes.get(new ItemStack(filledContainer.getItem()));
 	}
 
 	public static ISqueezerRecipe findMatchingRecipe(ItemStack[] items) {

src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeHandler.java

@@ -22,6 +22,12 @@ public class BottlerRecipeHandler implements IRecipeHandler<BottlerRecipeWrapper
 		return ForestryRecipeCategoryUid.BOTTLER;
 	}
 
+	@Nonnull
+	@Override
+	public String getRecipeCategoryUid(@Nonnull BottlerRecipeWrapper recipe) {
+		return ForestryRecipeCategoryUid.BOTTLER;
+	}
+
 	@Nonnull
 	@Override
 	public IRecipeWrapper getRecipeWrapper(@Nonnull BottlerRecipeWrapper recipe) {

src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeMaker.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;
+import net.minecraftforge.fluids.FluidStack;
 
 import forestry.factory.recipes.BottlerRecipe;
 
@@ -16,9 +17,12 @@ public class BottlerRecipeMaker {
 	public static List<BottlerRecipeWrapper> getBottlerRecipes() {
 		List<BottlerRecipeWrapper> recipes = new ArrayList<>();
 		for (FluidContainerData container : FluidContainerRegistry.getRegisteredFluidContainerData()) {
-			BottlerRecipe recipe = BottlerRecipe.getRecipe(container.fluid, container.emptyContainer);
-			if (recipe != null) {
-				recipes.add(new BottlerRecipeWrapper(recipe));
+			FluidStack fluid = container.fluid;
+			if (fluid != null) {
+				BottlerRecipe recipe = BottlerRecipe.create(fluid.getFluid(), container.emptyContainer);
+				if (recipe != null) {
+					recipes.add(new BottlerRecipeWrapper(recipe));
+				}
 			}
 		}
 		return recipes;

src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeHandler.java

@@ -22,6 +22,12 @@ public class CarpenterRecipeHandler implements IRecipeHandler<CarpenterRecipeWra
 		return ForestryRecipeCategoryUid.CARPENTER;
 	}
 
+	@Nonnull
+	@Override
+	public String getRecipeCategoryUid(@Nonnull CarpenterRecipeWrapper recipe) {
+		return ForestryRecipeCategoryUid.CARPENTER;
+	}
+
 	@Nonnull
 	@Override
 	public IRecipeWrapper getRecipeWrapper(@Nonnull CarpenterRecipeWrapper recipe) {