Lots of compile fixes

src/main/java/appeng/fluids/container/ContainerFluidConfigurable.java

@@ -6,6 +6,7 @@ import java.util.Collections;
 import java.util.Map;
 
 import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.inventory.container.ContainerType;
 import net.minecraft.inventory.container.IContainerListener;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.LazyOptional;
@@ -26,9 +27,9 @@ public abstract class ContainerFluidConfigurable extends ContainerUpgradeable im
 {
 	private FluidSyncHelper sync = null;
 
-	public ContainerFluidConfigurable( PlayerInventory ip, IUpgradeableHost te )
+	public ContainerFluidConfigurable(ContainerType<?> containerType, int id, PlayerInventory ip, IUpgradeableHost te )
 	{
-		super( ip, te );
+		super( containerType, id, ip, te );
 	}
 
 	public abstract IAEFluidTank getFluidConfigInventory();

src/main/java/appeng/fluids/container/ContainerFluidFormationPlane.java

@@ -3,6 +3,7 @@ package appeng.fluids.container;
 
 
 import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.inventory.container.ContainerType;
 import net.minecraftforge.items.IItemHandler;
 
 import appeng.api.config.SecurityPermissions;
@@ -17,9 +18,9 @@ public class ContainerFluidFormationPlane extends ContainerFluidConfigurable
 {
 	private final PartFluidFormationPlane plane;
 
-	public ContainerFluidFormationPlane( final PlayerInventory ip, final PartFluidFormationPlane te )
+	public ContainerFluidFormationPlane(ContainerType<?> containerType, int id, final PlayerInventory ip, final PartFluidFormationPlane te )
 	{
-		super( ip, te );
+		super( containerType, id,ip, te );
 		this.plane = te;
 	}
 

src/main/java/appeng/fluids/container/ContainerFluidIO.java

@@ -23,6 +23,7 @@ import net.minecraft.entity.player.PlayerInventory;
 
 import appeng.fluids.parts.PartSharedFluidBus;
 import appeng.fluids.util.IAEFluidTank;
+import net.minecraft.inventory.container.ContainerType;
 
 
 /**
@@ -34,9 +35,9 @@ public class ContainerFluidIO extends ContainerFluidConfigurable
 {
 	private final PartSharedFluidBus bus;
 
-	public ContainerFluidIO( PlayerInventory ip, PartSharedFluidBus te )
+	public ContainerFluidIO(ContainerType<?> containerType, int id, PlayerInventory ip, PartSharedFluidBus te )
 	{
-		super( ip, te );
+		super( containerType, id,ip, te );
 		this.bus = te;
 	}
 

src/main/java/appeng/fluids/container/ContainerFluidInterface.java

@@ -23,6 +23,7 @@ import java.util.Collections;
 import java.util.Map;
 
 import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.inventory.container.ContainerType;
 import net.minecraft.inventory.container.IContainerListener;
 
 import appeng.api.config.SecurityPermissions;
@@ -40,9 +41,9 @@ public class ContainerFluidInterface extends ContainerFluidConfigurable
 	private final DualityFluidInterface myDuality;
 	private final FluidSyncHelper tankSync;
 
-	public ContainerFluidInterface( final PlayerInventory ip, final IFluidInterfaceHost te )
+	public ContainerFluidInterface(ContainerType<?> containerType, int id, final PlayerInventory ip, final IFluidInterfaceHost te )
 	{
-		super( ip, te.getDualityFluidInterface().getHost() );
+		super( containerType, id,ip, te.getDualityFluidInterface().getHost() );
 
 		this.myDuality = te.getDualityFluidInterface();
 		this.tankSync = new FluidSyncHelper( this.myDuality.getTanks(), DualityFluidInterface.NUMBER_OF_TANKS );

src/main/java/appeng/fluids/container/ContainerFluidLevelEmitter.java

@@ -4,6 +4,7 @@ package appeng.fluids.container;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.inventory.container.ContainerType;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
@@ -25,9 +26,9 @@ public class ContainerFluidLevelEmitter extends ContainerFluidConfigurable
 	@GuiSync( 3 )
 	public long EmitterValue = -1;
 
-	public ContainerFluidLevelEmitter( final PlayerInventory ip, final PartFluidLevelEmitter te )
+	public ContainerFluidLevelEmitter(ContainerType<?> containerType, int id, final PlayerInventory ip, final PartFluidLevelEmitter te )
 	{
-		super( ip, te );
+		super( containerType, id,ip, te );
 		this.lvlEmitter = te;
 	}
 

src/main/java/appeng/fluids/container/ContainerFluidStorageBus.java

@@ -22,6 +22,7 @@ package appeng.fluids.container;
 import java.util.Iterator;
 
 import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.inventory.container.ContainerType;
 import net.minecraftforge.items.IItemHandler;
 
 import appeng.api.config.AccessRestriction;
@@ -59,9 +60,9 @@ public class ContainerFluidStorageBus extends ContainerFluidConfigurable
 	@GuiSync( 4 )
 	public StorageFilter storageFilter = StorageFilter.EXTRACTABLE_ONLY;
 
-	public ContainerFluidStorageBus( PlayerInventory ip, PartFluidStorageBus te )
+	public ContainerFluidStorageBus(ContainerType<?> containerType, int id, PlayerInventory ip, PartFluidStorageBus te )
 	{
-		super( ip, te );
+		super( containerType, id,ip, te );
 		this.storageBus = te;
 	}
 

src/main/java/appeng/fluids/container/ContainerFluidTerminal.java

@@ -26,6 +26,7 @@ import javax.annotation.Nonnull;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.entity.player.ServerPlayerEntity;
+import net.minecraft.inventory.container.ContainerType;
 import net.minecraft.inventory.container.IContainerListener;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.LazyOptional;
@@ -92,9 +93,8 @@ public class ContainerFluidTerminal extends AEBaseContainer implements IConfigMa
 	// Holds the fluid the client wishes to extract, or null for insert
 	private IAEFluidStack clientRequestedTargetFluid = null;
 
-	public ContainerFluidTerminal( PlayerInventory ip, ITerminalHost terminal )
-	{
-		super( ip, terminal );
+	public ContainerFluidTerminal(ContainerType<?> containerType, int id, PlayerInventory ip, ITerminalHost terminal) {
+		super(containerType, id, ip, terminal);
 		this.terminal = terminal;
 		this.clientCM = new ConfigManager( this );