From d5250cacc15c9ba5fdf4e1cc375603a3c6db613a Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Wed, 4 Jun 2014 17:01:34 +0800 Subject: [PATCH] Oh so slowly getting there. --- .../gui/ExternalConnectionContainer.java | 96 +++++++------- .../enderio/conduit/gui/ItemSettings.java | 120 +++++++++--------- .../enderio/conduit/item/FilterRegister.java | 9 ++ .../enderio/conduit/item/ItemConduit.java | 22 +--- .../conduit/item/NetworkedInventory.java | 4 +- 5 files changed, 127 insertions(+), 124 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java b/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java index 5060d7d8..5ecfb4c3 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java +++ b/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java @@ -24,17 +24,17 @@ public class ExternalConnectionContainer extends Container { private IConduitBundle bundle; private ForgeDirection dir; private IItemConduit itemConduit; - + private IItemFilter inputFilter; private IItemFilter outputFilter; - + private int outputFilterUpgradeSlot = 36; private int inputFilterUpgradeSlot = 37; private int speedUpgradeSlot = 38; private int startFilterSlot = 39; private List slotLocations = new ArrayList(); - + List filterListeners = new ArrayList(); public ExternalConnectionContainer(InventoryPlayer playerInv, IConduitBundle bundle, ForgeDirection dir) { @@ -62,60 +62,64 @@ public class ExternalConnectionContainer extends Container { addSlotToContainer(new Slot(playerInv, i, x, y)); slotLocations.add(new Point(x, y)); } - + itemConduit = bundle.getConduit(IItemConduit.class); if(itemConduit != null) { - + x = 10; y = 67; FilterUpgradeInventory fi = new FilterUpgradeInventory(itemConduit, dir, false); addSlotToContainer(new FilterSlot(fi, 0, x, y)); slotLocations.add(new Point(x, y)); - + x = 10; y = 67; fi = new FilterUpgradeInventory(itemConduit, dir, true); addSlotToContainer(new FilterSlot(fi, 0, x, y)); slotLocations.add(new Point(x, y)); - + x = 10; y = 85; SpeedUpgradesInventory si = new SpeedUpgradesInventory(itemConduit, dir); addSlotToContainer(new Slot(si, 0, x, y)); slotLocations.add(new Point(x, y)); - + addFilterSlots(dir); } } private void addFilterSlots(ForgeDirection dir) { - + + List slots; inputFilter = itemConduit.getInputFilter(dir); - List slots = inputFilter.getSlots(); - for(Slot slot : slots) { - addSlotToContainer(slot); - slotLocations.add(new Point(slot.xDisplayPosition, slot.yDisplayPosition)); - } - - outputFilter = itemConduit.getOutputFilter(dir); - slots = outputFilter.getSlots(); - for(Slot slot : slots) { - addSlotToContainer(slot); - slotLocations.add(new Point(slot.xDisplayPosition, slot.yDisplayPosition)); + if(inputFilter != null) { + slots = inputFilter.getSlots(); + for (Slot slot : slots) { + addSlotToContainer(slot); + slotLocations.add(new Point(slot.xDisplayPosition, slot.yDisplayPosition)); + } } + outputFilter = itemConduit.getOutputFilter(dir); + if(outputFilter != null) { + slots = outputFilter.getSlots(); + for (Slot slot : slots) { + addSlotToContainer(slot); + slotLocations.add(new Point(slot.xDisplayPosition, slot.yDisplayPosition)); + } + } } - - protected void filterChanged() { + + protected void filterChanged() { int slotsToRemove = inventorySlots.size() - startFilterSlot; - for(int i=0;i clz = Class.forName(className); @@ -36,6 +43,8 @@ public class FilterRegister { public static IItemFilter getFilterForUpgrade(ItemStack stack) { if(stack != null && stack.getItem() == Items.paper) { return new ItemFilter(true); + } else if(stack != null && stack.getItem() == Items.stick) { + return new ItemFilter(false); } return null; } diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java index 1867978c..8637fb52 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java @@ -199,12 +199,12 @@ public class ItemConduit extends AbstractConduit implements IItemConduit { @Override public IItemFilter getInputFilter(ForgeDirection dir) { - IItemFilter res = inputFilters.get(dir); - if(res == null) { - res = new ItemFilter(); - inputFilters.put(dir, res); - } - return res; + return inputFilters.get(dir); + } + + @Override + public IItemFilter getOutputFilter(ForgeDirection dir) { + return outputFilters.get(dir); } @Override @@ -251,16 +251,6 @@ public class ItemConduit extends AbstractConduit implements IItemConduit { return metaData; } - @Override - public IItemFilter getOutputFilter(ForgeDirection dir) { - IItemFilter res = outputFilters.get(dir); - if(res == null) { - res = new ItemFilter(); - outputFilters.put(dir, res); - } - return res; - } - @Override public void setExtractionRedstoneMode(RedstoneControlMode mode, ForgeDirection dir) { extractionModes.put(dir, mode); diff --git a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java index a6ae0bd1..77f5e024 100644 --- a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java +++ b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java @@ -78,7 +78,7 @@ class NetworkedInventory { } boolean isSticky() { - return con.getOutputFilter(conDir).isValid() && con.getOutputFilter(conDir).isSticky(); + return con.getOutputFilter(conDir) != null && con.getOutputFilter(conDir).isValid() && con.getOutputFilter(conDir).isSticky(); } int getPriority() { @@ -208,7 +208,7 @@ class NetworkedInventory { for (Target target : targets) { if(target.stickyInput && !matchedStickyInput) { IItemFilter of = target.inv.con.getOutputFilter(target.inv.conDir); - matchedStickyInput = of.isValid() && of.doesItemPassFilter(toExtract); + matchedStickyInput = of != null && of.isValid() && of.doesItemPassFilter(toExtract); } if(target.stickyInput || !matchedStickyInput) { if(target.inv.recheckInv) {