P2P Tunnel improvements (#3039)

* Fix P2P Tunnels randomly resetting to ME
* Allow one way push and pull. Outputs can pull from the input side, input can push into outputs.

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

@@ -26,8 +26,6 @@ import javax.annotation.Nullable;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.energy.IEnergyStorage;
 
@@ -38,17 +36,12 @@ import appeng.items.parts.PartModels;
 import appeng.me.GridAccessException;
 
 
-/**
+public class PartP2PFEPower extends PartP2PTunnel<PartP2PFEPower>
- * @author GuntherDW
- */
-public class PartP2PFEPower extends PartP2PTunnel<PartP2PFEPower> implements IEnergyStorage
 {
 	private static final P2PModels MODELS = new P2PModels( "part/p2p/p2p_tunnel_fe" );
 	private static final IEnergyStorage NULL_ENERGY_STORAGE = new NullEnergyStorage();
-
+	private final IEnergyStorage inputHandler = new InputEnergyStorage();
-	private boolean cachedTarget = false;
+	private final IEnergyStorage outputHandler = new OutputEnergyStorage();
-
-	private IEnergyStorage outputTarget;
 
 	public PartP2PFEPower( ItemStack is )
 	{
@@ -73,29 +66,62 @@ public class PartP2PFEPower extends PartP2PTunnel<PartP2PFEPower> implements IEn
 		this.getHost().notifyNeighbors();
 	}
 
-	@Override
+	private IEnergyStorage getAttachedEnergyStorage()
-	public void onNeighborChanged( IBlockAccess w, BlockPos pos, BlockPos neighbor )
 	{
-		super.onNeighborChanged( w, pos, neighbor );
+		if( this.isActive() )
+		{
+			final TileEntity self = this.getTile();
+			final TileEntity te = self.getWorld().getTileEntity( self.getPos().offset( this.getSide().getFacing() ) );
 
-		this.cachedTarget = false;
+			if( te != null && te.hasCapability( Capabilities.FORGE_ENERGY, this.getSide().getOpposite().getFacing() ) )
+			{
+				return te.getCapability( Capabilities.FORGE_ENERGY, this.getSide().getOpposite().getFacing() );
+			}
+		}
+		return NULL_ENERGY_STORAGE;
+	}
+
+	@Override
+	public boolean hasCapability( @Nonnull Capability<?> capability )
+	{
+		if( capability == Capabilities.FORGE_ENERGY )
+		{
+			return true;
+		}
+		return super.hasCapability( capability );
+	}
+
+	@Nullable
+	@Override
+	public <T> T getCapability( @Nonnull Capability<T> capability )
+	{
+		if( capability == Capabilities.FORGE_ENERGY )
+		{
+			if( this.isOutput() )
+			{
+				return (T) this.outputHandler;
+			}
+			return (T) this.inputHandler;
+		}
+		return super.getCapability( capability );
+	}
+
+	private class InputEnergyStorage implements IEnergyStorage
+	{
+		@Override
+		public int extractEnergy( int maxExtract, boolean simulate )
+		{
+			return 0;
 		}
 
 		@Override
 		public int receiveEnergy( int maxReceive, boolean simulate )
-	{
-		if( this.isOutput() )
-		{
-			return 0;
-		}
-
-		if( this.isActive() )
 		{
 			int total = 0;
 
 			try
 			{
-				final int outputTunnels = this.getOutputs().size();
+				final int outputTunnels = PartP2PFEPower.this.getOutputs().size();
 
 				if( outputTunnels == 0 )
 				{
@@ -105,9 +131,9 @@ public class PartP2PFEPower extends PartP2PTunnel<PartP2PFEPower> implements IEn
 				final int amountPerOutput = maxReceive / outputTunnels;
 				int overflow = maxReceive % amountPerOutput;
 
-				for( PartP2PFEPower target : this.getOutputs() )
+				for( PartP2PFEPower target : PartP2PFEPower.this.getOutputs() )
 				{
-					final IEnergyStorage output = target.getOutput();
+					final IEnergyStorage output = target.getAttachedEnergyStorage();
 					final int toSend = amountPerOutput + overflow;
 					final int received = output.receiveEnergy( toSend, simulate );
 
@@ -115,7 +141,7 @@ public class PartP2PFEPower extends PartP2PTunnel<PartP2PFEPower> implements IEn
 					total += received;
 				}
 
-				this.queueTunnelDrain( PowerUnits.RF, total );
+				PartP2PFEPower.this.queueTunnelDrain( PowerUnits.RF, total );
 			}
 			catch( GridAccessException ignored )
 			{
@@ -124,96 +150,6 @@ public class PartP2PFEPower extends PartP2PTunnel<PartP2PFEPower> implements IEn
 			return total;
 		}
 
-		return 0;
-	}
-
-	@Override
-	public int extractEnergy( int maxExtract, boolean simulate )
-	{
-		return 0;
-	}
-
-	private IEnergyStorage getOutput()
-	{
-		if( this.isOutput() )
-		{
-			if( !this.cachedTarget )
-			{
-				final TileEntity self = this.getTile();
-				final TileEntity te = self.getWorld().getTileEntity( new BlockPos( self.getPos().getX() + this.getSide().xOffset, self.getPos()
-						.getY() + this.getSide().yOffset, self.getPos().getZ() + this.getSide().zOffset ) );
-
-				if( te != null && te.hasCapability( Capabilities.FORGE_ENERGY, this.getSide().getOpposite().getFacing() ) )
-				{
-					this.outputTarget = te.getCapability( Capabilities.FORGE_ENERGY, this.getSide().getOpposite().getFacing() );
-				}
-				else
-				{
-					this.outputTarget = null;
-				}
-
-				this.cachedTarget = true;
-			}
-
-			if( this.outputTarget != null && this.outputTarget.canReceive() )
-			{
-				return this.outputTarget;
-			}
-		}
-
-		return NULL_ENERGY_STORAGE;
-	}
-
-	@Override
-	public int getEnergyStored()
-	{
-		if( this.isOutput() || !this.isActive() )
-		{
-			return 0;
-		}
-
-		int total = 0;
-
-		try
-		{
-			for( PartP2PFEPower t : this.getOutputs() )
-			{
-				total += t.getOutput().getEnergyStored();
-			}
-		}
-		catch( GridAccessException e )
-		{
-			return 0;
-		}
-
-		return total;
-	}
-
-	@Override
-	public int getMaxEnergyStored()
-	{
-		if( this.isOutput() || !this.isActive() )
-		{
-			return 0;
-		}
-
-		int total = 0;
-
-		try
-		{
-			for( PartP2PFEPower t : this.getOutputs() )
-			{
-				total += t.getOutput().getMaxEnergyStored();
-			}
-		}
-		catch( GridAccessException e )
-		{
-			return 0;
-		}
-
-		return total;
-	}
-
 		@Override
 		public boolean canExtract()
 		{
@@ -227,26 +163,83 @@ public class PartP2PFEPower extends PartP2PTunnel<PartP2PFEPower> implements IEn
 		}
 
 		@Override
-	public boolean hasCapability( @Nonnull Capability<?> capability )
+		public int getMaxEnergyStored()
 		{
-		if( capability == Capabilities.FORGE_ENERGY )
+			int total = 0;
+
+			try
 			{
-			return true;
+				for( PartP2PFEPower t : PartP2PFEPower.this.getOutputs() )
+				{
+					total += t.getAttachedEnergyStorage().getMaxEnergyStored();
+				}
+			}
+			catch( GridAccessException e )
+			{
+				return 0;
 			}
 
-		return super.hasCapability( capability );
+			return total;
 		}
 
-	@Nullable
 		@Override
-	public <T> T getCapability( @Nonnull Capability<T> capability )
+		public int getEnergyStored()
 		{
-		if( capability == Capabilities.FORGE_ENERGY )
+			int total = 0;
+
+			try
 			{
-			return (T) this;
+				for( PartP2PFEPower t : PartP2PFEPower.this.getOutputs() )
+				{
+					total += t.getAttachedEnergyStorage().getEnergyStored();
+				}
+			}
+			catch( GridAccessException e )
+			{
+				return 0;
 			}
 
-		return super.getCapability( capability );
+			return total;
+		}
+	}
+
+	private class OutputEnergyStorage implements IEnergyStorage
+	{
+		@Override
+		public int extractEnergy( int maxExtract, boolean simulate )
+		{
+			return PartP2PFEPower.this.getAttachedEnergyStorage().extractEnergy( maxExtract, simulate );
+		}
+
+		@Override
+		public int receiveEnergy( int maxReceive, boolean simulate )
+		{
+			return 0;
+		}
+
+		@Override
+		public boolean canExtract()
+		{
+			return PartP2PFEPower.this.getAttachedEnergyStorage().canExtract();
+		}
+
+		@Override
+		public boolean canReceive()
+		{
+			return false;
+		}
+
+		@Override
+		public int getMaxEnergyStored()
+		{
+			return PartP2PFEPower.this.getAttachedEnergyStorage().getMaxEnergyStored();
+		}
+
+		@Override
+		public int getEnergyStored()
+		{
+			return PartP2PFEPower.this.getAttachedEnergyStorage().getEnergyStored();
+		}
 	}
 
 	private static class NullEnergyStorage implements IEnergyStorage
@@ -285,7 +278,7 @@ public class PartP2PFEPower extends PartP2PTunnel<PartP2PFEPower> implements IEn
 		@Override
 		public boolean canReceive()
 		{
-			return true;
+			return false;
 		}
 
 	}

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

@@ -160,6 +160,11 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 	@Override
 	public boolean onPartActivate( final EntityPlayer player, final EnumHand hand, final Vec3d pos )
 	{
+		if ( hand == EnumHand.OFF_HAND )
+		{
+			return false;
+		}
+		
 		final ItemStack is = player.getHeldItem( hand );
 
 		// UniqueIdentifier id = GameRegistry.findUniqueIdentifierFor( is.getItem() );