Some additional fixes from other branch.

src/main/java/appeng/fluids/client/gui/GuiFluidLevelEmitter.java

@@ -52,7 +52,7 @@ public class GuiFluidLevelEmitter extends GuiUpgradeable
 		this.level.setMaxStringLength( 16 );
 		this.level.setTextColor( 0xFFFFFF );
 		this.level.setVisible( true );
-		this.level.setFocused( true );
+		this.level.changeFocus( true );
 		( (ContainerFluidLevelEmitter) this.inventorySlots ).setTextField( this.level );
 
 		final int y = 40;

src/main/java/appeng/fluids/client/gui/widgets/GuiFluidSlot.java

@@ -10,7 +10,7 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
+import net.minecraft.fluid.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidUtil;
 import net.minecraftforge.fluids.capability.CapabilityFluidHandler;

src/main/java/appeng/fluids/helper/DualityFluidInterface.java

@@ -25,7 +25,7 @@ import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Direction;
 import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.fluids.Fluid;
+import net.minecraft.fluid.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
 import net.minecraftforge.items.IItemHandler;

src/main/java/appeng/fluids/helper/FluidCellConfig.java

@@ -22,7 +22,7 @@ package appeng.fluids.helper;
 import javax.annotation.Nonnull;
 
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
+import net.minecraft.fluid.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidUtil;
 

src/main/java/appeng/fluids/items/FluidDummyItem.java

@@ -23,7 +23,7 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.util.NonNullList;
-import net.minecraftforge.fluids.Fluid;
+import net.minecraft.fluid.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -53,7 +53,7 @@ public class FluidDummyItem extends AEBaseItem
 
 	public FluidStack getFluidStack( ItemStack is )
 	{
-		if( is.hasTagCompound() )
+		if( is.hasTag() )
 		{
 			CompoundNBT tag = is.getTagCompound();
 			return FluidStack.loadFluidStackFromNBT( tag );

src/main/java/appeng/fluids/parts/PartFluidFormationPlane.java

@@ -17,7 +17,7 @@ import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
-import net.minecraftforge.fluids.Fluid;
+import net.minecraft.fluid.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTank;
 import net.minecraftforge.fluids.FluidUtil;

src/main/java/appeng/fluids/parts/PartFluidLevelEmitter.java

@@ -368,9 +368,9 @@ public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatc
 	public void writeToNBT( final CompoundNBT data )
 	{
 		super.writeToNBT( data );
-		data.setLong( "lastReportedValue", this.lastReportedValue );
-		data.setLong( "reportingValue", this.reportingValue );
-		data.setBoolean( "prevState", this.prevState );
+		data.putLong( "lastReportedValue", this.lastReportedValue );
+		data.putLong( "reportingValue", this.reportingValue );
+		data.putBoolean("prevState", this.prevState);
 		this.config.writeToNBT( data, "config" );
 	}