tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Fixed detector emitting from front

Browse source 
This causes belts to stop.
This commit is contained in:
Henry Mao 2013-02-15 16:10:41 +08:00
parent d3b8e7ab62
commit cad749fa5c
2 changed files with 5 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/minecraft/assemblyline/common/machine/detector/BlockDetector.java
View file

@ -139,26 +139,15 @@ public class BlockDetector extends BlockImprintable
return false;
}
/*
* @Override public boolean renderAsNormalBlock() { return false; }
*
* @SideOnly(Side.CLIENT)
*
* @Override public int getRenderType() { return BlockRenderingHandler.BLOCK_RENDER_ID; }
*/
@Override
public boolean isProvidingStrongPower(IBlockAccess world, int x, int y, int z, int direction)
{
TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
if (tileEntity != null)
{
if (tileEntity instanceof TileEntityDetector)
{
return ((TileEntityDetector) tileEntity).isPoweringTo(ForgeDirection.getOrientation(direction));
}
}
if (tileEntity instanceof TileEntityDetector)
{
return ((TileEntityDetector) tileEntity).isPoweringTo(ForgeDirection.getOrientation(direction));
}
return false;
}
@ -166,16 +155,6 @@ public class BlockDetector extends BlockImprintable
public boolean isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int direction)
{
return isProvidingStrongPower(world, x, y, z, direction);
/*
* if (direction != ForgeDirection.DOWN.ordinal() && direction !=
* ForgeDirection.UP.ordinal()) { TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
*
* if (tileEntity != null) { if (tileEntity instanceof TileEntityDetector) { return
* ((TileEntityDetector) tileEntity).isPoweringTo(ForgeDirection.getOrientation(direction));
* } } }
*
* return false;
*/
}
@Override

2
src/minecraft/assemblyline/common/machine/detector/TileEntityDetector.java
View file

@ -97,7 +97,7 @@ public class TileEntityDetector extends TileEntityFilterable
public boolean isPoweringTo(ForgeDirection side)
{
return this.powering;
return this.powering && this.getDirection() != side.getOpposite();
}
public boolean isIndirectlyPoweringTo(ForgeDirection side)