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

Fix facade recipes. Hopefully the last null check fix.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java
+1 -1
View File
@@ -430,7 +430,7 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
@Override
public boolean isItemValid( final ItemStack itemstack )
{
return itemstack != null && itemstack.getItem() instanceof ItemEncodedPattern;
return !itemstack.isEmpty() && itemstack.getItem() instanceof ItemEncodedPattern;
}
}
}
src/main/java/appeng/container/implementations/ContainerNetworkStatus.java
+2 -1
View File
@@ -24,6 +24,7 @@ import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import appeng.api.AEApi;
@@ -118,7 +119,7 @@ public class ContainerNetworkStatus extends AEBaseContainer
{
final IGridBlock blk = machine.getGridBlock();
final ItemStack is = blk.getMachineRepresentation();
if( !is.isEmpty() && is.getItem() != null )
if( !is.isEmpty() && is.getItem() != Items.AIR )
{
final IAEItemStack ais = AEItemStack.create( is );
ais.setStackSize( 1 );
src/main/java/appeng/container/implementations/ContainerQuartzKnife.java
+3 -3
View File
@@ -77,7 +77,7 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn
if( currentItem != this.toolInv.getItemStack() )
{
if( currentItem != null )
if( !currentItem.isEmpty() )
{
if( Platform.itemComparisons().isEqualItem( this.toolInv.getItemStack(), currentItem ) )
{
@@ -173,7 +173,7 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn
if( item.getCount() == 0 )
{
this.getPlayerInv().mainInventory.add( this.getPlayerInv().currentItem, null );
this.getPlayerInv().mainInventory.add( this.getPlayerInv().currentItem, ItemStack.EMPTY );
MinecraftForge.EVENT_BUS.post( new PlayerDestroyItemEvent( this.getPlayerInv().player, item, null ) );
}
@@ -191,7 +191,7 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn
@Override
public void setInventorySlotContents( final int var1, final ItemStack var2 )
{
if( var2 == null && Platform.isServer() )
if( var2.isEmpty() && Platform.isServer() )
{
this.makePlate();
}