fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

First batch of null -> isEmpty() checks.

Browse Source 
I most likely still missed a ton of checks...
This commit is contained in:
Gunther De Wachter
2017-06-26 05:15:25 +02:00
parent 370fc49357
commit da5879b667
117 changed files with 594 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/worldgen/MeteoritePlacer.java
+8 -8
View File
@@ -252,29 +252,29 @@ public final class MeteoritePlacer
r = (int) ( Math.random() * 1000 );
}
ItemStack toAdd = null;
ItemStack toAdd = ItemStack.EMPTY;
final IMaterials materials = AEApi.instance().definitions().materials();
switch( r % 4 )
{
case 0:
toAdd = materials.calcProcessorPress().maybeStack( 1 ).orElse( null );
toAdd = materials.calcProcessorPress().maybeStack( 1 ).orElse( ItemStack.EMPTY );
break;
case 1:
toAdd = materials.engProcessorPress().maybeStack( 1 ).orElse( null );
toAdd = materials.engProcessorPress().maybeStack( 1 ).orElse( ItemStack.EMPTY );
break;
case 2:
toAdd = materials.logicProcessorPress().maybeStack( 1 ).orElse( null );
toAdd = materials.logicProcessorPress().maybeStack( 1 ).orElse( ItemStack.EMPTY );
break;
case 3:
toAdd = materials.siliconPress().maybeStack( 1 ).orElse( null );
toAdd = materials.siliconPress().maybeStack( 1 ).orElse( ItemStack.EMPTY );
break;
default:
}
if( toAdd != null )
if( !toAdd.isEmpty() )
{
if( ap.simulateRemove( 1, toAdd, null ) == null )
if( ap.simulateRemove( 1, toAdd, null ).isEmpty() )
{
ap.addItems( toAdd );
}
@@ -310,7 +310,7 @@ public final class MeteoritePlacer
possibles.add( new ItemStack( net.minecraft.init.Items.GOLD_NUGGET ) );
ItemStack nugget = Platform.pickRandom( possibles );
if( nugget != null )
if( !nugget.isEmpty() )
{
nugget = nugget.copy();
nugget.setCount( (int) ( Math.random() * 12 ) + 1 );