From eb62256e863d809f127662ad5ee53c112eb445f9 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Sat, 18 Apr 2015 17:25:49 +0200 Subject: [PATCH] move ownership of inventory database to item conduit network to allow it to be shared between multiple panels --- .../conduit/item/ItemConduitNetwork.java | 30 ++- .../machine/invpanel/BlockInventoryPanel.java | 1 + .../machine/invpanel/GuiInventoryPanel.java | 53 ++--- .../machine/invpanel/InventoryDatabase.java | 4 + .../invpanel/InventoryPanelContainer.java | 53 +++-- .../machine/invpanel/PacketDatabaseReset.java | 35 ++++ .../machine/invpanel/PacketFetchItem.java | 8 +- .../machine/invpanel/PacketItemInfo.java | 11 +- .../machine/invpanel/PacketItemList.java | 16 +- .../invpanel/PacketRequestMissingItems.java | 17 +- .../machine/invpanel/TileInventoryPanel.java | 59 ++---- .../client/ClientDatabaseManager.java | 29 +++ .../machine/invpanel/client/DatabaseView.java | 164 ++++++++++++++++ .../invpanel/client/ICraftingHelper.java | 2 + .../client/InventoryDatabaseClient.java | 185 +++--------------- .../InventoryPanelNEIOverlayHandler.java | 21 +- .../invpanel/server/AbstractInventory.java | 2 +- .../machine/invpanel/server/DSUInventory.java | 3 +- .../server/InventoryDatabaseServer.java | 61 +++++- .../invpanel/server/NormalInventory.java | 5 +- 20 files changed, 480 insertions(+), 279 deletions(-) create mode 100644 src/main/java/crazypants/enderio/machine/invpanel/PacketDatabaseReset.java create mode 100644 src/main/java/crazypants/enderio/machine/invpanel/client/ClientDatabaseManager.java create mode 100644 src/main/java/crazypants/enderio/machine/invpanel/client/DatabaseView.java diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java index 9590e23c..46489985 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java @@ -12,6 +12,7 @@ import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.conduit.AbstractConduitNetwork; import crazypants.enderio.conduit.item.NetworkedInventory.Target; import crazypants.enderio.conduit.item.filter.IItemFilter; +import crazypants.enderio.machine.invpanel.server.InventoryDatabaseServer; import crazypants.util.BlockCoord; import crazypants.util.Lang; @@ -28,6 +29,8 @@ public class ItemConduitNetwork extends AbstractConduitNetwork { private static final int GHOST_COLUMNS = 6; private static final int GHOST_ROWS = 5; + private final DatabaseView view; private final TextFieldEIO tfFilter; private final IconButtonEIO btnSort; private final GuiToolTip ttRefill; @@ -70,6 +72,8 @@ public class GuiInventoryPanel extends GuiMachineBase { } } + this.view = new DatabaseView(); + FontRenderer fr = Minecraft.getMinecraft().fontRenderer; tfFilter = new TextFieldEIO(fr, 108, 11, 106, 10); @@ -131,7 +135,12 @@ public class GuiInventoryPanel extends GuiMachineBase { toggleSortOrder(); } if(b.id == ID_CLEAR) { - getContainer().clearCraftingGrid(); + if(getContainer().clearCraftingGrid()) { + if(craftingHelper != null) { + craftingHelper.remove(); + craftingHelper = null; + } + } } } @@ -158,12 +167,12 @@ public class GuiInventoryPanel extends GuiMachineBase { super.drawGuiContainerBackgroundLayer(par1, mouseX, mouseY); - InventoryDatabaseClient db = getDatabase(); - db.setItemFilter(getTileEntity().getItemFilter()); - db.updateFilter(tfFilter.getText()); + view.setDatabase(getDatabase()); + view.setItemFilter(getTileEntity().getItemFilter()); + view.updateFilter(tfFilter.getText()); - boolean update = db.sortItems(); - scrollbar.setScrollMax(Math.max(0, (getDatabase().getNumEntries()+GHOST_COLUMNS-1) / GHOST_COLUMNS - GHOST_ROWS)); + boolean update = view.sortItems(); + scrollbar.setScrollMax(Math.max(0, (view.getNumEntries()+GHOST_COLUMNS-1) / GHOST_COLUMNS - GHOST_ROWS)); if(update || scrollPos != scrollbar.getScrollPos()) { updateGhostSlots(); } @@ -203,9 +212,8 @@ public class GuiInventoryPanel extends GuiMachineBase { } private IconEIO getSortOrderIcon() { - InventoryDatabaseClient db = getDatabase(); - SortOrder order = db.getSortOrder(); - boolean invert = db.isSortOrderInverted(); + SortOrder order = view.getSortOrder(); + boolean invert = view.isSortOrderInverted(); switch (order) { case NAME: return invert ? IconEIO.SORT_NAME_UP : IconEIO.SORT_NAME_DOWN; case COUNT: return invert ? IconEIO.SORT_SIZE_UP : IconEIO.SORT_SIZE_DOWN; @@ -215,22 +223,20 @@ public class GuiInventoryPanel extends GuiMachineBase { } private void toggleSortOrder() { - InventoryDatabaseClient db = getDatabase(); - SortOrder order = db.getSortOrder(); - if(db.isSortOrderInverted()) { + SortOrder order = view.getSortOrder(); + if(view.isSortOrderInverted()) { SortOrder[] values = SortOrder.values(); order = values[(order.ordinal()+1) % values.length]; } - db.setSortOrder(order, !db.isSortOrderInverted()); + view.setSortOrder(order, !view.isSortOrderInverted()); updateSortButton(); } private void updateSortButton() { - InventoryDatabaseClient db = getDatabase(); - SortOrder order = db.getSortOrder(); + SortOrder order = view.getSortOrder(); ArrayList list = new ArrayList(); TooltipAddera.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.sort." - + order.name().toLowerCase(Locale.ENGLISH) + (db.isSortOrderInverted() ? "_up" : "_down") + ".line"); + + order.name().toLowerCase(Locale.ENGLISH) + (view.isSortOrderInverted() ? "_up" : "_down") + ".line"); btnSort.setIcon(getSortOrderIcon()); btnSort.setToolTip(list.toArray(new String[list.size()])); } @@ -238,13 +244,12 @@ public class GuiInventoryPanel extends GuiMachineBase { private void updateGhostSlots() { scrollPos = scrollbar.getScrollPos(); - InventoryDatabaseClient database = getDatabase(); int index = scrollPos * GHOST_COLUMNS; - int count = database.getNumEntries(); + int count = view.getNumEntries(); for(int i = 0; i < GHOST_ROWS*GHOST_COLUMNS; i++,index++) { InvSlot slot = (InvSlot) ghostSlots.get(i); if(index < count) { - slot.entry = database.getItemEntry(index); + slot.entry = view.getItemEntry(index); slot.stack = slot.entry.makeItemStack(); } else { slot.entry = null; @@ -294,10 +299,11 @@ public class GuiInventoryPanel extends GuiMachineBase { scrollbar.scrollBy(-Integer.signum(delta)); } else if(!shift && delta > 0 & (hoverGhostSlot instanceof InvSlot)) { InvSlot invSlot = (InvSlot) hoverGhostSlot; - if(invSlot.stack != null && invSlot.entry != null) { + InventoryDatabaseClient db = getDatabase(); + if(invSlot.stack != null && invSlot.entry != null && db != null) { ItemStack itemStack = mc.thePlayer.inventory.getItemStack(); if(itemStack == null || ItemUtil.areStackMergable(itemStack, hoverGhostSlot.stack)) { - PacketHandler.INSTANCE.sendToServer(new PacketFetchItem(invSlot.entry, -1, 1)); + PacketHandler.INSTANCE.sendToServer(new PacketFetchItem(db.getGeneration(), invSlot.entry, -1, 1)); } } } @@ -308,7 +314,8 @@ public class GuiInventoryPanel extends GuiMachineBase { 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) { + InventoryDatabaseClient db = getDatabase(); + if(invSlot.entry != null && invSlot.stack != null && db != null) { int targetSlot; int count = Math.min(invSlot.stack.stackSize, invSlot.stack.getMaxStackSize()); @@ -336,7 +343,7 @@ public class GuiInventoryPanel extends GuiMachineBase { return; } - PacketHandler.INSTANCE.sendToServer(new PacketFetchItem(invSlot.entry, targetSlot, count)); + PacketHandler.INSTANCE.sendToServer(new PacketFetchItem(db.getGeneration(), invSlot.entry, targetSlot, count)); } } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabase.java b/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabase.java index e3a8381b..b68ffe01 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabase.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabase.java @@ -30,6 +30,10 @@ public abstract class InventoryDatabase { complexItems = new ArrayList(); } + public int getGeneration() { + return generation; + } + public ItemEntry lookupItem(ItemStack stack, ItemEntry hint, boolean create) { if(stack == null || stack.getItem() == null) { return null; diff --git a/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java b/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java index 6b5d8fcc..2bd69cf6 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java @@ -161,7 +161,10 @@ public class InventoryPanelContainer extends AbstractMachineContainer implements private void removeChangeLog() { if(changedItems != null) { - getInventoryPanel().getDatabaseServer().removeChangeLog(this); + InventoryDatabaseServer db = getInventoryPanel().getDatabaseServer(); + if(db != null) { + db.removeChangeLog(this); + } } } @@ -179,15 +182,17 @@ public class InventoryPanelContainer extends AbstractMachineContainer implements super.addCraftingToCrafters(crafting); if(changedItems != null) { InventoryDatabaseServer db = getInventoryPanel().getDatabaseServer(); - db.addChangeLog(this); - if(crafting instanceof EntityPlayerMP) { - try { - byte[] compressed = db.compressItemList(); - PacketItemList pil = new PacketItemList(getInventoryPanel(), compressed); - PacketHandler.sendTo(pil, (EntityPlayerMP)crafting); - } catch (IOException ex) { - Logger.getLogger(InventoryPanelContainer.class.getName()).log(Level.SEVERE, - "Exception while compressing item list", ex); + if(db != null) { + db.addChangeLog(this); + if(crafting instanceof EntityPlayerMP) { + try { + byte[] compressed = db.compressItemList(); + PacketItemList pil = new PacketItemList(getInventoryPanel(), db.getGeneration(), compressed); + PacketHandler.sendTo(pil, (EntityPlayerMP)crafting); + } catch (IOException ex) { + Logger.getLogger(InventoryPanelContainer.class.getName()).log(Level.SEVERE, + "Exception while compressing item list", ex); + } } } } @@ -252,23 +257,26 @@ public class InventoryPanelContainer extends AbstractMachineContainer implements @Override public void databaseReset() { changedItems.clear(); + } @Override public void sendChangeLog() { if(!changedItems.isEmpty() && !crafters.isEmpty()) { - try { - InventoryDatabaseServer db = getInventoryPanel().getDatabaseServer(); - byte[] compressed = db.compressChangedItems(changedItems); - PacketItemList pil = new PacketItemList(getInventoryPanel(), compressed); - for(Object crafting : crafters) { - if(crafting instanceof EntityPlayerMP) { - PacketHandler.sendTo(pil, (EntityPlayerMP) crafting); + InventoryDatabaseServer db = getInventoryPanel().getDatabaseServer(); + if(db != null) { + try { + byte[] compressed = db.compressChangedItems(changedItems); + PacketItemList pil = new PacketItemList(getInventoryPanel(), db.getGeneration(), compressed); + for(Object crafting : crafters) { + if(crafting instanceof EntityPlayerMP) { + PacketHandler.sendTo(pil, (EntityPlayerMP) crafting); + } } + } catch (IOException ex) { + Logger.getLogger(InventoryPanelContainer.class.getName()).log(Level.SEVERE, + "Exception while compressing changed items", ex); } - } catch (IOException ex) { - Logger.getLogger(InventoryPanelContainer.class.getName()).log(Level.SEVERE, - "Exception while compressing changed items", ex); } } changedItems.clear(); @@ -284,8 +292,11 @@ public class InventoryPanelContainer extends AbstractMachineContainer implements return -1; } - public void executeFetchItems(EntityPlayerMP player, int dbID, int targetSlot, int count) { + public void executeFetchItems(EntityPlayerMP player, int generation, int dbID, int targetSlot, int count) { InventoryDatabaseServer db = getInventoryPanel().getDatabaseServer(); + if(db == null || db.getGeneration() != generation || !db.isCurrent()) { + return; + } ItemEntry entry = db.getExistingItem(dbID); if(entry != null) { ItemStack targetStack; diff --git a/src/main/java/crazypants/enderio/machine/invpanel/PacketDatabaseReset.java b/src/main/java/crazypants/enderio/machine/invpanel/PacketDatabaseReset.java new file mode 100644 index 00000000..868c70ff --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/invpanel/PacketDatabaseReset.java @@ -0,0 +1,35 @@ +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 crazypants.enderio.machine.invpanel.client.ClientDatabaseManager; +import io.netty.buffer.ByteBuf; + +public class PacketDatabaseReset implements IMessage, IMessageHandler { + + private int generation; + + public PacketDatabaseReset() { + } + + public PacketDatabaseReset(int generation) { + this.generation = generation; + } + + @Override + public void fromBytes(ByteBuf bb) { + this.generation = bb.readInt(); + } + + @Override + public void toBytes(ByteBuf bb) { + bb.writeInt(generation); + } + + @Override + public IMessage onMessage(PacketDatabaseReset message, MessageContext ctx) { + ClientDatabaseManager.INSTANCE.destroyDatabase(message.generation); + return null; + } +} diff --git a/src/main/java/crazypants/enderio/machine/invpanel/PacketFetchItem.java b/src/main/java/crazypants/enderio/machine/invpanel/PacketFetchItem.java index 82a3d25d..b74b01f5 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/PacketFetchItem.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/PacketFetchItem.java @@ -9,6 +9,7 @@ import net.minecraft.entity.player.EntityPlayerMP; public class PacketFetchItem implements IMessage, IMessageHandler { + private int generation; private int dbID; private int targetSlot; private int count; @@ -16,7 +17,8 @@ public class PacketFetchItem implements IMessage, IMessageHandler implements IMessageHandler { + private int generation; private byte[] compressed; public PacketItemInfo() { } - public PacketItemInfo(TileInventoryPanel tile, List items) { + public PacketItemInfo(TileInventoryPanel tile, InventoryDatabaseServer db, List items) { super(tile); + this.generation = db.generation; try { - compressed = tile.getDatabaseServer().compressItemInfo(items); + compressed = db.compressItemInfo(items); } catch (IOException ex) { Logger.getLogger(PacketItemInfo.class.getName()).log(Level.SEVERE, "Exception while compressing items", ex); compressed = new byte[0]; @@ -36,12 +39,14 @@ public class PacketItemInfo extends MessageTileEntity implem @Override public void fromBytes(ByteBuf buf) { super.fromBytes(buf); + generation = buf.readInt(); compressed = NetworkUtil.readByteArray(buf); } @Override public void toBytes(ByteBuf buf) { super.toBytes(buf); + buf.writeInt(generation); NetworkUtil.writeByteArray(buf, compressed); } @@ -51,7 +56,7 @@ public class PacketItemInfo extends MessageTileEntity implem TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); if(te instanceof TileInventoryPanel) { TileInventoryPanel teInvPanel = (TileInventoryPanel) te; - InventoryDatabaseClient db = teInvPanel.getDatabaseClient(); + InventoryDatabaseClient db = teInvPanel.getDatabaseClient(message.generation); try { db.readCompressedItems(message.compressed); } catch (IOException ex) { diff --git a/src/main/java/crazypants/enderio/machine/invpanel/PacketItemList.java b/src/main/java/crazypants/enderio/machine/invpanel/PacketItemList.java index caa67191..9332a877 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/PacketItemList.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/PacketItemList.java @@ -4,11 +4,14 @@ 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 crazypants.enderio.EnderIO; +import crazypants.enderio.machine.invpanel.client.ClientDatabaseManager; import crazypants.enderio.machine.invpanel.client.InventoryDatabaseClient; import crazypants.enderio.network.MessageTileEntity; import crazypants.enderio.network.NetworkUtil; +import crazypants.enderio.network.PacketHandler; import io.netty.buffer.ByteBuf; import java.io.IOException; +import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; import net.minecraft.entity.player.EntityPlayer; @@ -16,25 +19,29 @@ import net.minecraft.tileentity.TileEntity; public class PacketItemList extends MessageTileEntity implements IMessageHandler { + private int generation; private byte[] compressed; public PacketItemList() { } - public PacketItemList(TileInventoryPanel tile, byte[] compressed) { + public PacketItemList(TileInventoryPanel tile, int generation, byte[] compressed) { super(tile); + this.generation = generation; this.compressed = compressed; } @Override public void fromBytes(ByteBuf buf) { super.fromBytes(buf); + generation = buf.readInt(); compressed = NetworkUtil.readByteArray(buf); } @Override public void toBytes(ByteBuf buf) { super.toBytes(buf); + buf.writeInt(generation); NetworkUtil.writeByteArray(buf, compressed); } @@ -44,9 +51,12 @@ public class PacketItemList extends MessageTileEntity implem TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); if(te instanceof TileInventoryPanel) { TileInventoryPanel teInvPanel = (TileInventoryPanel) te; - InventoryDatabaseClient db = teInvPanel.getDatabaseClient(); + InventoryDatabaseClient db = teInvPanel.getDatabaseClient(message.generation); try { - db.readCompressedItemList(message.compressed); + List missingItems = db.readCompressedItemList(message.compressed); + if(missingItems != null) { + PacketHandler.INSTANCE.sendToServer(new PacketRequestMissingItems(teInvPanel, db.getGeneration(), missingItems)); + } } catch (IOException ex) { Logger.getLogger(PacketItemInfo.class.getName()).log(Level.SEVERE, "Exception while reading item list", ex); diff --git a/src/main/java/crazypants/enderio/machine/invpanel/PacketRequestMissingItems.java b/src/main/java/crazypants/enderio/machine/invpanel/PacketRequestMissingItems.java index 79d25729..31ce378d 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/PacketRequestMissingItems.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/PacketRequestMissingItems.java @@ -24,11 +24,12 @@ public class PacketRequestMissingItems extends MessageTileEntity missingIDs) { + public PacketRequestMissingItems(TileInventoryPanel tile, int generation, List missingIDs) { super(tile); try { CompressedDataOutput cdo = new CompressedDataOutput(); try { + cdo.writeVariable(generation); cdo.writeVariable(missingIDs.size()); for(Integer id : missingIDs) { cdo.writeVariable(id - InventoryDatabase.COMPLEX_DBINDEX_START); @@ -61,13 +62,15 @@ public class PacketRequestMissingItems extends MessageTileEntity items = db.decompressMissingItems(message.compressed); - if(!items.isEmpty()) { - PacketHandler.sendTo(new PacketItemInfo(teInvPanel, items), player); + if(db != null) { + try { + List items = db.decompressMissingItems(message.compressed); + if(!items.isEmpty()) { + PacketHandler.sendTo(new PacketItemInfo(teInvPanel, db, items), player); + } + } catch (IOException ex) { + Logger.getLogger(PacketItemInfo.class.getName()).log(Level.SEVERE, "Exception while reading missing item IDs", ex); } - } catch (IOException ex) { - Logger.getLogger(PacketItemInfo.class.getName()).log(Level.SEVERE, "Exception while reading missing item IDs", ex); } } return null; diff --git a/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java index 913c3519..0b3b667b 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java @@ -7,11 +7,10 @@ import crazypants.enderio.conduit.TileConduitBundle; import crazypants.enderio.conduit.item.FilterRegister; import crazypants.enderio.conduit.item.ItemConduit; import crazypants.enderio.conduit.item.ItemConduitNetwork; -import crazypants.enderio.conduit.item.NetworkedInventory; import crazypants.enderio.conduit.item.filter.IItemFilter; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.SlotDefinition; -import java.util.List; +import crazypants.enderio.machine.invpanel.client.ClientDatabaseManager; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -28,8 +27,6 @@ public class TileInventoryPanel extends AbstractMachineEntity { private InventoryDatabaseServer dbServer; private InventoryDatabaseClient dbClient; - private ItemConduitNetwork network; - private int networkChangeCount; private int numSources; public Container eventHandler; @@ -40,16 +37,21 @@ public class TileInventoryPanel extends AbstractMachineEntity { } public InventoryDatabaseServer getDatabaseServer() { - if(dbServer == null) { - dbServer = new InventoryDatabaseServer(); - } return dbServer; } - public InventoryDatabaseClient getDatabaseClient() { - if(dbClient == null) { - dbClient = new InventoryDatabaseClient(this); + public InventoryDatabaseClient getDatabaseClient(int generation) { + if(dbClient != null && dbClient.getGeneration() != generation) { + ClientDatabaseManager.INSTANCE.destroyDatabase(dbClient.getGeneration()); + dbClient = null; } + if(dbClient == null) { + dbClient = ClientDatabaseManager.INSTANCE.getOrCreateDatabase(generation); + } + return dbClient; + } + + public InventoryDatabaseClient getDatabaseClient() { return dbClient; } @@ -109,14 +111,10 @@ public class TileInventoryPanel extends AbstractMachineEntity { return; } - if(shouldDoWorkThisTick(2)) { + if(shouldDoWorkThisTick(20)) { scanNetwork(); } - if(dbServer != null && shouldDoWorkThisTick(20)) { - dbServer.sendChangeLogs(); - } - if(forceClientUpdate) { worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); markDirty(); @@ -127,44 +125,27 @@ public class TileInventoryPanel extends AbstractMachineEntity { ForgeDirection facingDir = getFacingDir(); ForgeDirection backside = facingDir.getOpposite(); - ItemConduit conduit = null; ItemConduitNetwork icn = null; TileEntity te = worldObj.getTileEntity(xCoord+backside.offsetX, yCoord+backside.offsetY, zCoord+backside.offsetZ); if(te instanceof TileConduitBundle) { TileConduitBundle teCB = (TileConduitBundle) te; - conduit = teCB.getConduit(ItemConduit.class); + ItemConduit conduit = teCB.getConduit(ItemConduit.class); if(conduit != null) { icn = (ItemConduitNetwork) conduit.getNetwork(); } } - if(icn != network || (icn != null && icn.getChangeCount() != networkChangeCount)) { - updateNetwork(icn, conduit, facingDir); - } - - if(dbServer != null) { - dbServer.scanNextInventory(); - } - } - - private void updateNetwork(ItemConduitNetwork icn, ItemConduit conduit, ForgeDirection facingDir) { - List sources = null; - if(icn != null) { - networkChangeCount = icn.getChangeCount(); - sources = icn.getInventoryPanelSources(); + dbServer = icn.getDatabase(); + dbServer.sendChangeLogs(); - if(numSources != sources.size()) { - numSources = sources.size(); + if(numSources != dbServer.getNumInventories()) { + numSources = dbServer.getNumInventories(); forceClientUpdate = true; } - } - - this.network = icn; - - if(dbServer != null || sources != null) { - getDatabaseServer().setNetworkSources(sources); + } else { + dbServer = null; } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/ClientDatabaseManager.java b/src/main/java/crazypants/enderio/machine/invpanel/client/ClientDatabaseManager.java new file mode 100644 index 00000000..bf47f9a6 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/ClientDatabaseManager.java @@ -0,0 +1,29 @@ +package crazypants.enderio.machine.invpanel.client; + +import java.util.HashMap; + +public class ClientDatabaseManager { + + public static final ClientDatabaseManager INSTANCE = new ClientDatabaseManager(); + + private final HashMap dbRegistry = new HashMap(); + + public InventoryDatabaseClient getOrCreateDatabase(int generation) { + InventoryDatabaseClient db = dbRegistry.get(generation); + if(db == null) { + db = new InventoryDatabaseClient(generation); + dbRegistry.put(generation, db); + System.out.println("Created InventoryDatabaseClient generation " + generation); + } + return db; + } + + public void destroyDatabase(int generation) { + InventoryDatabaseClient db = dbRegistry.remove(generation); + if(db != null) { + System.out.println("Destroyed InventoryDatabaseClient generation " + generation); + } else { + System.out.println("Tried to destroy non existing generation " + generation); + } + } +} diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/DatabaseView.java b/src/main/java/crazypants/enderio/machine/invpanel/client/DatabaseView.java new file mode 100644 index 00000000..a8891873 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/DatabaseView.java @@ -0,0 +1,164 @@ +package crazypants.enderio.machine.invpanel.client; + +import crazypants.enderio.conduit.item.filter.IItemFilter; +import java.text.Collator; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.Iterator; +import java.util.Locale; +import net.minecraft.client.Minecraft; + +public class DatabaseView { + + public static final Locale LOCALE = Locale.forLanguageTag(Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode()); + + private final ArrayList filteredItems; + + private InventoryDatabaseClient database; + private int dbItemsChangeCount; + private int dbCountChangeCount; + + private SortOrder order = SortOrder.NAME; + private boolean invertSortOrder; + private boolean needsSorting; + private IItemFilter itemFilter; + private String currentFilter; + private boolean needsFiltering; + private boolean needsNewFiltering; + + private Collator collator; + + public DatabaseView() { + filteredItems = new ArrayList(); + currentFilter = ""; + } + + public void setDatabase(InventoryDatabaseClient database) { + if(this.database != database) { + this.database = database; + if(database != null) { + this.dbItemsChangeCount = database.getItemsChangeCount(); + this.dbCountChangeCount = database.getCountChangeCount(); + } + this.needsSorting = true; + this.needsFiltering = true; + this.needsNewFiltering = true; + } + } + + public void setSortOrder(SortOrder order, boolean invert) { + if(this.order != order || this.invertSortOrder != invert) { + this.order = order; + this.invertSortOrder = invert; + this.needsSorting = true; + } + } + + public void setItemFilter(IItemFilter itemFilter) { + if(this.itemFilter != itemFilter) { + this.itemFilter = itemFilter; + needsNewFiltering = true; + needsFiltering = true; + } + } + + public void updateFilter(String newFilter) { + newFilter = newFilter.trim(); + + if(!currentFilter.equals(newFilter)) { + if(newFilter.length() < currentFilter.length() || + !newFilter.regionMatches(0, currentFilter, 0, currentFilter.length())) { + needsNewFiltering = true; + } + needsFiltering = true; + currentFilter = newFilter; + } + } + + public SortOrder getSortOrder() { + return order; + } + + public boolean isSortOrderInverted() { + return invertSortOrder; + } + + public boolean sortItems() { + boolean changed = false; + + if(database != null) { + if(dbItemsChangeCount != database.getItemsChangeCount()) { + dbItemsChangeCount = database.getItemsChangeCount(); + needsSorting = true; + needsFiltering = true; + needsNewFiltering = true; + } + + if(dbCountChangeCount != database.getCountChangeCount()) { + dbCountChangeCount = database.getCountChangeCount(); + if(order == SortOrder.COUNT) { + needsSorting = true; + } + } + } + + if(needsFiltering) { + if(needsNewFiltering) { + filteredItems.clear(); + if(database != null) { + database.getItems(filteredItems); + } + needsSorting = true; + } + + ItemFilter filter = ItemFilter.parse(currentFilter, LOCALE, itemFilter); + System.out.println("filtering new="+needsNewFiltering+" currentFilter="+currentFilter+" parsed="+filter); + if(filter != null) { + Iterator iter = filteredItems.iterator(); + while(iter.hasNext()) { + ItemEntry entry = iter.next(); + if(!filter.matches(entry)) { + iter.remove(); + changed = true; + } + } + } + + needsFiltering = false; + needsNewFiltering = false; + } + + if(needsSorting) { + Comparator cmp; + switch (order) { + case NAME: cmp = new NameComparator(getCollator()); break; + case MOD: cmp = new ModComparator(getCollator()); break; + default: cmp = CountComparator.INSTANCE; + } + if(invertSortOrder) { + cmp = Collections.reverseOrder(cmp); + } + Collections.sort(filteredItems, cmp); + changed = true; + } + + return changed; + } + + public int getNumEntries() { + return filteredItems.size(); + } + + public ItemEntry getItemEntry(int index) { + return filteredItems.get(index); + } + + private Collator getCollator() { + if(collator == null) { + collator = Collator.getInstance(LOCALE); + } + return collator; + } + +} diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/ICraftingHelper.java b/src/main/java/crazypants/enderio/machine/invpanel/client/ICraftingHelper.java index 46e5a556..2221eff6 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/client/ICraftingHelper.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/ICraftingHelper.java @@ -4,6 +4,8 @@ import crazypants.enderio.machine.invpanel.GuiInventoryPanel; public interface ICraftingHelper { + void remove(); + void refill(GuiInventoryPanel gui, int amount); } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryDatabaseClient.java b/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryDatabaseClient.java index 908689e6..12188d3f 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryDatabaseClient.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryDatabaseClient.java @@ -1,56 +1,43 @@ package crazypants.enderio.machine.invpanel.client; -import crazypants.enderio.conduit.item.filter.IItemFilter; import crazypants.enderio.machine.invpanel.InventoryDatabase; -import crazypants.enderio.machine.invpanel.PacketRequestMissingItems; -import crazypants.enderio.machine.invpanel.TileInventoryPanel; import crazypants.enderio.network.CompressedDataInput; -import crazypants.enderio.network.PacketHandler; import java.io.IOException; -import java.text.Collator; import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; import java.util.HashSet; -import java.util.Iterator; import java.util.List; -import java.util.Locale; -import net.minecraft.client.Minecraft; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; public class InventoryDatabaseClient extends InventoryDatabase { - private final TileInventoryPanel te; private final ArrayList clientItems; - private final ArrayList filteredItems; private final HashSet requestedItems; - private SortOrder order = SortOrder.NAME; - private boolean invertSortOrder; - private boolean needsSorting; - private IItemFilter itemFilter; - private String currentFilter; - private boolean needsFiltering; - private boolean needsNewFiltering; - private Locale locale; - private Collator collator; + private int itemsChangeCount; + private int countChangeCount; - public InventoryDatabaseClient(TileInventoryPanel te) { - this.te = te; + InventoryDatabaseClient(int generation) { + this.generation = generation; clientItems = new ArrayList(); - filteredItems = new ArrayList(); requestedItems = new HashSet(); - currentFilter = ""; + } + + public int getItemsChangeCount() { + return itemsChangeCount; + } + + public int getCountChangeCount() { + return countChangeCount; + } + + public void getItems(List outList) { + outList.addAll(clientItems); } public void readCompressedItems(byte[] compressed) throws IOException { CompressedDataInput cdi = new CompressedDataInput(compressed); try { - int pktGeneration = cdi.readVariable(); - if(pktGeneration != generation) { - return; - } int numEntries = cdi.readVariable(); for(int i=0 ; i { int count = cdi.readVariable(); setItemCount(entry, count); } - needsSorting = true; - needsFiltering = true; - needsNewFiltering = true; + itemsChangeCount++; + countChangeCount++; } finally { cdi.close(); } } - public void readCompressedItemList(byte[] compressed) throws IOException { + public List readCompressedItemList(byte[] compressed) throws IOException { CompressedDataInput cdi = new CompressedDataInput(compressed); try { - int pktGeneration = cdi.readVariable(); - int changed = cdi.readVariable(); - List missingItems = null; - + int changed = cdi.readVariable(); if(changed > 0) { - if(pktGeneration != generation) { - return; - } - for(int i = 0; i < changed; i++) { int dbID = cdi.readVariable(); int count = cdi.readVariable(); @@ -111,15 +90,12 @@ public class InventoryDatabaseClient extends InventoryDatabase { } } - if(order == SortOrder.COUNT) { - needsSorting = true; - } + countChangeCount++; } else { for(ItemEntry entry : clientItems) { entry.count = 0; } clientItems.clear(); - generation = pktGeneration; int count = cdi.readVariable(); while(count > 0) { @@ -143,14 +119,11 @@ public class InventoryDatabaseClient extends InventoryDatabase { } count = cdi.readVariable(); } - needsSorting = true; - needsFiltering = true; - needsNewFiltering = true; + itemsChangeCount++; + countChangeCount++; } - if(missingItems != null) { - PacketHandler.INSTANCE.sendToServer(new PacketRequestMissingItems(te, missingItems)); - } + return missingItems; } finally { cdi.close(); } @@ -159,12 +132,10 @@ public class InventoryDatabaseClient extends InventoryDatabase { private void setItemCount(ItemEntry entry, int count) { if(entry.count == 0 && count > 0) { clientItems.add(entry); - needsFiltering = true; - needsNewFiltering = true; + itemsChangeCount++; } else if(entry.count > 0 && count == 0) { clientItems.remove(entry); - needsFiltering = true; - needsNewFiltering = true; + itemsChangeCount++; } entry.count = count; } @@ -180,110 +151,6 @@ public class InventoryDatabaseClient extends InventoryDatabase { return list; } - private Locale getLocale() { - if(locale == null) { - String langCode = Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode(); - locale = Locale.forLanguageTag(langCode); - } - return locale; - } - - private Collator getCollator() { - if(collator == null) { - collator = Collator.getInstance(getLocale()); - } - return collator; - } - - public void setSortOrder(SortOrder order, boolean invert) { - if(this.order != order || this.invertSortOrder != invert) { - this.order = order; - this.invertSortOrder = invert; - this.needsSorting = true; - } - } - - public void setItemFilter(IItemFilter itemFilter) { - if(this.itemFilter != itemFilter) { - this.itemFilter = itemFilter; - needsNewFiltering = true; - needsFiltering = true; - } - } - - public void updateFilter(String newFilter) { - newFilter = newFilter.trim(); - - if(!currentFilter.equals(newFilter)) { - if(newFilter.length() < currentFilter.length() || - !newFilter.regionMatches(0, currentFilter, 0, currentFilter.length())) { - needsNewFiltering = true; - } - needsFiltering = true; - currentFilter = newFilter; - } - } - - public SortOrder getSortOrder() { - return order; - } - - public boolean isSortOrderInverted() { - return invertSortOrder; - } - - public boolean sortItems() { - boolean changed = false; - - if(needsFiltering) { - if(needsNewFiltering) { - filteredItems.clear(); - filteredItems.addAll(clientItems); - needsSorting = true; - } - - ItemFilter filter = ItemFilter.parse(currentFilter, getLocale(), itemFilter); - System.out.println("filtering new="+needsNewFiltering+" currentFilter="+currentFilter+" parsed="+filter); - if(filter != null) { - Iterator iter = filteredItems.iterator(); - while(iter.hasNext()) { - ItemEntry entry = iter.next(); - if(!filter.matches(entry)) { - iter.remove(); - changed = true; - } - } - } - - needsFiltering = false; - needsNewFiltering = false; - } - - if(needsSorting) { - Comparator cmp; - switch (order) { - case NAME: cmp = new NameComparator(getCollator()); break; - case MOD: cmp = new ModComparator(getCollator()); break; - default: cmp = CountComparator.INSTANCE; - } - if(invertSortOrder) { - cmp = Collections.reverseOrder(cmp); - } - Collections.sort(filteredItems, cmp); - changed = true; - } - - return changed; - } - - public int getNumEntries() { - return filteredItems.size(); - } - - public ItemEntry getItemEntry(int index) { - return filteredItems.get(index); - } - @Override protected ItemEntry createItemEntry(int dbId, int hash, int itemID, int meta, NBTTagCompound nbt) { return new ItemEntry(dbId, hash, itemID, meta, nbt); diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryPanelNEIOverlayHandler.java b/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryPanelNEIOverlayHandler.java index 2e4e819e..c5cff02b 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryPanelNEIOverlayHandler.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryPanelNEIOverlayHandler.java @@ -84,9 +84,15 @@ public class InventoryPanelNEIOverlayHandler implements IOverlayHandler { this.ingredients = ingredients; } + @Override + public void remove() { + LayoutManager.overlayRenderer = null; + } + @Override public void refill(GuiInventoryPanel gui, int amount) { InventoryPanelContainer container = gui.getContainer(); + InventoryDatabaseClient db = gui.getDatabase(); List craftingGrid = container.getCraftingGridSlots(); int slotsToProcess = (1<<9)-1; boolean madeProgress; @@ -108,9 +114,9 @@ public class InventoryPanelNEIOverlayHandler implements IOverlayHandler { if(!isStackCompatible(pstack, stack)) { return; } - candidate = findCandidates(stack, gui, candidates); + candidate = findCandidates(stack, gui, db, candidates); } else { - candidate = findAllCandidates(pstack, gui, candidates); + candidate = findAllCandidates(pstack, gui, db, candidates); } if(candidate == null) { @@ -160,7 +166,7 @@ public class InventoryPanelNEIOverlayHandler implements IOverlayHandler { if(current < targetAmount) { int toMove = Math.min(candidate.entry.getCount(), targetAmount - current); System.out.println("fetching items from DB"); - PacketHandler.INSTANCE.sendToServer(new PacketFetchItem(candidate.entry, slot.slotNumber, toMove)); + PacketHandler.INSTANCE.sendToServer(new PacketFetchItem(db.getGeneration(), candidate.entry, slot.slotNumber, toMove)); slotsToProcess &= ~mask; current += toMove; } @@ -188,11 +194,11 @@ public class InventoryPanelNEIOverlayHandler implements IOverlayHandler { return false; } - private Candidate findAllCandidates(PositionedStack pstack, GuiInventoryPanel gui, Candidate[] candidates) { + private Candidate findAllCandidates(PositionedStack pstack, GuiInventoryPanel gui, InventoryDatabaseClient db, Candidate[] candidates) { Candidate bestInventory = null; Candidate bestNetwork = null; for(ItemStack istack : pstack.items) { - Candidate candidate = findCandidates(istack, gui, candidates); + Candidate candidate = findCandidates(istack, gui, db, candidates); if(candidate.available > 0) { if(bestInventory == null || bestInventory.available < candidate.available) { bestInventory = candidate; @@ -211,7 +217,7 @@ public class InventoryPanelNEIOverlayHandler implements IOverlayHandler { } } - private Candidate findCandidates(ItemStack stack, GuiInventoryPanel gui, Candidate[] candidates) { + private Candidate findCandidates(ItemStack stack, GuiInventoryPanel gui, InventoryDatabaseClient db, Candidate[] candidates) { for(Candidate candidate : candidates) { if(candidate != null && InventoryUtils.canStack(candidate.stack, stack)) { return candidate; @@ -221,8 +227,7 @@ public class InventoryPanelNEIOverlayHandler implements IOverlayHandler { InventoryPanelContainer container = gui.getContainer(); findCandidates(candidate, stack, container.getReturnAreaSlots()); findCandidates(candidate, stack, container.getPlayerInventorySlots()); - if(candidate.available == 0) { - InventoryDatabaseClient db = gui.getDatabase(); + if(candidate.available == 0 && db != null) { candidate.entry = db.lookupItem(stack, null, false); System.out.println("Looked up DB entry: stack=" + stack + " entry="+candidate.entry); if(candidate.entry != null && candidate.entry.getCount() <= 0) { diff --git a/src/main/java/crazypants/enderio/machine/invpanel/server/AbstractInventory.java b/src/main/java/crazypants/enderio/machine/invpanel/server/AbstractInventory.java index 72c2b83a..484643e2 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/server/AbstractInventory.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/server/AbstractInventory.java @@ -63,7 +63,7 @@ abstract class AbstractInventory { } } - abstract void scanInventory(InventoryDatabaseServer db, int aiIndex); + abstract int scanInventory(InventoryDatabaseServer db, int aiIndex); abstract int extractItem(InventoryDatabaseServer db, ItemEntry entry, int slot, int aiIndex, int count); diff --git a/src/main/java/crazypants/enderio/machine/invpanel/server/DSUInventory.java b/src/main/java/crazypants/enderio/machine/invpanel/server/DSUInventory.java index a6fd798f..72ef0072 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/server/DSUInventory.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/server/DSUInventory.java @@ -11,12 +11,13 @@ class DSUInventory extends AbstractInventory { } @Override - public void scanInventory(InventoryDatabaseServer db, int aiIndex) { + public int scanInventory(InventoryDatabaseServer db, int aiIndex) { if (slotItems.length != 1) { reset(db, 1, aiIndex); } ItemStack stack = dsu.getStoredItemType(); updateSlot(db, 0, aiIndex, stack); + return 1; } @Override diff --git a/src/main/java/crazypants/enderio/machine/invpanel/server/InventoryDatabaseServer.java b/src/main/java/crazypants/enderio/machine/invpanel/server/InventoryDatabaseServer.java index c9ba6d39..b8fc41f6 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/server/InventoryDatabaseServer.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/server/InventoryDatabaseServer.java @@ -1,25 +1,46 @@ package crazypants.enderio.machine.invpanel.server; +import crazypants.enderio.conduit.item.ItemConduitNetwork; import crazypants.enderio.conduit.item.NetworkedInventory; import crazypants.enderio.machine.invpanel.InventoryDatabase; +import crazypants.enderio.machine.invpanel.PacketDatabaseReset; import crazypants.enderio.network.CompressedDataInput; import crazypants.enderio.network.CompressedDataOutput; +import crazypants.enderio.network.PacketHandler; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; public class InventoryDatabaseServer extends InventoryDatabase { + private static final AtomicInteger nextGeneration = new AtomicInteger(); + + private final ItemConduitNetwork network; + private int networkChangeCount; + private AbstractInventory[] inventories; private int currentInventory; private ChangeLog changeLog; + private boolean sentToClient; + private int tickPause; - public InventoryDatabaseServer() { + public InventoryDatabaseServer(ItemConduitNetwork network) { + this.network = network; + } + + public ItemConduitNetwork getNetwork() { + return network; + } + + public boolean isCurrent() { + return networkChangeCount == network.getChangeCount(); } public void addChangeLog(ChangeLog cl) { @@ -43,6 +64,10 @@ public class InventoryDatabaseServer extends InventoryDatabase { public List decompressMissingItems(byte[] compressed) throws IOException { CompressedDataInput cdi = new CompressedDataInput(compressed); try { + int pktGeneration = cdi.readVariable(); + if(pktGeneration != generation) { + return Collections.emptyList(); + } int numIDs = cdi.readVariable(); ArrayList items = new ArrayList(numIDs); for(int i = 0; i < numIDs; i++) { @@ -62,7 +87,6 @@ public class InventoryDatabaseServer extends InventoryDatabase { CompressedDataOutput cdo = new CompressedDataOutput(); try { int count = items.size(); - cdo.writeVariable(generation); cdo.writeVariable(count); for(ItemEntry entry : items) { assert entry.dbID >= COMPLEX_DBINDEX_START; @@ -87,7 +111,6 @@ public class InventoryDatabaseServer extends InventoryDatabase { public byte[] compressItemList() throws IOException { CompressedDataOutput cdo = new CompressedDataOutput(); try { - cdo.writeVariable(generation); cdo.writeByte(0); for(Map.Entry entry : simpleRegsitry.entrySet()) { int count = entry.getValue().countItems(this); @@ -109,6 +132,7 @@ public class InventoryDatabaseServer extends InventoryDatabase { } } cdo.writeByte(0); + sentToClient = true; return cdo.getCompressed(); } finally { cdo.close(); @@ -118,7 +142,6 @@ public class InventoryDatabaseServer extends InventoryDatabase { public byte[] compressChangedItems(Collection items) throws IOException { CompressedDataOutput cdo = new CompressedDataOutput(); try { - cdo.writeVariable(generation); cdo.writeVariable(items.size()); for(ItemEntry entry : items) { cdo.writeVariable(entry.dbID); @@ -130,13 +153,23 @@ public class InventoryDatabaseServer extends InventoryDatabase { } } - public void setNetworkSources(List sources) { + public void resetDatabase() { simpleRegsitry.clear(); complexRegistry.clear(); complexItems.clear(); - generation++; currentInventory = 0; + if(sentToClient) { + PacketHandler.INSTANCE.sendToAll(new PacketDatabaseReset(generation)); + sentToClient = false; + } + } + public void updateNetworkSources() { + resetDatabase(); + generation = nextGeneration.incrementAndGet(); + networkChangeCount = network.getChangeCount(); + + List sources = network.getInventoryPanelSources(); if(sources == null || sources.isEmpty()) { this.inventories = null; } else { @@ -156,15 +189,27 @@ public class InventoryDatabaseServer extends InventoryDatabase { } } - public void scanNextInventory() { + public int getNumInventories() { + return (inventories == null) ? 0 : inventories.length; + } + + private void scanNextInventory() { if(inventories == null) { + tickPause = 20; return; } AbstractInventory inv = inventories[currentInventory]; - inv.scanInventory(this, currentInventory); + int slots = inv.scanInventory(this, currentInventory); currentInventory = (currentInventory+1) % inventories.length; + tickPause += 1 + (slots + 8) / 9; + } + + public void tick() { + if(--tickPause <= 0) { + scanNextInventory(); + } } void entryChanged(ItemEntry entry) { diff --git a/src/main/java/crazypants/enderio/machine/invpanel/server/NormalInventory.java b/src/main/java/crazypants/enderio/machine/invpanel/server/NormalInventory.java index 869e1f8d..87ca9423 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/server/NormalInventory.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/server/NormalInventory.java @@ -12,13 +12,13 @@ class NormalInventory extends AbstractInventory { } @Override - void scanInventory(InventoryDatabaseServer db, int aiIndex) { + int scanInventory(InventoryDatabaseServer db, int aiIndex) { ISidedInventory inv = ni.getInventoryRecheck(); int side = ni.getInventorySide(); int[] slotIndices = inv.getAccessibleSlotsFromSide(side); if (slotIndices == null || slotIndices.length == 0) { setEmpty(db, aiIndex); - return; + return 0; } int count = slotIndices.length; if (count != slotItems.length) { @@ -32,6 +32,7 @@ class NormalInventory extends AbstractInventory { } updateSlot(db, slot, aiIndex, stack); } + return count; } @Override