From 0042176f295a4b97366e45f3c2aed389efd8e34b Mon Sep 17 00:00:00 2001
From: Andrew <gamefreak1974@hotmail.com>
Date: Sun, 28 Sep 2014 10:41:51 -0700
Subject: [PATCH] Deleted redundant null checks

---
 gradlew                                             |  0
 src/main/java/appeng/client/gui/AEBaseMEGui.java    |  2 +-
 src/main/java/appeng/container/AEBaseContainer.java | 10 +++++-----
 .../implementations/ContainerPatternTerm.java       | 13 +++++--------
 .../appeng/container/slot/SlotCraftingTerm.java     |  2 +-
 .../appeng/container/slot/SlotRestrictedInput.java  |  2 +-
 src/main/java/appeng/helpers/DualityInterface.java  |  2 +-
 .../java/appeng/helpers/MultiCraftingTracker.java   |  2 --
 .../modules/NEIHelpers/NEIGrinderRecipeHandler.java |  9 +++------
 .../NEIHelpers/NEIInscriberRecipeHandler.java       |  9 +++------
 .../cluster/implementations/CraftingCPUCluster.java |  2 +-
 .../java/appeng/me/storage/MEMonitorIInventory.java |  6 +++---
 src/main/java/appeng/parts/CableBusContainer.java   |  7 +++----
 src/main/java/appeng/parts/PartPlacement.java       |  2 +-
 .../parts/automation/PartAnnihilationPlane.java     |  2 +-
 .../appeng/parts/layers/LayerISidedInventory.java   |  2 --
 .../tile/crafting/TileCraftingMonitorTile.java      |  2 +-
 src/main/java/appeng/tile/storage/TileChest.java    |  4 ++--
 18 files changed, 32 insertions(+), 46 deletions(-)
 mode change 100644 => 100755 gradlew

diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
diff --git a/src/main/java/appeng/client/gui/AEBaseMEGui.java b/src/main/java/appeng/client/gui/AEBaseMEGui.java
index 4dadf8ef309..6cc143ef4ab 100644
--- a/src/main/java/appeng/client/gui/AEBaseMEGui.java
+++ b/src/main/java/appeng/client/gui/AEBaseMEGui.java
@@ -88,7 +88,7 @@ protected void renderToolTip(ItemStack stack, int x, int y)
 
 				drawTooltip( x, y, 0, join( currentToolTip, "\n" ) );
 			}
