Crash fixes

This commit is contained in:
aidancbrady committed 2016-04-30 01:24:14 -04:00
1 parent d98c4c181e
commit c4520a072b
3 files changed
+3 -9

No files matched your search

@@ -8,6 +8,7 @@ import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.api.IWailaRegistrar;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.common.tile.TileEntityAdvancedBoundingBlock;
import mekanism.common.tile.TileEntityBin;
import mekanism.common.tile.TileEntityBoundingBlock;
import mekanism.common.tile.TileEntityEnergyCube;
@@ -37,6 +38,7 @@ public class WailaDataProvider implements IWailaDataProvider
registrar.registerHeadProvider(provider, TileEntityInductionProvider.class);
registrar.registerHeadProvider(provider, TileEntityFactory.class);
registrar.registerHeadProvider(provider, TileEntityBoundingBlock.class);
registrar.registerHeadProvider(provider, TileEntityAdvancedBoundingBlock.class);
registrar.registerHeadProvider(provider, TileEntityFluidTank.class);
registrar.registerHeadProvider(provider, TileEntityGasTank.class);
registrar.registerHeadProvider(provider, TileEntityBin.class);
@@ -3,7 +3,6 @@ package mekanism.common.tile;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.EnumSet;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
@@ -42,7 +41,6 @@ import mekanism.common.util.InventoryUtils;
import mekanism.common.util.MekanismUtils;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.ForgeDirection;
public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock implements IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IConfigCardAccess, ISecurityTile
{
@@ -262,12 +260,6 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i
factory.markDirty();
}
@Override
public EnumSet<ForgeDirection> getConsumingSides()
{
return EnumSet.of(ForgeDirection.getOrientation(facing).getOpposite());
}
@Override
public boolean canExtractItem(int slotID, ItemStack itemstack, int side)
@@ -157,7 +157,7 @@ public class RecipeUtils
{
ItemStack itemstack = inv.getStackInSlot(i);
if(itemstack.getItem() instanceof ISecurityItem)
if(itemstack != null && itemstack.getItem() instanceof ISecurityItem)
{
((ISecurityItem)toReturn.getItem()).setOwner(toReturn, ((ISecurityItem)itemstack.getItem()).getOwner(itemstack));
((ISecurityItem)toReturn.getItem()).setSecurity(toReturn, ((ISecurityItem)itemstack.getItem()).getSecurity(itemstack));