mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-09-29 23:40:46 +00:00
Code Issues Releases Wiki Activity

Remove redstone blocked checks

Browse Source 
This has been returning false for almost 2 years (since
8abff95441). At this point, it's probably
worth just dropping it entirely.
This commit is contained in:
SquidDev 2019-04-22 11:40:19 +01:00
parent 2e0ef6385d
commit 6898f932a0
2 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/dan200/computercraft/shared/computer/blocks/TileComputerBase.java
View File

@ -124,16 +124,14 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT
@Override @Override
public boolean getRedstoneConnectivity( EnumFacing side ) public boolean getRedstoneConnectivity( EnumFacing side )
{ {
if( side == null ) return false; return true;
ComputerSide localDir = remapLocalSide( DirectionUtil.toLocal( this, side.getOpposite() ) );
return !isRedstoneBlockedOnSide( localDir );
} }
@Override @Override
public int getRedstoneOutput( EnumFacing side ) public int getRedstoneOutput( EnumFacing side )
{ {
ComputerSide localDir = remapLocalSide( DirectionUtil.toLocal( this, side ) ); ComputerSide localDir = remapLocalSide( DirectionUtil.toLocal( this, side ) );
if( !isRedstoneBlockedOnSide( localDir ) && world != null && !world.isRemote ) if( world != null && !world.isRemote )
{ {
ServerComputer computer = getServerComputer(); ServerComputer computer = getServerComputer();
if( computer != null ) return computer.getRedstoneOutput( localDir ); if( computer != null ) return computer.getRedstoneOutput( localDir );
@ -144,15 +142,14 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT
@Override @Override
public boolean getBundledRedstoneConnectivity( @Nonnull EnumFacing side ) public boolean getBundledRedstoneConnectivity( @Nonnull EnumFacing side )
{ {
ComputerSide localDir = remapLocalSide( DirectionUtil.toLocal( this, side ) ); return true;
return !isRedstoneBlockedOnSide( localDir );
} }
@Override @Override
public int getBundledRedstoneOutput( @Nonnull EnumFacing side ) public int getBundledRedstoneOutput( @Nonnull EnumFacing side )
{ {
ComputerSide localDir = remapLocalSide( DirectionUtil.toLocal( this, side ) ); ComputerSide localDir = remapLocalSide( DirectionUtil.toLocal( this, side ) );
if( !isRedstoneBlockedOnSide( localDir ) && !world.isRemote ) if( !world.isRemote )
{ {
ServerComputer computer = getServerComputer(); ServerComputer computer = getServerComputer();
if( computer != null ) return computer.getBundledRedstoneOutput( localDir ); if( computer != null ) return computer.getBundledRedstoneOutput( localDir );
@ -259,11 +256,6 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT
return false; return false;
} }
protected boolean isRedstoneBlockedOnSide( ComputerSide localSide )
{
return false;
}
protected ComputerSide remapLocalSide( ComputerSide localSide ) protected ComputerSide remapLocalSide( ComputerSide localSide )
{ {
return localSide; return localSide;
@ -273,11 +265,10 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT
{ {
EnumFacing offsetSide = dir.getOpposite(); EnumFacing offsetSide = dir.getOpposite();
ComputerSide localDir = remapLocalSide( DirectionUtil.toLocal( this, dir ) ); ComputerSide localDir = remapLocalSide( DirectionUtil.toLocal( this, dir ) );
if( !isRedstoneBlockedOnSide( localDir ) )
{ computer.setRedstoneInput( localDir, getWorld().getRedstonePower( offset, dir ) );
computer.setRedstoneInput( localDir, getWorld().getRedstonePower( offset, dir ) ); computer.setBundledRedstoneInput( localDir, BundledRedstone.getOutput( getWorld(), offset, offsetSide ) );
computer.setBundledRedstoneInput( localDir, BundledRedstone.getOutput( getWorld(), offset, offsetSide ) );
}
if( !isPeripheralBlockedOnSide( localDir ) ) if( !isPeripheralBlockedOnSide( localDir ) )
{ {
computer.setPeripheral( localDir, Peripherals.getPeripheral( getWorld(), offset, offsetSide ) ); computer.setPeripheral( localDir, Peripherals.getPeripheral( getWorld(), offset, offsetSide ) );

6
src/main/java/dan200/computercraft/shared/turtle/blocks/TileTurtle.java
View File

@ -317,12 +317,6 @@ public class TileTurtle extends TileComputerBase implements ITurtleTile, Default
return hasPeripheralUpgradeOnSide( localSide ); return hasPeripheralUpgradeOnSide( localSide );
} }
@Override
protected boolean isRedstoneBlockedOnSide( ComputerSide localSide )
{
return false;
}
// IDirectionalTile // IDirectionalTile
@Override @Override