From c28dc83c792c83a75ce7e0b3ffd8bb7ae669e496 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Sat, 4 Apr 2015 18:07:25 +0200 Subject: [PATCH] extracting items from network via inventory panel GUI --- .../conduit/item/NetworkedInventory.java | 8 ++- .../machine/invpanel/BlockInventoryPanel.java | 1 + .../machine/invpanel/GuiInventoryPanel.java | 58 ++++++++++++++-- .../machine/invpanel/InventoryDatabase.java | 13 +++- .../invpanel/InventoryDatabaseClient.java | 8 --- .../invpanel/InventoryDatabaseServer.java | 50 +++++++++++++- .../invpanel/InventoryPanelContainer.java | 66 ++++++++++++++++++- .../machine/invpanel/ItemEntryBase.java | 5 ++ .../machine/invpanel/PacketFetchItem.java | 47 +++++++++++++ .../java/crazypants/gui/GuiContainerBase.java | 8 ++- 10 files changed, 242 insertions(+), 22 deletions(-) create mode 100644 src/main/java/crazypants/enderio/machine/invpanel/PacketFetchItem.java diff --git a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java index 4a02e368..95454969 100644 --- a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java +++ b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java @@ -220,6 +220,12 @@ public class NetworkedInventory { if(numInserted <= 0) { return false; } + itemExtracted(slot, numInserted); + return true; + + } + + public void itemExtracted(int slot, int numInserted) { ItemStack curStack = getInventory().getStackInSlot(slot); if(curStack != null) { if(ticHack) { @@ -239,8 +245,6 @@ public class NetworkedInventory { } con.itemsExtracted(numInserted, slot); tickDeficit = Math.round(numInserted * con.getTickTimePerItem(conDir)); - return true; - } int insertIntoTargets(ItemStack toExtract) { diff --git a/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java index 78acfed1..1168f526 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java @@ -19,6 +19,7 @@ public class BlockInventoryPanel extends AbstractMachineBlock { for(int y = 0; y < GHOST_ROWS; y++) { for(int x = 0; x < GHOST_COLUMNS; x++) { - GhostSlot slot = new GhostSlot(); - slot.x = 109 + x*18; - slot.y = 28 + y*18; - ghostSlots.add(slot); + ghostSlots.add(new InvSlot(109 + x*18, 28 + y*18)); } } @@ -179,10 +178,12 @@ public class GuiInventoryPanel extends GuiMachineBase { int index = scrollPos * GHOST_COLUMNS; int count = database.getNumEntries(); for(int i = 0; i < GHOST_ROWS*GHOST_COLUMNS; i++,index++) { - GhostSlot slot = ghostSlots.get(i); + InvSlot slot = (InvSlot) ghostSlots.get(i); if(index < count) { - slot.stack = database.getItemStack(index); + slot.entry = database.getItemEntry(index); + slot.stack = slot.entry.makeItemStack(); } else { + slot.entry = null; slot.stack = null; } } @@ -231,4 +232,49 @@ public class GuiInventoryPanel extends GuiMachineBase { super.mouseClickMove(x, y, button, time); } + @Override + protected void ghostSlotClicked(GhostSlot slot, int x, int y, int button) { + if(slot instanceof InvSlot) { + InvSlot invSlot = (InvSlot) slot; + if(invSlot.entry != null && invSlot.stack != null) { + int targetSlot; + int count = Math.min(invSlot.stack.stackSize, invSlot.stack.getMaxStackSize()); + + if(button == 0) { + if(isShiftKeyDown()) { + InventoryPlayer playerInv = mc.thePlayer.inventory; + targetSlot = playerInv.getFirstEmptyStack(); + if(targetSlot >= 0) { + targetSlot = ((InventoryPanelContainer) inventorySlots).getSlotIndex(playerInv, targetSlot); + } + if(targetSlot < 0) { + return; + } + } else { + targetSlot = -1; + } + } else if(button == 1) { + targetSlot = -1; + if(isCtrlKeyDown()) { + count = 1; + } else { + count = (count + 1) / 2; + } + } else { + return; + } + + PacketHandler.INSTANCE.sendToServer(new PacketFetchItem(invSlot.entry, targetSlot, count)); + } + } + } + + static class InvSlot extends GhostSlot { + InventoryDatabaseClient.ItemEntry entry; + + InvSlot(int x, int y) { + this.x = x; + this.y = y; + } + } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabase.java b/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabase.java index 479e8dd7..9aeeebe9 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabase.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabase.java @@ -30,7 +30,7 @@ public abstract class InventoryDatabase { complexItems = new ArrayList(); } - public ItemEntry lookupItem(ItemStack stack, ItemEntry hint) { + public ItemEntry lookupItem(ItemStack stack, ItemEntry hint, boolean create) { if(stack == null || stack.getItem() == null) { return null; } @@ -47,7 +47,9 @@ public abstract class InventoryDatabase { return hint; } - if(nbt == null && itemID < SIMPLE_MAX_ITEMID && meta < SIMPLE_MAX_META) { + if(!create) { + return null; + } else if(nbt == null && itemID < SIMPLE_MAX_ITEMID && meta < SIMPLE_MAX_META) { return getSimpleItem(itemID, meta); } else { return getComplexItem(itemID, meta, nbt); @@ -115,6 +117,13 @@ public abstract class InventoryDatabase { return null; } + public ItemEntry getExistingItem(int dbID) { + if(dbID < COMPLEX_DBINDEX_START) { + return simpleRegsitry.get(dbID); + } + return getItem(dbID); + } + static final class ItemEntryKey { public final int hash; public final int itemID; diff --git a/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabaseClient.java b/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabaseClient.java index 32f630e1..0f9693f2 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabaseClient.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabaseClient.java @@ -275,10 +275,6 @@ public class InventoryDatabaseClient extends InventoryDatabase> 12; + int slotIndex = idx & 4095; + InventoryKey key = db.inventories[niIndex]; + int amount = key.extractItem(db, this, slotIndex, niIndex, count); + count -= amount; + extracted += amount; + } + return extracted; + } } static class InventoryKey { @@ -244,7 +260,7 @@ public class InventoryDatabaseServer extends InventoryDatabase= items.length) { + return 0; + } + + ItemStack stack = items[slot]; + if(stack == null || db.lookupItem(stack, entry, false) != entry) { + return 0; + } + + int remaining = stack.stackSize; + if(count > remaining) { + count = remaining; + } + + ni.itemExtracted(slot, count); + remaining -= count; + + if(itemCounts[slot] != remaining) { + itemCounts[slot] = remaining; + if(remaining == 0) { + slotItems[slot] = null; + entry.removeSlot(niIndex, slot); + } + db.entryChanged(entry); + } + + System.out.println("result " + count); + return count; + } } public interface ChangeLog { diff --git a/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java b/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java index 3a1a399f..deba9c68 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java @@ -175,7 +175,7 @@ public class InventoryPanelContainer extends AbstractMachineContainer implements public void sendChangeLog() { if(!changedItems.isEmpty() && !crafters.isEmpty()) { try { - InventoryDatabaseServer db = getInventoryPanel().getDatabaseServer(); + InventoryDatabaseServer db = getInventoryPanel().getDatabaseServer(); byte[] compressed = db.compressChangedItems(changedItems); PacketItemList pil = new PacketItemList(getInventoryPanel(), compressed); for(Object crafting : crafters) { @@ -191,4 +191,68 @@ public class InventoryPanelContainer extends AbstractMachineContainer implements changedItems.clear(); } + public int getSlotIndex(IInventory inv, int index) { + for (int i = 0; i < inventorySlots.size(); i++) { + Slot slot = (Slot)inventorySlots.get(i); + if (slot.isSlotInInventory(inv, index)) { + return i; + } + } + return -1; + } + + public void executeFetchItems(EntityPlayerMP player, int dbID, int targetSlot, int count) { + InventoryDatabaseServer db = getInventoryPanel().getDatabaseServer(); + InventoryDatabaseServer.ItemEntry entry = db.getExistingItem(dbID); + if(entry != null) { + ItemStack targetStack; + Slot slot; + int maxStackSize; + + if(targetSlot < 0) { + slot = null; + targetStack = player.inventory.getItemStack(); + maxStackSize = player.inventory.getInventoryStackLimit(); + + if(targetStack != null && targetStack.stackSize > 0) { + return; + } + } else { + slot = getSlot(targetSlot); + targetStack = slot.getStack(); + maxStackSize = slot.getSlotStackLimit(); + } + + //System.out.println("executeFetchItems targetSlot="+targetSlot+" slot="+slot+" maxStackSize="+maxStackSize+" count="+count); + + ItemStack tmpStack = new ItemStack(entry.getItem(), 0, entry.meta); + tmpStack.stackTagCompound = entry.nbt; + maxStackSize = Math.min(maxStackSize, tmpStack.getMaxStackSize()); + + if(targetStack != null && targetStack.stackSize > 0) { + if(!ItemUtil.areStackMergable(tmpStack, targetStack)) { + return; + } + } else { + targetStack = tmpStack.copy(); + } + + count = Math.min(count, maxStackSize - targetStack.stackSize); + if(count > 0) { + int extracted = entry.extractItems(db, count); + if(extracted > 0) { + targetStack.stackSize += extracted; + + sendChangeLog(); + + if(slot != null) { + slot.putStack(targetStack); + } else { + player.inventory.setItemStack(targetStack); + player.updateHeldItem(); + } + } + } + } + } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/ItemEntryBase.java b/src/main/java/crazypants/enderio/machine/invpanel/ItemEntryBase.java index dcc4da6f..ef54ef98 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/ItemEntryBase.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/ItemEntryBase.java @@ -1,5 +1,6 @@ package crazypants.enderio.machine.invpanel; +import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; public class ItemEntryBase { @@ -37,6 +38,10 @@ public class ItemEntryBase { (this.nbt == nbt) || (this.nbt != null && this.nbt.equals(nbt)); } + public Item getItem() { + return Item.getItemById(itemID); + } + @Override public String toString() { return "ItemEntryBase{" + "dbID=" + dbID + ", hash=" + hash + ", itemID=" + itemID + ", meta=" + meta + ", nbt=" + nbt + '}'; diff --git a/src/main/java/crazypants/enderio/machine/invpanel/PacketFetchItem.java b/src/main/java/crazypants/enderio/machine/invpanel/PacketFetchItem.java new file mode 100644 index 00000000..a227b047 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/invpanel/PacketFetchItem.java @@ -0,0 +1,47 @@ +package crazypants.enderio.machine.invpanel; + +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayerMP; + +public class PacketFetchItem implements IMessage, IMessageHandler { + + private int dbID; + private int targetSlot; + private int count; + + public PacketFetchItem() { + } + + public PacketFetchItem(InventoryDatabaseClient.ItemEntry entry, int targetSlot, int count) { + this.dbID = entry.dbID; + this.targetSlot = targetSlot; + this.count = count; + } + + @Override + public void fromBytes(ByteBuf bb) { + dbID = bb.readInt(); + targetSlot = bb.readShort(); + count = bb.readShort(); + } + + @Override + public void toBytes(ByteBuf bb) { + bb.writeInt(dbID); + bb.writeShort(targetSlot); + bb.writeShort(count); + } + + @Override + public IMessage onMessage(PacketFetchItem message, MessageContext ctx) { + EntityPlayerMP player = ctx.getServerHandler().playerEntity; + if(player.openContainer instanceof InventoryPanelContainer) { + InventoryPanelContainer ipc = (InventoryPanelContainer) player.openContainer; + ipc.executeFetchItems(player, message.dbID, message.targetSlot, message.count); + } + return null; + } +} diff --git a/src/main/java/crazypants/gui/GuiContainerBase.java b/src/main/java/crazypants/gui/GuiContainerBase.java index 984e8097..6de3a97c 100644 --- a/src/main/java/crazypants/gui/GuiContainerBase.java +++ b/src/main/java/crazypants/gui/GuiContainerBase.java @@ -158,6 +158,11 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe return ghostSlots; } + protected void ghostSlotClicked(GhostSlot slot, int x, int y, int button) { + ItemStack st = Minecraft.getMinecraft().thePlayer.inventory.getItemStack(); + slot.putStack(st); + } + @Override protected void mouseClicked(int x, int y, int button) { for (GuiTextField f : textFields) { @@ -178,8 +183,7 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe if(!ghostSlots.isEmpty()) { GhostSlot slot = getGhostSlot(x, y); if(slot != null) { - ItemStack st = Minecraft.getMinecraft().thePlayer.inventory.getItemStack(); - slot.putStack(st); + ghostSlotClicked(slot, x, y, button); return; } }