Limited Item Filter (#143)

* Limited Item Filter * simplify inverted limit Co-authored-by: Alexander Anishin <[email protected]> * Update src/main/java/crazypants/enderio/conduit/item/filter/ItemFilterLimited.java Co-authored-by: Alexander Anishin <[email protected]> * Update src/main/java/crazypants/enderio/conduit/item/filter/ItemFilterLimited.java Co-authored-by: Alexander Anishin <[email protected]> * Update ItemFilterLimited.java --------- Co-authored-by: Alexander Anishin <[email protected]> Co-authored-by: Martin Robertz <[email protected]>
GTNewHorizons · Dec 20, 2023 · 9f3f824 · 9f3f824
1 parent 23a5484
commit 9f3f824
Show file tree

Hide file tree

Showing 11 changed files with 579 additions and 12 deletions.
diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java
@@ -62,6 +62,7 @@
 import crazypants.enderio.conduit.item.filter.ItemBasicItemFilter;
 import crazypants.enderio.conduit.item.filter.ItemBigItemFilter;
 import crazypants.enderio.conduit.item.filter.ItemExistingItemFilter;
+import crazypants.enderio.conduit.item.filter.ItemLimitedItemFilter;
 import crazypants.enderio.conduit.item.filter.ItemModItemFilter;
 import crazypants.enderio.conduit.item.filter.ItemPowerItemFilter;
 import crazypants.enderio.conduit.liquid.ItemLiquidConduit;
@@ -264,6 +265,7 @@ public class EnderIO {
  public static ItemBasicItemFilter itemBasicFilterUpgrade;
  public static ItemBigItemFilter itemBigFilterUpgrade;
  public static ItemExistingItemFilter itemExistingItemFilter;
+ public static ItemLimitedItemFilter itemLimitedItemFilter;
  public static ItemModItemFilter itemModItemFilter;
  public static ItemPowerItemFilter itemPowerItemFilter;
  public static ItemExtractSpeedUpgrade itemExtractSpeedUpgrade;
@@ -469,6 +471,7 @@ public void preInit(FMLPreInitializationEvent event) {
  itemBasicFilterUpgrade = ItemBasicItemFilter.create();
  itemBigFilterUpgrade = ItemBigItemFilter.create();
  itemExistingItemFilter = ItemExistingItemFilter.create();
+ itemLimitedItemFilter = ItemLimitedItemFilter.create();
  itemModItemFilter = ItemModItemFilter.create();
  itemPowerItemFilter = ItemPowerItemFilter.create();
  itemExtractSpeedUpgrade = ItemExtractSpeedUpgrade.create();

diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java
@@ -18,6 +18,7 @@ public enum ModObject {
  itemBasicFilterUpgrade,
  itemBigFilterUpgrade,
  itemExistingItemFilter,
+ itemLimitedItemFilter,
  itemModItemFilter,
  itemPowerItemFilter,
  itemExtractSpeedUpgrade,

diff --git a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java
@@ -601,6 +601,9 @@ public static void addRecipes() {
  'f',
  advFilter);
 
+ ItemStack limitedFilter = new ItemStack(EnderIO.itemLimitedItemFilter, 1, 0);
+ addShaped(limitedFilter, " ", "cfc", " ", 'c', new ItemStack(Items.comparator, 1, 0), 'f', advFilter);
+
  ItemStack powerFilt = new ItemStack(EnderIO.itemPowerItemFilter);
  addShaped(powerFilt, " p ", "pcp", " p ", 'p', Items.paper, 'c', EnderIO.itemConduitProbe);
 

diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/LimitedItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/LimitedItemFilterGui.java
@@ -0,0 +1,202 @@
+package crazypants.enderio.conduit.gui.item;
+
+import net.minecraft.client.gui.GuiButton;
+
+import org.lwjgl.opengl.GL11;
+
+import com.enderio.core.client.gui.button.CycleButton;
+import com.enderio.core.client.gui.button.IconButton;
+import com.enderio.core.client.gui.button.ToggleButton;
+
+import crazypants.enderio.EnderIO;
+import crazypants.enderio.conduit.gui.GuiExternalConnection;
+import crazypants.enderio.conduit.item.filter.FuzzyMode;
+import crazypants.enderio.conduit.item.filter.ItemFilter;
+import crazypants.enderio.gui.GuiContainerBaseEIO;
+import crazypants.enderio.gui.IconEIO;
+
+public class LimitedItemFilterGui implements IItemFilterGui {
+
+ private static final int ID_WHITELIST = GuiExternalConnection.nextButtonId();
+ private static final int ID_NBT = GuiExternalConnection.nextButtonId();
+ private static final int ID_META = GuiExternalConnection.nextButtonId();
+ private static final int ID_ORE_DICT = GuiExternalConnection.nextButtonId();
+ private static final int ID_STICKY = GuiExternalConnection.nextButtonId();
+ private static final int ID_FUZZY = GuiExternalConnection.nextButtonId();
+
+ private final GuiContainerBaseEIO gui;
+
+ private final ToggleButton useMetaB;
+ private final ToggleButton useNbtB;
+ private final IconButton whiteListB;
+ private final ToggleButton useOreDictB;
+ private final ToggleButton stickyB;
+ private final CycleButton<FuzzyMode> fuzzyB;
+
+ private final IItemFilterContainer filterContainer;
+ private final ItemFilter filter;
+ private int buttonIdOffset;
+ private int xOffset;
+ private int yOffset;
+ final boolean isStickyModeAvailable;
+ private boolean isInput;
+
+ public LimitedItemFilterGui(GuiContainerBaseEIO gui, IItemFilterContainer filterContainer,
+ boolean isStickyModeAvailable, boolean isInput) {
+ this(gui, filterContainer, isStickyModeAvailable, isInput, isInput ? 104 : 6, 96, isInput ? 0 : 256);
+ }
+
+ public LimitedItemFilterGui(GuiContainerBaseEIO gui, IItemFilterContainer filterContainer,
+ boolean isStickyModeAvailable, boolean isInput, int xOffset, int yOffset, int buttonIdOffset) {
+ this.gui = gui;
+ this.isStickyModeAvailable = isStickyModeAvailable;
+ this.filterContainer = filterContainer;
+ this.xOffset = xOffset;
+ this.yOffset = yOffset;
+ this.buttonIdOffset = buttonIdOffset;
+ this.isInput = isInput;
+
+ filter = filterContainer.getItemFilter();
+
+ int butLeft = xOffset;
+ int x = butLeft;
+ int y = yOffset + 40;
+ whiteListB = new IconButton(gui, ID_WHITELIST + buttonIdOffset, x, y, IconEIO.FILTER_WHITELIST);
+ whiteListB.setToolTip(getWhitelistTooltips(false));
+
+ x += 16;
+ useMetaB = new ToggleButton(gui, ID_META + buttonIdOffset, x, y, IconEIO.FILTER_META_OFF, IconEIO.FILTER_META);
+ useMetaB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchMetaData"));
+ useMetaB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreMetaData"));
+ useMetaB.setPaintSelectedBorder(false);
+
+ x += 16;
+ stickyB = new ToggleButton(
+ gui,
+ ID_STICKY + buttonIdOffset,
+ x,
+ y,
+ IconEIO.FILTER_STICKY_OFF,
+ IconEIO.FILTER_STICKY);
+ stickyB.setSelectedToolTip(EnderIO.lang.localizeList("gui.conduit.item.stickyEnabled"));
+ stickyB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.stickyDisbaled"));
+ stickyB.setPaintSelectedBorder(false);
+
+ if (isStickyModeAvailable) x += 16;
+ useOreDictB = new ToggleButton(
+ gui,
+ ID_ORE_DICT + buttonIdOffset,
+ x,
+ y,
+ IconEIO.FILTER_ORE_DICT_OFF,
+ IconEIO.FILTER_ORE_DICT);
+ useOreDictB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.oreDicEnabled"));
+ useOreDictB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.oreDicDisabled"));
+ useOreDictB.setPaintSelectedBorder(false);
+
+ x += 16;
+ useNbtB = new ToggleButton(gui, ID_NBT + buttonIdOffset, x, y, IconEIO.FILTER_NBT_OFF, IconEIO.FILTER_NBT);
+ useNbtB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchNBT"));
+ useNbtB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreNBT"));
+ useNbtB.setPaintSelectedBorder(false);
+
+ x += 16;
+ fuzzyB = new CycleButton(gui, ID_FUZZY + buttonIdOffset, x, y, FuzzyMode.class);
+ }
+
+ public void createFilterSlots() {
+ filter.createGhostSlots(gui.getGhostSlots(), xOffset + 1, yOffset + 1, new Runnable() {
+
+ @Override
+ public void run() {
+ sendFilterChange();
+ }
+ });
+ }
+
+ @Override
+ public void mouseClicked(int x, int y, int par3) {}
+
+ @Override
+ public void updateButtons() {
+ ItemFilter activeFilter = filter;
+
+ useNbtB.onGuiInit();
+ useNbtB.setSelected(activeFilter.isMatchNBT());
+
+ useOreDictB.onGuiInit();
+ useOreDictB.setSelected(activeFilter.isUseOreDict());
+
+ if (isStickyModeAvailable) {
+ stickyB.onGuiInit();
+ stickyB.setSelected(activeFilter.isSticky());
+ }
+
+ fuzzyB.onGuiInit();
+ fuzzyB.setMode(activeFilter.getFuzzyMode());
+
+ useMetaB.onGuiInit();
+ useMetaB.setSelected(activeFilter.isMatchMeta());
+
+ }
+
+ @Override
+ public void actionPerformed(GuiButton guiButton) {
+
+ if (guiButton.id == ID_META + buttonIdOffset) {
+ filter.setMatchMeta(useMetaB.isSelected());
+ sendFilterChange();
+ } else if (guiButton.id == ID_NBT + buttonIdOffset) {
+ filter.setMatchNBT(useNbtB.isSelected());
+ sendFilterChange();
+ } else if (guiButton.id == ID_STICKY + buttonIdOffset) {
+ filter.setSticky(stickyB.isSelected());
+ sendFilterChange();
+ } else if (guiButton.id == ID_ORE_DICT + buttonIdOffset) {
+ filter.setUseOreDict(useOreDictB.isSelected());
+ sendFilterChange();
+ } else if (guiButton.id == ID_FUZZY + buttonIdOffset) {
+ filter.setFuzzyMode(fuzzyB.getMode());
+ sendFilterChange();
+ } else if (guiButton.id == ID_WHITELIST + buttonIdOffset) {
+ filter.setBlacklist(!filter.isBlacklist());
+ sendFilterChange();
+ }
+ }
+
+ private void sendFilterChange() {
+ updateButtons();
+ filterContainer.onFilterChanged();
+ }
+
+ @Override
+ public void deactivate() {
+ useNbtB.detach();
+ useMetaB.detach();
+ useOreDictB.detach();
+ whiteListB.detach();
+ stickyB.detach();
+ fuzzyB.detach();
+ }
+
+ @Override
+ public void renderCustomOptions(int top, float par1, int par2, int par3) {
+ GL11.glColor3f(1, 1, 1);
+ gui.bindGuiTexture(1);
+ gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset, gui.getGuiTop() + yOffset, 0, 238, 18 * 5, 18);
+ gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset, gui.getGuiTop() + yOffset + 20, 0, 238, 18 * 5, 18);
+
+ }
+
+ private String[] getWhitelistTooltips(boolean isBlacklist) {
+ if (isBlacklist) {
+ return new String[] { EnderIO.lang.localize("gui.conduit.item.blacklist"),
+ EnderIO.lang.localize("gui.conduit.item.blacklist.tooltip.0"),
+ EnderIO.lang.localize("gui.conduit.item.blacklist.tooltip.1") };
+ } else {
+ return new String[] { EnderIO.lang.localize("gui.conduit.item.whitelist"),
+ EnderIO.lang.localize("gui.conduit.item.whitelist.tooltip.0"),
+ EnderIO.lang.localize("gui.conduit.item.whitelist.tooltip.1") };
+ }
+ }
+}
diff --git a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java
@@ -22,6 +22,7 @@
 
 import crazypants.enderio.conduit.ConnectionMode;
 import crazypants.enderio.conduit.item.filter.IItemFilter;
+import crazypants.enderio.conduit.item.filter.ItemFilterLimited;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.machine.invpanel.TileInventoryPanel;
 
@@ -155,19 +156,31 @@ private boolean transferItems() {
  int numSlots = slotIndices.length;
  ItemStack extractItem = null;
  int maxExtracted = con.getMaximumExtracted(conDir);
+ final IItemFilter filter = con.getInputFilter(conDir);
 
  int slot = -1;
  int slotChecksPerTick = Math.min(numSlots, ItemConduitNetwork.MAX_SLOT_CHECK_PER_TICK);
  for (int i = 0; i < slotChecksPerTick; i++) {
  int index = nextSlot(numSlots);
  slot = slotIndices[index];
  ItemStack item = getInventory().getStackInSlot(slot);
- if (canExtractItem(item)) {
- extractItem = item.copy();
- if (getInventory().canExtractItem(slot, extractItem, inventorySide)) {
- if (doTransfer(extractItem, slot, maxExtracted)) {
- setNextStartingSlot(slot);
- return true;
+ if (item != null) {
+ if (filter != null && filter.isLimited()) {
+ final int count = ((ItemFilterLimited) filter).getInsertLimitInv(getInventory(), item);
+ if (count <= 0) {
+ continue;
+ } else if (count < item.stackSize) {
+ item = item.copy();
+ item.stackSize = count;
+ }
+ }
+ if (canExtractItem(item)) {
+ extractItem = item.copy();
+ if (getInventory().canExtractItem(slot, extractItem, inventorySide)) {
+ if (doTransfer(extractItem, slot, maxExtracted)) {
+ setNextStartingSlot(slot);
+ return true;
+ }
  }
  }
  }
@@ -183,7 +196,11 @@ private boolean canExtractItem(ItemStack itemStack) {
  if (filter == null) {
  return true;
  }
- return filter.doesItemPassFilter(this, itemStack);
+ if (filter.isLimited()) {
+ return filter.isValid() && ((ItemFilterLimited) filter).doesItemPassFilterInv(this, itemStack);
+ } else {
+ return filter.doesItemPassFilter(this, itemStack);
+ }
  }
 
  private boolean doTransfer(ItemStack extractedItem, int slot, int maxExtract) {
@@ -278,7 +295,20 @@ private int insertItem(ItemStack item) {
  }
  IItemFilter filter = con.getOutputFilter(conDir);
  if (filter != null) {
- if (!filter.doesItemPassFilter(this, item)) {
+ if (filter.isLimited()) {
+ final int count = filter.getMaxCountThatCanPassFilter(item);
+ if (count <= 0) {
+ return 0;
+ } else {
+ final int maxInsert = ((ItemFilterLimited) filter).getInsertLimit(getInventory(), item);
+ if (maxInsert <= 0) {
+ return 0;
+ } else if (maxInsert < item.stackSize) {
+ item = item.copy();
+ item.stackSize = maxInsert;
+ }
+ }
+ } else if (!filter.doesItemPassFilter(this, item)) {
  return 0;
  }
  }

diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilter.java
@@ -41,10 +41,18 @@ public interface IItemFilter {
 
  boolean isValid();
 
+ default boolean isLimited() {
+ return false;
+ }
+
  boolean isSticky();
 
  void createGhostSlots(List<GhostSlot> slots, int xOffset, int yOffset, Runnable cb);
 
+ default int getMaxCountThatCanPassFilter(ItemStack item) {
+ return 1;
+ }
+
  int getSlotCount();
 
  default String getUnlocalizedName() {

diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java
@@ -98,7 +98,7 @@ public boolean doesItemPassFilter(ItemStack item) {
  return isBlacklist ? !allow : allow;
  }
 
- private boolean itemMatched(ItemStack item) {
+ protected boolean itemMatched(ItemStack item) {
  if (item == null) {
  return false;
  }
@@ -145,7 +145,7 @@ private boolean itemMatched(ItemStack item) {
  return matched;
  }
 
- private boolean isOreDicMatch(int filterItemIndex, ItemStack item) {
+ protected boolean isOreDicMatch(int filterItemIndex, ItemStack item) {
  int[] ids1 = getCachedIds(filterItemIndex);
  if (ids1 == null || ids1.length == 0) {
  return false;
@@ -164,7 +164,7 @@ private boolean isOreDicMatch(int filterItemIndex, ItemStack item) {
  return false;
  }
 
- private boolean isNBTMatch(ItemStack filter, ItemStack item) {
+ protected boolean isNBTMatch(ItemStack filter, ItemStack item) {
  if (filter.stackTagCompound == null && (item.stackTagCompound == null || item.stackTagCompound.hasNoTags()))
  return true;
  if (filter.stackTagCompound == null || item.stackTagCompound == null) return false;
@@ -203,7 +203,7 @@ public boolean isValid() {
  return !isItemListEmpty();
  }
 
- private boolean isItemListEmpty() {
+ protected boolean isItemListEmpty() {
  for (ItemStack item : items) {
  if (item != null) {
  return false;