diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 3da6973e..2539bc3a 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -96,6 +96,12 @@ item.itemExtractSpeedDowngrade.tooltip.basic.line1=Downgrade for item conduits item.itemExtractSpeedDowngrade.tooltip.detailed.line1=Reduces speed to 1 item.itemExtractSpeedDowngrade.tooltip.detailed.line2=item per extraction +item.itemExtractInventoryPanelUpgrade.name=Remote Awareness Upgrade +item.itemExtractInventoryPanelUpgrade.tooltip.basic.line1=Inventory Panel Remote Awareness +item.itemExtractInventoryPanelUpgrade.tooltip.detailed.line1=Allows Inventory Panels attached +item.itemExtractInventoryPanelUpgrade.tooltip.detailed.line2=to this network to see and extract +item.itemExtractInventoryPanelUpgrade.tooltip.detailed.line3=items from this inventory + enderio.itemGasConduit.name=Gas Conduit enderio.itemGasConduit.tooltip.maxExtract=Max Extract: @@ -473,6 +479,7 @@ tile.blockInventoryPanel.name=Inventory Panel enderio.gui.inventorypanel.header.crafting=Crafting grid enderio.gui.inventorypanel.header.return=Return area enderio.gui.inventorypanel.info.filter= +enderio.gui.inventorypanel.info.offline= enderio.gui.inventorypanel.tooltip.return.line1=Item return area enderio.gui.inventorypanel.tooltip.return.line2=Items placed here can be extracted enderio.gui.inventorypanel.tooltip.return.line3=by an item conduit diff --git a/resources/assets/enderio/textures/items/extractInventoryPanelUpgrade.png b/resources/assets/enderio/textures/items/extractInventoryPanelUpgrade.png new file mode 100644 index 00000000..80312a4d Binary files /dev/null and b/resources/assets/enderio/textures/items/extractInventoryPanelUpgrade.png differ diff --git a/src/main/java/crazypants/enderio/conduit/item/IItemConduit.java b/src/main/java/crazypants/enderio/conduit/item/IItemConduit.java index e4ed9c9b..05298529 100644 --- a/src/main/java/crazypants/enderio/conduit/item/IItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/IItemConduit.java @@ -49,7 +49,9 @@ public interface IItemConduit extends IConduit, IItemDuct, IExtractor { void setSpeedUpgrade(ForgeDirection dir, ItemStack upgrade); ItemStack getSpeedUpgrade(ForgeDirection dir); - + + boolean hasInventoryPanelUpgrade(ForgeDirection dir); + int getOutputPriority(ForgeDirection dir); void setOutputPriority(ForgeDirection dir, int priority); diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java index 0d15d8da..3303bf11 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java @@ -315,12 +315,16 @@ public class ItemConduit extends AbstractConduit implements IItemConduit { @Override public void setSpeedUpgrade(ForgeDirection dir, ItemStack upgrade) { + boolean hadIPU = hasInventoryPanelUpgrade(dir); if(upgrade != null) { speedUpgrades.put(dir, upgrade); } else { speedUpgrades.remove(dir); } setClientStateDirty(); + if(network != null && hadIPU != hasInventoryPanelUpgrade(dir)) { + network.inventoryPanelSourcesChanged(); + } } @Override @@ -328,6 +332,12 @@ public class ItemConduit extends AbstractConduit implements IItemConduit { return speedUpgrades.get(dir); } + @Override + public boolean hasInventoryPanelUpgrade(ForgeDirection dir) { + ItemStack upgrade = speedUpgrades.get(dir); + return upgrade != null && EnderIO.itemExtractSpeedUpgrade.getSpeedUpgrade(upgrade) == SpeedUpgrade.INVENTORY_PANEL; + } + @Override public int getMetaData() { return metaData; diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java index f0a06f3f..443a8b41 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java @@ -1,5 +1,6 @@ package crazypants.enderio.conduit.item; +import crazypants.enderio.EnderIO; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -66,11 +67,14 @@ public class ItemConduitNetwork extends AbstractConduitNetwork getSourcesForColor(DyeColor color) { + public List getInventoryPanelSources() { ArrayList res = new ArrayList(); for(NetworkedInventory inv : inventories) { - if(inv.canExtract() && inv.con.getInputColor(inv.conDir) == color && !inv.isInventoryPanel()) { - res.add(inv); + ItemStack speedUpgradeStack = inv.con.getSpeedUpgrade(inv.conDir); + if(speedUpgradeStack != null) { + if(EnderIO.itemExtractSpeedUpgrade.getSpeedUpgrade(speedUpgradeStack) == SpeedUpgrade.INVENTORY_PANEL) { + res.add(inv); + } } } return res; @@ -107,6 +111,10 @@ public class ItemConduitNetwork extends AbstractConduitNetwork faceModes; - private int[] allSlots; + private final int[] allSlots; protected boolean notifyNeighbours = false; @@ -238,27 +238,8 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi } if(worldObj.isRemote) { - // check if the block on the client needs to update its texture - if(isActive() != lastActive) { - ticksSinceActiveChanged++; - if(ticksSinceActiveChanged > 20 || isActive()) { - ticksSinceActiveChanged = 0; - lastActive = isActive(); - forceClientUpdate = false; - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - } - } - - if(hasSound()) { - updateSound(); - } - - if(forceClientUpdate) { - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - forceClientUpdate = false; - } + updateEntityClient(); return; - } // else is server, do all logic only on the server boolean requiresClientSync = forceClientUpdate; @@ -293,6 +274,27 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi } + protected void updateEntityClient() { + // check if the block on the client needs to update its texture + if(isActive() != lastActive) { + ticksSinceActiveChanged++; + if(ticksSinceActiveChanged > 20 || isActive()) { + ticksSinceActiveChanged = 0; + lastActive = isActive(); + forceClientUpdate = true; + } + } + + if(hasSound()) { + updateSound(); + } + + if(forceClientUpdate) { + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + forceClientUpdate = false; + } + } + protected boolean doSideIo() { if(faceModes == null) { return false; diff --git a/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java index 1168f526..2ad84ac3 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java @@ -7,6 +7,7 @@ import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.network.PacketHandler; +import java.util.List; import java.util.Random; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java index 5ae0d236..b32ea0e4 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java @@ -2,6 +2,7 @@ package crazypants.enderio.machine.invpanel; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.conduit.item.SpeedUpgrade; import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.TextFieldEIO; @@ -22,6 +23,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; @@ -53,6 +55,7 @@ public class GuiInventoryPanel extends GuiMachineBase { private final String headerReturn; private final String headerInventory; private final String infoTextFilter; + private final String infoTextOffline; public GuiInventoryPanel(TileInventoryPanel te, Container container) { super(te, container); @@ -78,6 +81,7 @@ public class GuiInventoryPanel extends GuiMachineBase { headerReturn = Lang.localize("gui.inventorypanel.header.return"); headerInventory = Lang.localize("container.inventory", false); infoTextFilter = Lang.localize("gui.inventorypanel.info.filter"); + infoTextOffline = Lang.localize("gui.inventorypanel.info.offline"); ArrayList list = new ArrayList(); TooltipAddera.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.return.line"); @@ -156,8 +160,15 @@ public class GuiInventoryPanel extends GuiMachineBase { super.drawGuiContainerBackgroundLayer(par1, par2, par3); - if(!tfFilter.isFocused() && tfFilter.getText().isEmpty()) { - fr.drawString(infoTextFilter, tfFilter.xPosition, tfFilter.yPosition, 0x707070); + if(getTileEntity().isActive()) { + tfFilter.setEnabled(true); + if(!tfFilter.isFocused() && tfFilter.getText().isEmpty()) { + fr.drawString(infoTextFilter, tfFilter.xPosition, tfFilter.yPosition, 0x707070); + } + } else { + tfFilter.setEnabled(false); + tfFilter.setText(""); + fr.drawString(infoTextOffline, tfFilter.xPosition, tfFilter.yPosition, 0x707070); } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabaseClient.java b/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabaseClient.java index 5d5933e0..489bf4dc 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabaseClient.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabaseClient.java @@ -393,7 +393,7 @@ public class InventoryDatabaseClient extends InventoryDatabase= items.length) { + ISidedInventory inv = ni.getInventoryRecheck(); + int side = ni.getInventorySide(); + int[] slotIndices = inv.getAccessibleSlotsFromSide(side); + if(slotIndices == null || slot >= slotIndices.length) { return 0; } - ItemStack stack = items[slot]; - if(stack == null || db.lookupItem(stack, entry, false) != entry) { + int invSlot = slotIndices[slot]; + ItemStack stack = inv.getStackInSlot(invSlot); + if(stack == null || !inv.canExtractItem(invSlot, stack, side)) { + return 0; + } + + if(db.lookupItem(stack, entry, false) != entry) { return 0; } @@ -307,7 +323,7 @@ public class InventoryDatabaseServer extends InventoryDatabase 0; } @Override public void doUpdate() { - if(worldObj.isRemote) return; + if(worldObj.isRemote) { + updateEntityClient(); + return; + } if(shouldDoWorkThisTick(2)) { scanNetwork(); @@ -112,6 +114,11 @@ public class TileInventoryPanel extends AbstractMachineEntity { if(dbServer != null && shouldDoWorkThisTick(20)) { dbServer.sendChangeLogs(); } + + if(forceClientUpdate) { + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + markDirty(); + } } private void scanNetwork() { @@ -144,13 +151,11 @@ public class TileInventoryPanel extends AbstractMachineEntity { if(icn != null) { networkChangeCount = icn.getChangeCount(); + sources = icn.getInventoryPanelSources(); - ConnectionMode mode = conduit.getConnectionMode(facingDir); - System.out.println("updateNetwork: mode="+mode); - if(mode == ConnectionMode.OUTPUT || mode == ConnectionMode.IN_OUT) { - DyeColor color = conduit.getOutputColor(facingDir); - sources = icn.getSourcesForColor(color); - System.out.println("Color="+color+" sources="+sources.size()); + if(numSources != sources.size()) { + numSources = sources.size(); + forceClientUpdate = true; } } @@ -167,11 +172,18 @@ public class TileInventoryPanel extends AbstractMachineEntity { } @Override - public void readCommon(NBTTagCompound nbtRoot) { - super.readCommon(nbtRoot); + public void readCustomNBT(NBTTagCompound nbtRoot) { + super.readCustomNBT(nbtRoot); + numSources = nbtRoot.getInteger("numSources"); updateItemFilter(); } + @Override + public void writeCustomNBT(NBTTagCompound nbtRoot) { + super.writeCustomNBT(nbtRoot); + nbtRoot.setInteger("numSources", numSources); + } + @Override public String getMachineName() { return ModObject.blockInventoryPanel.unlocalisedName;