tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Fixes an issue with detecting straight cable connections.

Browse source
This commit is contained in:
Sebastian Hartte 2016-08-27 00:31:02 +02:00
parent b42300a4da
commit 686832ebf8
1 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/main/java/appeng/parts/networking/PartCable.java
View file

@ -22,6 +22,7 @@ package appeng.parts.networking;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.Iterator;
import java.util.List; import java.util.List;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
@ -440,27 +441,39 @@ public class PartCable extends AEBasePart implements IPartCable
return elements; return elements;
} }
/**
* A cable connection is considered straight, if there are exactly two connection points on opposite sides,
* and the cable has no attached busses.
*/
protected boolean isStraight( IPartHost host, final EnumSet<AEPartLocation> sides ) protected boolean isStraight( IPartHost host, final EnumSet<AEPartLocation> sides )
{ {
boolean b = false; if (sides.size() != 2) {
return false;
}
Iterator<AEPartLocation> it = sides.iterator();
EnumFacing firstSide = it.next().getFacing();
EnumFacing secondSide = it.next().getFacing();
// Not on opposite sides
if (firstSide.getOpposite() != secondSide) {
return false;
}
// Check any other point for attachments
for( EnumFacing facing : EnumFacing.values() ) for( EnumFacing facing : EnumFacing.values() )
{ {
b |= host.getPart( facing ) != null; if( facing != firstSide && facing != secondSide )
}
if( !b && sides.size() == 2 )
{
AEPartLocation[] sa = sides.toArray( new AEPartLocation[0] );
if( sa[0] == sa[1].getOpposite() )
{ {
for( AEPartLocation side : sides ) // Check for an attached part here
if( host.getPart( facing ) != null )
{ {
TileEntity to = host.getTile().getWorld().getTileEntity( host.getTile().getPos().offset( side.getFacing() ) ); return false;
b |= to instanceof IPartHost && ( (IPartHost) to ).getPart( AEPartLocation.INTERNAL ) instanceof IPartCable && ( (IPartCable) ( (IPartHost) to ).getPart( AEPartLocation.INTERNAL ) ).getCableConnectionType() == getCableConnectionType();
} }
return !b;
} }
} }
return false;
return true;
} }
int getChannelsOnSide( final int i ) int getChannelsOnSide( final int i )