diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java index 2de60c0e..5d6223fa 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java @@ -31,7 +31,7 @@ public class ItemConduitNetwork extends AbstractConduitNetwork inventories = new ArrayList(); - private final Map invMap = new HashMap(); + private final Map> invMap = new HashMap>(); private final Map conMap = new HashMap(); @@ -68,17 +68,35 @@ public class ItemConduitNetwork extends AbstractConduitNetwork getOrCreate(BlockCoord bc) { + List res = invMap.get(bc); + if(res == null) { + res = new ArrayList(); + invMap.put(bc, res); + } + return res; + } + public void inventoryRemoved(ItemConduit itemConduit, int x, int y, int z) { BlockCoord bc = new BlockCoord(x, y, z); - NetworkedInventory inv = invMap.remove(bc); - if(inv != null) { - inventories.remove(inv); + List invs = getOrCreate(bc); + NetworkedInventory remove = null; + for (NetworkedInventory ni : invs) { + if(ni.con.getLocation().equals(itemConduit.getLocation())) { + remove = ni; + break; + } } - requiresSort = true; + if(remove != null) { + invs.remove(remove); + inventories.remove(remove); + requiresSort = true; + } + } public void routesChanged() { @@ -86,43 +104,55 @@ public class ItemConduitNetwork extends AbstractConduitNetwork= item.stackSize) { - //TODO: I was returning null here as per the API but quarries plus - //was interpreting this as nothing being taken - ItemStack result = item.copy(); - result.stackSize = 0; - return result; + BlockCoord loc = itemConduit.getLocation().getLocation(side); + + ItemStack result = null; + List invs = getOrCreate(loc); + for (NetworkedInventory inv : invs) { + + if(inv.con.getLocation().equals(loc)) { + + int numInserted = inv.insertIntoTargets(item.copy()); + if(numInserted >= item.stackSize) { + //TODO: I was returning null here as per the API but quarries plus + //was interpreting this as nothing being taken + result = item.copy(); + result.stackSize = 0; + return result; + } + if(result == null) { + result = item.copy(); + } + result.stackSize -= numInserted; + } } - ItemStack result = item.copy(); - result.stackSize -= numInserted; + return result; } - public List getTargetsForExtraction(BlockCoord extractFrom, ItemStack input) { + public List getTargetsForExtraction(BlockCoord extractFrom, IItemConduit con, ItemStack input) { List result = new ArrayList(); - NetworkedInventory source = invMap.get(extractFrom); - if(source == null) { - return result; - } - if(source.sendPriority == null) { - return result; - } + List invs = getOrCreate(extractFrom); + for (NetworkedInventory source : invs) { - for (Target t : source.sendPriority) { - ItemFilter f = t.inv.con.getOutputFilter(t.inv.conDir); - if(input == null || f == null || f.doesItemPassFilter(input)) { - String s = "[" + t.distance + "] " + Lang.localize(t.inv.inv.getInventoryName(), false); - result.add(s); + if(source.con.getLocation().equals(con.getLocation())) { + if(source != null && source.sendPriority != null) { + for (Target t : source.sendPriority) { + ItemFilter f = t.inv.con.getOutputFilter(t.inv.conDir); + if(input == null || f == null || f.doesItemPassFilter(input)) { + String s = Lang.localize(t.inv.inv.getInventoryName(), false) + " " + t.inv.location + " Distance [" + t.distance + "] "; + result.add(s); + } + } + } } } + return result; } @@ -410,7 +440,8 @@ public class ItemConduitNetwork extends AbstractConduitNetwork result = new HashMap(); + //Map result = new HashMap(); + List result = new ArrayList(); for (NetworkedInventory other : inventories) { if((con.isSelfFeedEnabled(conDir) || (other != this)) @@ -420,7 +451,8 @@ public class ItemConduitNetwork extends AbstractConduitNetwork result, Map visited, List steps, int distance) { + private void calculateDistances(List targets, Map visited, List steps, int distance) { if(steps == null || steps.isEmpty()) { return; } @@ -452,7 +484,7 @@ public class ItemConduitNetwork extends AbstractConduitNetwork distance) { target.distance = distance; } @@ -473,7 +505,16 @@ public class ItemConduitNetwork extends AbstractConduitNetwork targets, IItemConduit con, ForgeDirection dir) { + for (Target target : targets) { + if(target.inv.conDir == dir && target.inv.con.getLocation().equals(con.getLocation())) { + return target; + } + } + return null; } private int distanceTo(NetworkedInventory other) { diff --git a/src/main/java/crazypants/enderio/machine/monitor/MJReaderPacketHandler.java b/src/main/java/crazypants/enderio/machine/monitor/MJReaderPacketHandler.java index 7684e6dc..ef5ba4c0 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/MJReaderPacketHandler.java +++ b/src/main/java/crazypants/enderio/machine/monitor/MJReaderPacketHandler.java @@ -187,7 +187,7 @@ public class MJReaderPacketHandler { sb.append(input.getDisplayName()); } sb.append(" "); - List targets = icn.getTargetsForExtraction(conduit.getLocation().getLocation(dir), input); + List targets = icn.getTargetsForExtraction(conduit.getLocation().getLocation(dir), conduit, input); if(targets.isEmpty()) { sb.append(" "); sb.append(Lang.localize("gui.mjReader.noOutputs")); @@ -199,6 +199,7 @@ public class MJReaderPacketHandler { for (String str : targets) { sb.append(" - "); sb.append(str); + sb.append(" "); sb.append("\n"); } } diff --git a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java index 37bef890..e8a2fea0 100644 --- a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java @@ -692,6 +692,7 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe if(block != EnderIO.blockCapacitorBank) { receptorsDirty = true; getController().masterReceptorsDirty = true; + getController().redstoneStateDirty = true; } redstoneStateDirty = true; }