Lots of compile fixes

src/main/java/appeng/parts/p2p/PartP2PFEPower.java

@@ -82,27 +82,18 @@ public class PartP2PFEPower extends PartP2PTunnel<PartP2PFEPower>
 		return energyStorageOpt.orElse( NULL_ENERGY_STORAGE );
 	}
 
-	@Override
-	public boolean hasCapability( @Nonnull Capability<?> capability )
-	{
-		if( capability == Capabilities.FORGE_ENERGY )
-		{
-			return true;
-		}
-		return super.hasCapability( capability );
-	}
-
+	@SuppressWarnings("unchecked")
 	@Nullable
 	@Override
-	public <T> T getCapability( @Nonnull Capability<T> capability )
+	public <T> LazyOptional<T> getCapability( @Nonnull Capability<T> capability )
 	{
 		if( capability == Capabilities.FORGE_ENERGY )
 		{
 			if( this.isOutput() )
 			{
-				return (T) this.outputHandler;
+				return (LazyOptional<T>) LazyOptional.of(() -> this.outputHandler);
 			}
-			return (T) this.inputHandler;
+			return (LazyOptional<T>) LazyOptional.of(() ->this.inputHandler);
 		}
 		return super.getCapability( capability );
 	}

src/main/java/appeng/parts/p2p/PartP2PFluids.java

@@ -31,6 +31,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockReader;
 import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
 import net.minecraftforge.fluids.capability.FluidTankProperties;
@@ -91,23 +92,13 @@ public class PartP2PFluids extends PartP2PTunnel<PartP2PFluids> implements IFlui
 		}
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
-	public boolean hasCapability( Capability<?> capabilityClass )
+	public <T> LazyOptional<T> getCapability(Capability<T> capabilityClass )
 	{
 		if( capabilityClass == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY )
 		{
-			return true;
-		}
-
-		return super.hasCapability( capabilityClass );
-	}
-
-	@Override
-	public <T> T getCapability( Capability<T> capabilityClass )
-	{
-		if( capabilityClass == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY )
-		{
-			return (T) this;
+			return (LazyOptional<T>) LazyOptional.of(() ->this);
 		}
 
 		return super.getCapability( capabilityClass );

src/main/java/appeng/parts/p2p/PartP2PItems.java

@@ -28,6 +28,7 @@ import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockReader;
 import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.wrapper.EmptyHandler;
@@ -230,24 +231,13 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IItemHa
 		}
 	}
 
-	@Override
-	public boolean hasCapability( Capability<?> capabilityClass )
-	{
-		if( capabilityClass == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY )
-		{
-			return true;
-		}
-
-		return super.hasCapability( capabilityClass );
-	}
-
 	@SuppressWarnings( "unchecked" )
 	@Override
-	public <T> T getCapability( Capability<T> capabilityClass )
+	public <T> LazyOptional<T> getCapability(Capability<T> capabilityClass )
 	{
 		if( capabilityClass == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY )
 		{
-			return (T) this;
+			return (LazyOptional<T>) LazyOptional.of(() ->this);
 		}
 
 		return super.getCapability( capabilityClass );

src/main/java/appeng/parts/p2p/PartP2PTunnelME.java

@@ -30,7 +30,6 @@ import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Hand;
 
-import appeng.api.AEApi;
 import appeng.api.exceptions.FailedConnectionException;
 import appeng.api.networking.GridFlags;
 import appeng.api.networking.IGridNode;
@@ -114,7 +113,7 @@ public class PartP2PTunnelME extends PartP2PTunnel<PartP2PTunnelME> implements I
 	public void removeFromWorld()
 	{
 		super.removeFromWorld();
-		this.outerProxy.invalidate();
+		this.outerProxy.remove();
 	}
 
 	@Override