Fix facade recipes. Hopefully the last null check fix.

This commit is contained in:
Gunther De Wachter
2017-06-27 20:39:06 +02:00
parent b819fe4adb
commit 61b81fc802
52 changed files with 101 additions and 83 deletions
@@ -89,7 +89,7 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
this.crafting.setInventorySlotContents( x, gs );
if( gs != null && ( !this.isCrafting || !gs.hasTagCompound() ) )
if( !gs.isEmpty() && ( !this.isCrafting || !gs.hasTagCompound() ) )
{
this.markItemAs( x, gs, TestStatus.ACCEPT );
}
@@ -121,7 +121,7 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
{
final ItemStack gs = new ItemStack( outTag.getCompoundTagAt( x ) );
if( gs != null )
if( !gs.isEmpty() )
{
out.add( AEApi.instance().storage().createItemStack( gs ) );
}
@@ -330,7 +330,7 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
private TestStatus getStatus( final int slotIndex, final ItemStack i )
{
if( this.crafting.getStackInSlot( slotIndex ) == null )
if( this.crafting.getStackInSlot( slotIndex ).isEmpty() )
{
return i == null ? TestStatus.ACCEPT : TestStatus.DECLINE;
}