From 7e958a1a3b9f72649bf300ccde05edcccf3a41b4 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sun, 2 Mar 2014 21:40:19 +0800 Subject: [PATCH 1/3] Removed debug. --- common/crazypants/enderio/machine/monitor/TilePowerMonitor.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/common/crazypants/enderio/machine/monitor/TilePowerMonitor.java b/common/crazypants/enderio/machine/monitor/TilePowerMonitor.java index 34abe379..398ef424 100644 --- a/common/crazypants/enderio/machine/monitor/TilePowerMonitor.java +++ b/common/crazypants/enderio/machine/monitor/TilePowerMonitor.java @@ -136,8 +136,6 @@ public class TilePowerMonitor extends AbstractMachineEntity implements IInternal powerHandler.setEnergy(powerHandler.getEnergyStored() - energyPerTick); boolean update = worldObj.getWorldInfo().getWorldTotalTime() % 10 == 0; - update = true; - NetworkPowerManager pm = getPowerManager(); if(pm != null && update) { update(pm); From cb2cd58040d407a239c542393535a4e308dd9624 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Mon, 3 Mar 2014 15:01:16 +0800 Subject: [PATCH 2/3] #517 Item conduit filters fail when more than one conduit ends at one chest --- .../conduit/item/ItemConduitNetwork.java | 116 ++++++++++++------ .../monitor/MJReaderPacketHandler.java | 2 +- 2 files changed, 80 insertions(+), 38 deletions(-) diff --git a/common/crazypants/enderio/conduit/item/ItemConduitNetwork.java b/common/crazypants/enderio/conduit/item/ItemConduitNetwork.java index eb4b90d3..fac33194 100644 --- a/common/crazypants/enderio/conduit/item/ItemConduitNetwork.java +++ b/common/crazypants/enderio/conduit/item/ItemConduitNetwork.java @@ -32,7 +32,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(); @@ -69,17 +69,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() { @@ -87,43 +105,56 @@ 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.getInvName(), 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.getInvName(), false) + " " + t.inv.location + " Distance [" + t.distance + "] "; + result.add(s); + } + } + } } } + return result; } @@ -411,7 +442,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)) @@ -421,7 +453,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; } @@ -453,7 +486,7 @@ public class ItemConduitNetwork extends AbstractConduitNetwork distance) { target.distance = distance; } @@ -474,7 +507,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/common/crazypants/enderio/machine/monitor/MJReaderPacketHandler.java b/common/crazypants/enderio/machine/monitor/MJReaderPacketHandler.java index c3117ce1..f3876846 100644 --- a/common/crazypants/enderio/machine/monitor/MJReaderPacketHandler.java +++ b/common/crazypants/enderio/machine/monitor/MJReaderPacketHandler.java @@ -230,7 +230,7 @@ public class MJReaderPacketHandler implements IPacketProcessor { 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")); From 8b6095fd5d8f1377d961db3c3a55690bd62a60db Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Mon, 3 Mar 2014 15:11:14 +0800 Subject: [PATCH 3/3] #512Capacitor banks not responding to redstone signals --- .../enderio/machine/monitor/MJReaderPacketHandler.java | 1 + common/crazypants/enderio/machine/power/TileCapacitorBank.java | 1 + 2 files changed, 2 insertions(+) diff --git a/common/crazypants/enderio/machine/monitor/MJReaderPacketHandler.java b/common/crazypants/enderio/machine/monitor/MJReaderPacketHandler.java index f3876846..4feaef3b 100644 --- a/common/crazypants/enderio/machine/monitor/MJReaderPacketHandler.java +++ b/common/crazypants/enderio/machine/monitor/MJReaderPacketHandler.java @@ -242,6 +242,7 @@ public class MJReaderPacketHandler implements IPacketProcessor { for (String str : targets) { sb.append(" - "); sb.append(str); + sb.append(" "); sb.append("\n"); } } diff --git a/common/crazypants/enderio/machine/power/TileCapacitorBank.java b/common/crazypants/enderio/machine/power/TileCapacitorBank.java index 9912be32..16ed47a8 100644 --- a/common/crazypants/enderio/machine/power/TileCapacitorBank.java +++ b/common/crazypants/enderio/machine/power/TileCapacitorBank.java @@ -694,6 +694,7 @@ public class TileCapacitorBank extends TileEntity implements IInternalPowerRecep if(blockId != ModObject.blockCapacitorBank.actualId) { receptorsDirty = true; getController().masterReceptorsDirty = true; + getController().redstoneStateDirty = true; } redstoneStateDirty = true; }