importer block

src/main/java/storagecraft/tile/TileDrive.java

@@ -9,7 +9,7 @@ import storagecraft.inventory.InventorySC;
 import storagecraft.storage.CellStorage;
 import storagecraft.storage.IStorage;
 import storagecraft.storage.IStorageProvider;
-import storagecraft.util.InventoryUtil;
+import storagecraft.util.InventoryUtils;
 
 public class TileDrive extends TileMachine implements IInventory, IStorageProvider {
 	private InventorySC inventory = new InventorySC("drive", 8);
@@ -91,14 +91,14 @@ public class TileDrive extends TileMachine implements IInventory, IStorageProvid
 	public void readFromNBT(NBTTagCompound nbt) {
 		super.readFromNBT(nbt);
 
-		InventoryUtil.restoreInventory(this, nbt);
+		InventoryUtils.restoreInventory(this, nbt);
 	}
 
 	@Override
 	public void writeToNBT(NBTTagCompound nbt) {
 		super.writeToNBT(nbt);
 
-		InventoryUtil.saveInventory(this, nbt);
+		InventoryUtils.saveInventory(this, nbt);
 	}
 
 	@Override

src/main/java/storagecraft/tile/TileImporter.java

@@ -0,0 +1,173 @@
+package storagecraft.tile;
+
+import io.netty.buffer.ByteBuf;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import storagecraft.inventory.InventorySC;
+import storagecraft.util.InventoryUtils;
+
+public class TileImporter extends TileMachine implements IInventory {
+	public static final int DEFAULT_COMPARE_FLAGS = InventoryUtils.COMPARE_NBT | InventoryUtils.COMPARE_DAMAGE;
+
+	private InventorySC inventory = new InventorySC("importer", 9);
+	private IInventory connectedInventory;
+
+	private int compareFlags = DEFAULT_COMPARE_FLAGS;
+
+	private int currentSlot = 0;
+
+	@Override
+	public void updateEntity() {
+		super.updateEntity();
+
+		if (!worldObj.isRemote && isConnected()) {
+			TileEntity tile = worldObj.getTileEntity(xCoord + getDirection().offsetX, yCoord + getDirection().offsetY, zCoord + getDirection().offsetZ);
+
+			if (tile instanceof IInventory) {
+				connectedInventory = (IInventory) tile;
+			}
+
+			if (connectedInventory != null) {
+				if (ticks % 5 == 0) {
+					ItemStack slot = connectedInventory.getStackInSlot(currentSlot);
+
+					if (slot != null && canImport(slot)) {
+						if (getController().push(slot.copy())) {
+							connectedInventory.setInventorySlotContents(currentSlot, null);
+						}
+					}
+
+					currentSlot++;
+
+					if (currentSlot > connectedInventory.getSizeInventory() - 1) {
+						currentSlot = 0;
+					}
+				}
+			}
+		} else {
+			connectedInventory = null;
+		}
+	}
+
+	public boolean canImport(ItemStack stack) {
+		int slots = 0;
+
+		for (int i = 0; i < inventory.getSizeInventory(); ++i) {
+			ItemStack slot = inventory.getStackInSlot(i);
+
+			if (slot != null) {
+				slots++;
+
+				if (InventoryUtils.compareStack(slot, stack, compareFlags)) {
+					return true;
+				}
+			}
+		}
+
+		return slots == 0;
+	}
+
+	public int getCompareFlags() {
+		return compareFlags;
+	}
+
+	public void setCompareFlags(int flags) {
+		this.compareFlags = flags;
+	}
+
+	@Override
+	public int getEnergyUsage() {
+		return 3;
+	}
+
+	@Override
+	public int getSizeInventory() {
+		return inventory.getSizeInventory();
+	}
+
+	@Override
+	public ItemStack getStackInSlot(int slot) {
+		return inventory.getStackInSlot(slot);
+	}
+
+	@Override
+	public ItemStack decrStackSize(int slot, int amount) {
+		return inventory.decrStackSize(slot, amount);
+	}
+
+	@Override
+	public ItemStack getStackInSlotOnClosing(int slot) {
+		return inventory.getStackInSlotOnClosing(slot);
+	}
+
+	@Override
+	public void setInventorySlotContents(int slot, ItemStack stack) {
+		inventory.setInventorySlotContents(slot, stack);
+	}
+
+	@Override
+	public String getInventoryName() {
+		return inventory.getInventoryName();
+	}
+
+	@Override
+	public boolean hasCustomInventoryName() {
+		return inventory.hasCustomInventoryName();
+	}
+
+	@Override
+	public int getInventoryStackLimit() {
+		return inventory.getInventoryStackLimit();
+	}
+
+	@Override
+	public boolean isUseableByPlayer(EntityPlayer player) {
+		return inventory.isUseableByPlayer(player);
+	}
+
+	@Override
+	public void openInventory() {
+		inventory.openInventory();
+	}
+
+	@Override
+	public void closeInventory() {
+		inventory.closeInventory();
+	}
+
+	@Override
+	public boolean isItemValidForSlot(int slot, ItemStack stack) {
+		return inventory.isItemValidForSlot(slot, stack);
+	}
+
+	@Override
+	public void readFromNBT(NBTTagCompound nbt) {
+		super.readFromNBT(nbt);
+
+		InventoryUtils.restoreInventory(this, nbt);
+	}
+
+	@Override
+	public void writeToNBT(NBTTagCompound nbt) {
+		super.writeToNBT(nbt);
+
+		InventoryUtils.saveInventory(this, nbt);
+	}
+
+	@Override
+	public void fromBytes(ByteBuf buf) {
+		super.fromBytes(buf);
+
+		compareFlags = buf.readInt();
+	}
+
+	@Override
+	public void toBytes(ByteBuf buf) {
+		super.toBytes(buf);
+
+		buf.writeInt(compareFlags);
+	}
+}

src/main/java/storagecraft/tile/TileStorageProxy.java

@@ -7,7 +7,7 @@ import net.minecraft.tileentity.TileEntity;
 import storagecraft.storage.IStorage;
 import storagecraft.storage.IStorageProvider;
 import storagecraft.storage.StorageItem;
-import storagecraft.util.InventoryUtil;
+import storagecraft.util.InventoryUtils;
 
 public class TileStorageProxy extends TileMachine implements IStorageProvider, IStorage {
 	private IInventory inventory;
@@ -58,7 +58,7 @@ public class TileStorageProxy extends TileMachine implements IStorageProvider, I
 				inventory.setInventorySlotContents(i, stack);
 
 				return;
-			} else if (InventoryUtil.equalsIgnoreQuantity(slot, stack)) {
+			} else if (InventoryUtils.compareStackNoQuantity(slot, stack)) {
 				int toAdd = toGo;
 
 				if (slot.stackSize + toAdd > slot.getMaxStackSize()) {
@@ -87,7 +87,7 @@ public class TileStorageProxy extends TileMachine implements IStorageProvider, I
 		for (int i = 0; i < inventory.getSizeInventory(); ++i) {
 			ItemStack slot = inventory.getStackInSlot(i);
 
-			if (slot != null && InventoryUtil.equalsIgnoreQuantity(slot, stack)) {
+			if (slot != null && InventoryUtils.compareStackNoQuantity(slot, stack)) {
 				if (quantity > slot.stackSize) {
 					quantity = slot.stackSize;
 				}
@@ -118,7 +118,7 @@ public class TileStorageProxy extends TileMachine implements IStorageProvider, I
 
 			if (slot == null) {
 				return true;
-			} else if (InventoryUtil.equalsIgnoreQuantity(slot, stack)) {
+			} else if (InventoryUtils.compareStackNoQuantity(slot, stack)) {
 				int toAdd = toGo;
 
 				if (slot.stackSize + toAdd > slot.getMaxStackSize()) {