Merge pull request #281 from thatsIch/controlflow

Simplified some control flow statements

src/main/java/appeng/tile/AEBaseInvTile.java

@@ -92,7 +92,7 @@ public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventor
 	@Override
 	public boolean isUseableByPlayer(EntityPlayer p)
 	{
-		return this.worldObj.getTileEntity( this.xCoord, this.yCoord, this.zCoord ) != this ? false : p.getDistanceSq( this.xCoord + 0.5D,
+		return this.worldObj.getTileEntity( this.xCoord, this.yCoord, this.zCoord ) == this && p.getDistanceSq( this.xCoord + 0.5D,
 				this.yCoord + 0.5D, this.zCoord + 0.5D ) <= 32.0D;
 	}
 

src/main/java/appeng/tile/misc/TileCellWorkbench.java

@@ -118,7 +118,7 @@ public class TileCellWorkbench extends AEBaseTile implements IUpgradeableHost, I
 	@Override
 	public void onChangeInventory(IInventory inv, int slot, InvOperation mc, ItemStack removedStack, ItemStack newStack)
 	{
-		if ( inv == cell && locked == false )
+		if ( inv == cell && !locked )
 		{
 			locked = true;
 
@@ -161,7 +161,7 @@ public class TileCellWorkbench extends AEBaseTile implements IUpgradeableHost, I
 
 			locked = false;
 		}
-		else if ( inv == config && locked == false )
+		else if ( inv == config && !locked )
 		{
 			IInventory c = getCellConfigInventory();
 			if ( c != null )

src/main/java/appeng/tile/misc/TileInscriber.java

@@ -317,7 +317,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
 			return true;
 
 		processingTime = 0;
-		return false || smash;
+		return smash;
 	}
 
 	@Override

src/main/java/appeng/tile/powersink/IC2.java

@@ -22,7 +22,7 @@ public abstract class IC2 extends MinecraftJoules6 implements IEnergySink
 	@Override
 	final public boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction)
 	{
-		return internalCanAcceptPower && getPowerSides().contains( direction );
+		return getPowerSides().contains( direction );
 	}
 
 	@Override

src/main/java/appeng/tile/powersink/MinecraftJoules5.java

@@ -57,7 +57,7 @@ public abstract class MinecraftJoules5 extends AERootPoweredTile implements IPow
 	@Method(iname = "MJ5")
 	final public PowerReceiver getPowerReceiver(ForgeDirection side)
 	{
-		if ( internalCanAcceptPower && getPowerSides().contains( side ) && bcPowerWrapper != null )
+		if ( getPowerSides().contains( side ) && bcPowerWrapper != null )
 			return bcPowerWrapper.getPowerReceiver();
 		return null;
 	}

src/main/java/appeng/tile/powersink/RedstoneFlux.java

@@ -48,7 +48,7 @@ public abstract class RedstoneFlux extends RotaryCraft implements IEnergyHandler
 	@Override
 	final public boolean canConnectEnergy(ForgeDirection from)
 	{
-		return internalCanAcceptPower && getPowerSides().contains( from );
+		return getPowerSides().contains( from );
 	}
 
 	@Override

src/main/java/appeng/tile/powersink/RotaryCraft.java

@@ -119,7 +119,7 @@ public abstract class RotaryCraft extends IC2 implements ShaftPowerReceiver
 		else if ( y == yCoord + 1 )
 			side = ForgeDirection.UP;
 
-		return internalCanAcceptPower && getPowerSides().contains( side );
+		return getPowerSides().contains( side );
 	}
 
 	@Override
@@ -139,7 +139,7 @@ public abstract class RotaryCraft extends IC2 implements ShaftPowerReceiver
 	@Override
 	final public boolean canReadFrom(ForgeDirection side)
 	{
-		return internalCanAcceptPower && getPowerSides().contains( side );
+		return getPowerSides().contains( side );
 	}
 
 	@Override

src/main/java/appeng/tile/spatial/TileSpatialIOPort.java

@@ -141,7 +141,7 @@ public class TileSpatialIOPort extends AENetworkInvTile implements Callable
 	@Override
 	public boolean isItemValidForSlot(int i, ItemStack itemstack)
 	{
-		return (i == 0 ? isSpatialCell( itemstack ) : false);
+		return (i == 0 && isSpatialCell( itemstack ));
 	}
 
 	private boolean isSpatialCell(ItemStack cell)