added stuff

- storage proxy block: reads an another inventory into system
- right clicking to push 1 item works
- when take() returns 0, don't give any item stack to the player
- tweaked energy usage

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

@@ -0,0 +1,142 @@
+package storagecraft.tile;
+
+import java.util.List;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import storagecraft.storage.IStorage;
+import storagecraft.storage.IStorageProvider;
+import storagecraft.storage.StorageItem;
+
+public class TileStorageProxy extends TileMachine implements IStorageProvider, IStorage {
+	private IInventory inventory;
+
+	@Override
+	public void updateEntity() {
+		super.updateEntity();
+
+		if (!worldObj.isRemote && isConnected()) {
+			TileEntity tile = worldObj.getTileEntity(xCoord + getDirection().getOpposite().offsetX, yCoord + getDirection().getOpposite().offsetY, zCoord + getDirection().getOpposite().offsetZ);
+
+			if (tile instanceof IInventory) {
+				inventory = (IInventory) tile;
+			}
+		} else {
+			inventory = null;
+		}
+	}
+
+	@Override
+	public int getEnergyUsage() {
+		return 5;
+	}
+
+	@Override
+	public void addItems(List<StorageItem> items) {
+		if (inventory != null) {
+			for (int i = 0; i < inventory.getSizeInventory(); ++i) {
+				if (inventory.getStackInSlot(i) != null) {
+					items.add(new StorageItem(inventory.getStackInSlot(i)));
+				}
+			}
+		}
+	}
+
+	@Override
+	public void push(ItemStack stack) {
+		if (inventory == null) {
+			return;
+		}
+
+		int toGo = stack.stackSize;
+
+		for (int i = 0; i < inventory.getSizeInventory(); ++i) {
+			ItemStack slot = inventory.getStackInSlot(i);
+
+			if (slot == null) {
+				inventory.setInventorySlotContents(i, stack);
+
+				return;
+			} else if (StorageItem.equalsIgnoreQuantity(slot, stack)) {
+				int toAdd = toGo;
+
+				if (slot.stackSize + toAdd > slot.getMaxStackSize()) {
+					toAdd = slot.getMaxStackSize() - slot.stackSize;
+				}
+
+				slot.stackSize += toAdd;
+
+				toGo -= toAdd;
+
+				if (toGo == 0) {
+					return;
+				}
+			}
+		}
+	}
+
+	@Override
+	public int take(ItemStack stack) {
+		if (inventory == null) {
+			return 0;
+		}
+
+		int quantity = stack.stackSize;
+
+		for (int i = 0; i < inventory.getSizeInventory(); ++i) {
+			ItemStack slot = inventory.getStackInSlot(i);
+
+			if (slot != null && StorageItem.equalsIgnoreQuantity(slot, stack)) {
+				if (quantity > slot.stackSize) {
+					quantity = slot.stackSize;
+				}
+
+				slot.stackSize -= quantity;
+
+				if (slot.stackSize == 0) {
+					inventory.setInventorySlotContents(i, null);
+				}
+
+				return quantity;
+			}
+		}
+
+		return 0;
+	}
+
+	@Override
+	public boolean canPush(ItemStack stack) {
+		if (inventory == null) {
+			return false;
+		}
+
+		int toGo = stack.stackSize;
+
+		for (int i = 0; i < inventory.getSizeInventory(); ++i) {
+			ItemStack slot = inventory.getStackInSlot(i);
+
+			if (slot == null) {
+				return true;
+			} else if (StorageItem.equalsIgnoreQuantity(slot, stack)) {
+				int toAdd = toGo;
+
+				if (slot.stackSize + toAdd > slot.getMaxStackSize()) {
+					toAdd = slot.getMaxStackSize() - slot.stackSize;
+				}
+
+				toGo -= toAdd;
+
+				if (toGo == 0) {
+					break;
+				}
+			}
+		}
+
+		return toGo == 0;
+	}
+
+	@Override
+	public void addStorages(List<IStorage> storages) {
+		storages.add(this);
+	}
+}