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/parts/automation/PartIdentityAnnihilationPlane.java
+2 -1
View File
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.List;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
@@ -86,7 +87,7 @@ public class PartIdentityAnnihilationPlane extends PartAnnihilationPlane
final List<ItemStack> out = new ArrayList<ItemStack>( 1 );
final Item item = Item.getItemFromBlock( state.getBlock() );
if( item != null )
if( item != Items.AIR )
{
int meta = 0;
if( item.getHasSubtypes() )
src/main/java/appeng/parts/automation/PartImportBus.java
+2 -1
View File
@@ -20,6 +20,7 @@ package appeng.parts.automation;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumHand;
import net.minecraft.util.ResourceLocation;
@@ -88,7 +89,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
@Override
public boolean canInsert( final ItemStack stack )
{
if( stack.isEmpty() || stack.getItem() == null )
if( stack.isEmpty() || stack.getItem() == Items.AIR )
{
return false;
}
src/main/java/appeng/parts/automation/UpgradeInventory.java
+2 -1
View File
@@ -19,6 +19,7 @@
package appeng.parts.automation;
import net.minecraft.init.Items;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -117,7 +118,7 @@ public abstract class UpgradeInventory extends AppEngInternalInventory implement
for( final ItemStack is : this )
{
if( is == null || is.getItem() == null || !( is.getItem() instanceof IUpgradeModule ) )
if( is == null || is.getItem() == Items.AIR || !( is.getItem() instanceof IUpgradeModule ) )
{
continue;
}