-			else if ( stack != null && stack.stackSize > BigNumber )
+			else if ( stack.stackSize > BigNumber )
 			{
 				List var4 = stack.getTooltip( this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips );
 				var4.add( "Items Stored: " + NumberFormat.getNumberInstance( Locale.US ).format( stack.stackSize ) );
diff --git a/src/main/java/appeng/container/AEBaseContainer.java b/src/main/java/appeng/container/AEBaseContainer.java
index f6e9821506b..d1cd64e6f63 100644
--- a/src/main/java/appeng/container/AEBaseContainer.java
+++ b/src/main/java/appeng/container/AEBaseContainer.java
@@ -404,7 +404,7 @@ public ItemStack transferStackInSlot(EntityPlayer p, int idx)
 								return null;
 							else if ( dest == null )
 							{
-								cs.putStack( tis != null ? tis.copy() : null );
+								cs.putStack( tis.copy() );
 								cs.onSlotChanged();
 								updateSlot( cs );
 								return null;
@@ -422,13 +422,13 @@ else if ( dest == null )
 					if ( d instanceof SlotDisabled || d instanceof SlotME )
 						continue;
 
-					if ( d.isItemValid( tis ) && tis != null )
+					if ( d.isItemValid( tis ) )
 					{
 						if ( d.getHasStack() )
 						{
 							ItemStack t = d.getStack();
 
-							if ( tis != null && Platform.isSameItemPrecise( tis, t ) ) // t.isItemEqual(tis))
+							if ( Platform.isSameItemPrecise( tis, t ) ) // t.isItemEqual(tis))
 							{
 								int maxSize = t.getMaxStackSize();
 								if ( maxSize > d.getSlotStackLimit() )
@@ -468,13 +468,13 @@ else if ( dest == null )
 					if ( d instanceof SlotDisabled || d instanceof SlotME )
 						continue;
 
-					if ( d.isItemValid( tis ) && tis != null )
+					if ( d.isItemValid( tis ) )
 					{
 						if ( d.getHasStack() )
 						{
 							ItemStack t = d.getStack();
 
-							if ( tis != null && Platform.isSameItemPrecise( t, tis ) )
+							if ( Platform.isSameItemPrecise( t, tis ) )
 							{
 								int maxSize = t.getMaxStackSize();
 								if ( d.getSlotStackLimit() < maxSize )
diff --git a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java
index 2c8842f5c39..8e95e82c349 100644
--- a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java
+++ b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java
@@ -346,16 +346,13 @@ public void craftOrGetItem(PacketPatternSlot packetPatternSlot)
 
 			ItemStack is = r.getCraftingResult( ic );
 
-			if ( r != null && inv != null )
+			for (int x = 0; x < ic.getSizeInventory(); x++)
 			{
-				for (int x = 0; x < ic.getSizeInventory(); x++)
+				if ( ic.getStackInSlot( x ) != null )
 				{
-					if ( ic.getStackInSlot( x ) != null )
-					{
-						ItemStack pulled = Platform.extractItemsByRecipe( powerSrc, mySrc, storage, p.worldObj, r, is, ic, ic.getStackInSlot( x ), x, all,
-								Actionable.MODULATE, ItemViewCell.createFilter( getViewCells() ) );
-						real.setInventorySlotContents( x, pulled );
-					}
+					ItemStack pulled = Platform.extractItemsByRecipe( powerSrc, mySrc, storage, p.worldObj, r, is, ic, ic.getStackInSlot( x ), x, all,
+							Actionable.MODULATE, ItemViewCell.createFilter( getViewCells() ) );
+					real.setInventorySlotContents( x, pulled );
 				}
 			}
 
diff --git a/src/main/java/appeng/container/slot/SlotCraftingTerm.java b/src/main/java/appeng/container/slot/SlotCraftingTerm.java
index 15efa3e9b07..f2ee08f67c1 100644
--- a/src/main/java/appeng/container/slot/SlotCraftingTerm.java
+++ b/src/main/java/appeng/container/slot/SlotCraftingTerm.java
@@ -112,7 +112,7 @@ public ItemStack craftItem(EntityPlayer p, ItemStack request, IMEMonitor<IAEItem
 
 				is = r.getCraftingResult( ic );
 
-				if ( r != null && inv != null )
+				if ( inv != null )
 				{
 					for (int x = 0; x < pattern.getSizeInventory(); x++)
 					{
diff --git a/src/main/java/appeng/container/slot/SlotRestrictedInput.java b/src/main/java/appeng/container/slot/SlotRestrictedInput.java
index 33a6f5108f9..2813a61e180 100644
--- a/src/main/java/appeng/container/slot/SlotRestrictedInput.java
+++ b/src/main/java/appeng/container/slot/SlotRestrictedInput.java
@@ -196,7 +196,7 @@ public boolean isItemValid(ItemStack i)
 		case STORAGE_CELLS:
 			return AEApi.instance().registries().cell().isCellHandled( i );
 		case WORKBENCH_CELL:
-			return i != null && i.getItem() instanceof ICellWorkbenchItem && ((ICellWorkbenchItem) i.getItem()).isEditable( i );
+			return i.getItem() instanceof ICellWorkbenchItem && ((ICellWorkbenchItem) i.getItem()).isEditable( i );
 		case STORAGE_COMPONENT:
 			boolean isComp = i.getItem() instanceof IStorageComponent && ((IStorageComponent) i.getItem()).isStorageComponent( i );
 			return isComp;
diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java
index 7f739041c24..57fc6ca1b1f 100644
--- a/src/main/java/appeng/helpers/DualityInterface.java
+++ b/src/main/java/appeng/helpers/DualityInterface.java
@@ -364,7 +364,7 @@ else if ( req.isSameType( Stored ) ) // same type ( qty different? )!
 					return;
 				}
 			}
-			else if ( Stored != null ) // dispose!
+			else // Stored != null; dispose!
 			{
 				IAEItemStack work = AEApi.instance().storage().createItemStack( Stored );
 				requireWork[slot] = work.setStackSize( -work.getStackSize() );
diff --git a/src/main/java/appeng/helpers/MultiCraftingTracker.java b/src/main/java/appeng/helpers/MultiCraftingTracker.java
index 433597e8aaa..2d56c256cdf 100644
--- a/src/main/java/appeng/helpers/MultiCraftingTracker.java
+++ b/src/main/java/appeng/helpers/MultiCraftingTracker.java
@@ -74,8 +74,6 @@ else if ( craftingJob != null )
 				{
 					if ( craftingJob.isDone() )
 						job = craftingJob.get();
-					else if ( craftingJob.isCancelled() )
-						job = null;
 
 					if ( job != null )
 					{
diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEIGrinderRecipeHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEIGrinderRecipeHandler.java
index f99e8d0b16b..9d8f0e99013 100644
--- a/src/main/java/appeng/integration/modules/NEIHelpers/NEIGrinderRecipeHandler.java
+++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEIGrinderRecipeHandler.java
@@ -86,11 +86,8 @@ public void loadCraftingRecipes(String outputId, Object... results)
 			for (IGrinderEntry recipe : AEApi.instance().registries().grinder().getRecipes())
 			{
 				CachedGrindStoneRecipe cachedRecipe = new CachedGrindStoneRecipe( recipe );
-				if ( cachedRecipe != null )
-				{
-					cachedRecipe.computeVisuals();
-					this.arecipes.add( cachedRecipe );
-				}
+				cachedRecipe.computeVisuals();
+				this.arecipes.add( cachedRecipe );
 			}
 		}
 		else
@@ -118,7 +115,7 @@ public void loadUsageRecipes(ItemStack ingredient)
 		{
 			CachedGrindStoneRecipe cachedRecipe = new CachedGrindStoneRecipe( recipe );
 
-			if ( (cachedRecipe != null) && (cachedRecipe.contains( cachedRecipe.ingredients, ingredient.getItem() )) )
+			if ( (cachedRecipe.contains( cachedRecipe.ingredients, ingredient.getItem() )) )
 			{
 				cachedRecipe.computeVisuals();
 				if ( cachedRecipe.contains( cachedRecipe.ingredients, ingredient ) )
diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEIInscriberRecipeHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEIInscriberRecipeHandler.java
index 2da80904dc5..03d0fccde22 100644
--- a/src/main/java/appeng/integration/modules/NEIHelpers/NEIInscriberRecipeHandler.java
+++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEIInscriberRecipeHandler.java
@@ -58,11 +58,8 @@ public void loadCraftingRecipes(String outputId, Object... results)
 			for (InscriberRecipe recipe : Inscribe.recipes)
 			{
 				CachedInscriberRecipe cachedRecipe = new CachedInscriberRecipe( recipe );
-				if ( cachedRecipe != null )
-				{
-					cachedRecipe.computeVisuals();
-					this.arecipes.add( cachedRecipe );
-				}
+				cachedRecipe.computeVisuals();
+				this.arecipes.add( cachedRecipe );
 			}
 		}
 		else
@@ -90,7 +87,7 @@ public void loadUsageRecipes(ItemStack ingredient)
 		{
 			CachedInscriberRecipe cachedRecipe = new CachedInscriberRecipe( recipe );
 
-			if ( (cachedRecipe != null) && (cachedRecipe.contains( cachedRecipe.ingredients, ingredient.getItem() )) )
+			if ( (cachedRecipe.contains( cachedRecipe.ingredients, ingredient.getItem() )) )
 			{
 				cachedRecipe.computeVisuals();
 				if ( cachedRecipe.contains( cachedRecipe.ingredients, ingredient ) )
diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java
index 0e30621d6d5..370d950af9c 100644
--- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java
+++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java
@@ -802,7 +802,7 @@ public ICraftingLink submitJob(IGrid g, ICraftingJob job, BaseActionSource src,
 				if ( requestingMachine == null )
 					return myLastLink;
 
-				ICraftingLink whatLink = new CraftingLink( generateLinkData( craftID, requestingMachine == null, true ), requestingMachine );
+				ICraftingLink whatLink = new CraftingLink( generateLinkData( craftID, false, true ), requestingMachine );
 
 				submitLink( myLastLink );
 				submitLink( whatLink );
diff --git a/src/main/java/appeng/me/storage/MEMonitorIInventory.java b/src/main/java/appeng/me/storage/MEMonitorIInventory.java
index 8a3bd894221..0091a969558 100644
--- a/src/main/java/appeng/me/storage/MEMonitorIInventory.java
+++ b/src/main/java/appeng/me/storage/MEMonitorIInventory.java
@@ -176,7 +176,7 @@ public TickRateModulation onTick()
 			CachedItemStack old = memory.get( is.slot );
 			high = Math.max( high, is.slot );
 
-			ItemStack newIS = is == null || is.isExtractable == false && mode == StorageFilter.EXTRACTABLE_ONLY ? null : is.getItemStack();
+			ItemStack newIS = is.isExtractable == false && mode == StorageFilter.EXTRACTABLE_ONLY ? null : is.getItemStack();
 			ItemStack oldIS = old == null ? null : old.itemStack;
 
 			if ( isDifferent( newIS, oldIS ) )
@@ -190,7 +190,7 @@ public TickRateModulation onTick()
 					changes.add( old.aeStack );
 				}
 
-				if ( cis != null && cis.aeStack != null )
+				if ( cis.aeStack != null )
 				{
 					changes.add( cis.aeStack );
 					list.add( cis.aeStack );
@@ -198,7 +198,7 @@ public TickRateModulation onTick()
 
 				changed = true;
 			}
-			else if ( is != null )
+			else
 			{
 				int newSize = (newIS == null ? 0 : newIS.stackSize);
 				int diff = newSize - (oldIS == null ? 0 : oldIS.stackSize);
diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java
index 705cbfbce1d..d5253f88b0a 100644
--- a/src/main/java/appeng/parts/CableBusContainer.java
+++ b/src/main/java/appeng/parts/CableBusContainer.java
@@ -247,7 +247,7 @@ public ForgeDirection addPart(ItemStack is, ForgeDirection side, EntityPlayer pl
 							if ( sbp != null )
 							{
 								IGridNode sn = sbp.getGridNode();
-								if ( sn != null && cn != null )
+								if ( sn != null )
 								{
 									try
 									{
@@ -574,8 +574,7 @@ public void writeToStream(ByteBuf data) throws IOException
 				data.writeShort( Item.getIdFromItem( is.getItem() ) );
 				data.writeShort( is.getItemDamage() );
 
-				if ( p != null )
-					p.writeToStream( data );
+				p.writeToStream( data );
 			}
 		}
 
@@ -921,7 +920,7 @@ public void partChanged()
 				}
 			}
 
-			if ( facades != null && !facades.isEmpty() )
+			if ( !facades.isEmpty() )
 			{
 				TileEntity te = tcb.getTile();
 				Platform.spawnDrops( te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord, facades );
diff --git a/src/main/java/appeng/parts/PartPlacement.java b/src/main/java/appeng/parts/PartPlacement.java
index f378fc4c0e0..da637201096 100644
--- a/src/main/java/appeng/parts/PartPlacement.java
+++ b/src/main/java/appeng/parts/PartPlacement.java
@@ -162,7 +162,7 @@ public static boolean place(ItemStack held, int x, int y, int z, int face, Entit
 						if ( host.isEmpty() )
 							host.cleanup();
 
-						if ( is != null && !is.isEmpty() )
+						if ( !is.isEmpty() )
 						{
 							Platform.spawnDrops( world, x, y, z, is );
 						}
diff --git a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java
index cd3a0d3a89f..b512b7bf43e 100644
--- a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java
+++ b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java
@@ -254,7 +254,7 @@ public TickRateModulation EatBlock(boolean eatForReal)
 
 				if ( !ignore )
 				{
-					if ( !w.isAirBlock( x, y, z ) && w.blockExists( x, y, z ) && blk != null && w.canMineBlock( Platform.getPlayer( w ), x, y, z ) )
+					if ( !w.isAirBlock( x, y, z ) && w.blockExists( x, y, z ) && w.canMineBlock( Platform.getPlayer( w ), x, y, z ) )
 					{
 						float hardness = blk.getBlockHardness( w, x, y, z );
 						if ( hardness >= 0.0 )
diff --git a/src/main/java/appeng/parts/layers/LayerISidedInventory.java b/src/main/java/appeng/parts/layers/LayerISidedInventory.java
index 940a66ec68f..eb784b69644 100644
--- a/src/main/java/appeng/parts/layers/LayerISidedInventory.java
+++ b/src/main/java/appeng/parts/layers/LayerISidedInventory.java
@@ -59,8 +59,6 @@ public void notifyNeighbors()
 		if ( inventories.isEmpty() || slotCount == 0 )
 		{
 			inventories = null;
-			sideData = null;
-			slots = null;
 		}
 		else
 		{
diff --git a/src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java b/src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java
index c428d9d3401..f73b3161b60 100644
--- a/src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java
+++ b/src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java
@@ -93,7 +93,7 @@ else if ( is != null && dspPlay != null )
 		{
 			if ( is.getStackSize() != dspPlay.getStackSize() )
 			{
-				dspPlay = is == null ? null : is.copy();
+				dspPlay = is.copy();
 				markForUpdate();
 			}
 		}
diff --git a/src/main/java/appeng/tile/storage/TileChest.java b/src/main/java/appeng/tile/storage/TileChest.java
index 371af080e28..8a703ed00a5 100644
--- a/src/main/java/appeng/tile/storage/TileChest.java
+++ b/src/main/java/appeng/tile/storage/TileChest.java
@@ -635,7 +635,7 @@ public int getCellStatus(int slot)
 			try
 			{
 				IMEInventoryHandler handler = getHandler( StorageChannel.ITEMS );
-				if ( ch != null && handler instanceof ChestMonitorHandler )
+				if ( handler instanceof ChestMonitorHandler )
 					return ch.getStatusForCell( cell, ((ChestMonitorHandler) handler).getInternalHandler() );
 			}
 			catch (ChestNoHandler e)
@@ -645,7 +645,7 @@ public int getCellStatus(int slot)
 			try
 			{
 				IMEInventoryHandler handler = getHandler( StorageChannel.FLUIDS );
-				if ( ch != null && handler instanceof ChestMonitorHandler )
+				if ( handler instanceof ChestMonitorHandler )
 					return ch.getStatusForCell( cell, ((ChestMonitorHandler) handler).getInternalHandler() );
 			}
 			catch (ChestNoHandler e)