mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Merge branch 'development' into v8
This commit is contained in:
commit
5dc0e5dca1
6 files changed
+64
-6
No files matched your search
@@ -109,14 +109,26 @@ public final class CableUtils
|
||||
{
|
||||
TileEntity tile = coord.getFromSide(side).getTileEntity(tileEntity.getWorldObj());
|
||||
|
||||
connectable[side.ordinal()] |= isEnergyAcceptor(tile) && isConnectable(tileEntity, tile, side);
|
||||
connectable[side.ordinal()] = isValidAcceptorOnSide(tileEntity, tile, side);
|
||||
connectable[side.ordinal()] |= isCable(tile);
|
||||
connectable[side.ordinal()] |= isOutputter(tile, side);
|
||||
}
|
||||
|
||||
return connectable;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the adjacent connections to a TileEntity, from a subset of its sides.
|
||||
* @param cableEntity - TileEntity that's trying to connect
|
||||
* @param side - side to check
|
||||
* @return boolean whether the acceptor is valid
|
||||
*/
|
||||
public static boolean isValidAcceptorOnSide(TileEntity cableEntity, TileEntity tile, ForgeDirection side)
|
||||
{
|
||||
if(isEnergyAcceptor(tile) && isConnectable(cableEntity, tile, side))
|
||||
return true;
|
||||
return isOutputter(tile, side);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets all the connected cables around a specific tile entity.
|
||||
* @param tileEntity - center tile entity
|
||||
|
||||
Reference in new issue
Block a user