Merge pull request #281 from thatsIch/controlflow

Simplified some control flow statements
This commit is contained in:
Chris
2014-10-09 13:22:55 -07:00
33 changed files with 64 additions and 78 deletions
@@ -219,7 +219,7 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU
for (TileCraftingTile r : tiles)
{
IGridNode n = r.getActionableNode();
if ( n != null && posted == false )
if ( n != null && !posted )
{
IGrid g = n.getGrid();
if ( g != null )
@@ -559,7 +559,7 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU
usedOps[1] = usedOps[0];
usedOps[0] = started - remainingOperations;
if ( remainingOperations > 0 && somethingChanged == false )
if ( remainingOperations > 0 && !somethingChanged )
waiting = true;
}
@@ -175,7 +175,7 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>
CachedItemStack old = memory.get( is.slot );
high = Math.max( high, is.slot );
ItemStack newIS = is.isExtractable == false && mode == StorageFilter.EXTRACTABLE_ONLY ? null : is.getItemStack();
ItemStack newIS = !is.isExtractable && mode == StorageFilter.EXTRACTABLE_ONLY ? null : is.getItemStack();
ItemStack oldIS = old == null ? null : old.itemStack;
if ( isDifferent( newIS, oldIS ) )