From c4520a072bb5e65e86fc27e5f97eafaf483cb07d Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 30 Apr 2016 01:24:14 -0400 Subject: [PATCH] Crash fixes --- .../mekanism/common/integration/WailaDataProvider.java | 2 ++ .../common/tile/TileEntityMetallurgicInfuser.java | 8 -------- src/main/java/mekanism/common/util/RecipeUtils.java | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/java/mekanism/common/integration/WailaDataProvider.java b/src/main/java/mekanism/common/integration/WailaDataProvider.java index 670c7e195..6e43034c2 100644 --- a/src/main/java/mekanism/common/integration/WailaDataProvider.java +++ b/src/main/java/mekanism/common/integration/WailaDataProvider.java @@ -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); diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index 803bb64bf..9ede3963a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -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 getConsumingSides() - { - return EnumSet.of(ForgeDirection.getOrientation(facing).getOpposite()); - } @Override public boolean canExtractItem(int slotID, ItemStack itemstack, int side) diff --git a/src/main/java/mekanism/common/util/RecipeUtils.java b/src/main/java/mekanism/common/util/RecipeUtils.java index c100090a5..eff75d3bf 100644 --- a/src/main/java/mekanism/common/util/RecipeUtils.java +++ b/src/main/java/mekanism/common/util/RecipeUtils.java @@ -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));