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/client/render/StackSizeRenderer.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class StackSizeRenderer
public void renderStackSize( FontRenderer fontRenderer, IAEItemStack aeStack, ItemStack is, int xPos, int yPos )
{
if( is != null )
if( !is.isEmpty() )
{
final float scaleFactor = AEConfig.instance().useTerminalUseLargeFont() ? 0.85f : 0.5f;
final float inverseScaleFactor = 1.0f / scaleFactor;
src/main/java/appeng/client/render/tesr/InscriberTESR.java
+5 -5
View File
@@ -132,15 +132,15 @@ public class InscriberTESR extends TileEntitySpecialRenderer<TileInscriber>
GlStateManager.color( 1.0F, 1.0F, 1.0F, 1.0F );
int items = 0;
if( tile.getStackInSlot( 0 ) != null )
if( !tile.getStackInSlot( 0 ).isEmpty() )
{
items++;
}
if( tile.getStackInSlot( 1 ) != null )
if( !tile.getStackInSlot( 1 ).isEmpty() )
{
items++;
}
if( tile.getStackInSlot( 2 ) != null )
if( !tile.getStackInSlot( 2 ).isEmpty() )
{
items++;
}
@@ -151,7 +151,7 @@ public class InscriberTESR extends TileEntitySpecialRenderer<TileInscriber>
{
ItemStack is = tile.getStackInSlot( 3 );
if( is == null )
if( is.isEmpty() )
{
final IInscriberRecipe ir = tile.getTask();
if( ir != null )
@@ -177,7 +177,7 @@ public class InscriberTESR extends TileEntitySpecialRenderer<TileInscriber>
private void renderItem( ItemStack sis, final float o, final AEBaseTile tile, final VertexBuffer tess, final double x, final double y, final double z )
{
if( sis != null )
if( !sis.isEmpty() )
{
sis = sis.copy();