dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make detector work again

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-01-02 18:41:32 +01:00
parent 5bffb80190
commit 56b9adb0a2
5 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/storagecraft/block/BlockDetector.java
View File

@@ -47,14 +47,23 @@ public class BlockDetector extends BlockMachine
return new TileDetector();
}
public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side)
@Override
public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side)
{
return ((TileDetector) world.getTileEntity(pos)).isPowered() ? 15 : 0;
TileDetector detector = (TileDetector) world.getTileEntity(pos);
if (detector.getDirection() == side.getOpposite())
{
return detector.isPowered() ? 15 : 0;
}
return 0;
}
public int isProvidingStrongPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side)
@Override
public int getStrongPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side)
{
return ((TileDetector) world.getTileEntity(pos)).isPowered() ? 15 : 0;
return getWeakPower(world, pos, state, side);
}
public boolean canProvidePower()

10
src/main/java/storagecraft/tile/TileDetector.java
View File

@@ -36,6 +36,14 @@ public class TileDetector extends TileMachine implements IInventory, ISidedInven
this.redstoneControlled = false;
}
@Override
public void onDisconnected()
{
super.onDisconnected();
powered = false;
}
@Override
public int getEnergyUsage()
{
@@ -101,7 +109,6 @@ public class TileDetector extends TileMachine implements IInventory, ISidedInven
if (powered != lastPowered)
{
worldObj.markBlockForUpdate(pos);
worldObj.notifyNeighborsOfStateChange(pos, StorageCraftBlocks.DETECTOR);
}
}
@@ -199,7 +206,6 @@ public class TileDetector extends TileMachine implements IInventory, ISidedInven
if (powered != lastPowered)
{
worldObj.markBlockForUpdate(pos);
worldObj.notifyNeighborsOfStateChange(pos, StorageCraftBlocks.DETECTOR);
}
}