diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index bb8b8fbb2..3282cf5b6 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -750,7 +750,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { itemStack.setTagCompound(new NBTTagCompound()); } - + itemStack.stackTagCompound.setTag("Items", nbtTags); } } @@ -767,7 +767,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec return null; } - return itemStack.stackTagCompound.getTagList("Items", NBT.TAG_ANY_NUMERIC); + return itemStack.stackTagCompound.getTagList("Items", NBT.TAG_COMPOUND); } return null; diff --git a/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java b/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java index 3b023e88f..13325142b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java @@ -1,6 +1,7 @@ package mekanism.common.tile; import mekanism.common.ISustainedInventory; +import mekanism.common.Mekanism; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/common/tile/TileEntityPortableTank.java b/src/main/java/mekanism/common/tile/TileEntityPortableTank.java index b8d20b56d..ce01feeb7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPortableTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityPortableTank.java @@ -544,13 +544,26 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements } } - return (from == ForgeDirection.UP || from == ForgeDirection.DOWN) && (fluidTank.getFluid() == null || fluidTank.getFluid().getFluid() == fluid); + return fluidTank.getFluid() == null || fluidTank.getFluid().getFluid() == fluid; } @Override public boolean canDrain(ForgeDirection from, Fluid fluid) { - return !isActive && from == ForgeDirection.DOWN && (fluid == null || (fluidTank != null && fluidTank.getFluid().getFluid() == fluid)); + if(fluidTank != null) + { + if(fluid == null || fluidTank.getFluid().getFluid() == fluid) + { + if(isActive) + { + return from != ForgeDirection.DOWN; + } + + return true; + } + } + + return false; } @Override diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java b/src/main/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java similarity index 100% rename from src/api/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java rename to src/main/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java