Item Filters: Changed the logic of fuzzy mode, changed the way empty item list works

This commit is contained in:
TimeConqueror committed 2021-08-28 18:50:54 +03:00
1 parent 067d602a9d
commit b9d405312d
5 files changed
+112 -61

No files matched your search

@@ -1,20 +1,16 @@
package crazypants.enderio.conduit.gui.item;
import net.minecraft.client.gui.GuiButton;
import org.lwjgl.opengl.GL11;
import com.enderio.core.client.gui.GuiContainerBase;
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;
import net.minecraft.client.gui.GuiButton;
import org.lwjgl.opengl.GL11;
public class BasicItemFilterGui implements IItemFilterGui {
@@ -66,7 +62,7 @@ public class BasicItemFilterGui implements IItemFilterGui {
int x = butLeft;
int y = yOffset + 1;
whiteListB = new IconButton(gui, ID_WHITELIST + buttonIdOffset, x, y, IconEIO.FILTER_WHITELIST);
whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist"));
whiteListB.setToolTip(getWhitelistTooltips(false));
x += 20;
useMetaB = new ToggleButton(gui, ID_META + buttonIdOffset, x, y, IconEIO.FILTER_META_OFF, IconEIO.FILTER_META);
@@ -135,16 +131,14 @@ public class BasicItemFilterGui implements IItemFilterGui {
useMetaB.setSelected(activeFilter.isMatchMeta());
whiteListB.onGuiInit();
whiteListB.setToolTip(getWhitelistTooltips(activeFilter.isBlacklist()));
if(activeFilter.isBlacklist()) {
whiteListB.setIcon(IconEIO.FILTER_BLACKLIST);
whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.blacklist"));
} else {
whiteListB.setIcon(IconEIO.FILTER_WHITELIST);
whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist"));
}
}
@Override
public void actionPerformed(GuiButton guiButton) {
@@ -193,5 +187,20 @@ public class BasicItemFilterGui implements IItemFilterGui {
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")
};
}
}
}
@@ -1,16 +1,15 @@
package crazypants.enderio.conduit.item.filter;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import net.minecraft.item.ItemStack;
import com.enderio.core.api.client.render.IWidgetIcon;
import com.enderio.core.client.gui.button.CycleButton;
import crazypants.enderio.EnderIO;
import crazypants.enderio.gui.IconEIO;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
public enum FuzzyMode implements CycleButton.ICycleEnum {
DISABLED(IconEIO.FILTER_FUZZY_DISABLED) {
@@ -63,7 +62,13 @@ public enum FuzzyMode implements CycleButton.ICycleEnum {
@Override
public List<String> getTooltipLines() {
return Collections.singletonList(EnderIO.lang.localize("gui.conduit.item.fuzzy.".concat(name().toLowerCase(Locale.US))));
return Arrays.asList(
EnderIO.lang.localize("gui.conduit.item.fuzzy.".concat(name().toLowerCase(Locale.US))),
EnumChatFormatting.GRAY + EnderIO.lang.localize("gui.conduit.item.fuzzy.tooltip.0"),
EnumChatFormatting.GRAY + EnderIO.lang.localize("gui.conduit.item.fuzzy.tooltip.1"),
EnumChatFormatting.GRAY + EnderIO.lang.localize("gui.conduit.item.fuzzy.tooltip.2",
EnderIO.lang.localize("gui.conduit.item.whitelist"))
);
}
}
@@ -1,16 +1,16 @@
package crazypants.enderio.conduit.item.filter;
import com.enderio.core.client.gui.widget.GhostSlot;
import com.enderio.core.common.network.NetworkUtil;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.conduit.gui.GuiExternalConnection;
import crazypants.enderio.conduit.gui.item.BasicItemFilterGui;
import crazypants.enderio.conduit.gui.item.IItemFilterGui;
import crazypants.enderio.conduit.gui.item.ItemConduitFilterContainer;
import crazypants.enderio.conduit.item.IItemConduit;
import crazypants.enderio.conduit.item.NetworkedInventory;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
@@ -19,12 +19,9 @@ import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.oredict.OreDictionary;
import com.enderio.core.client.gui.widget.GhostSlot;
import com.enderio.core.common.network.NetworkUtil;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.conduit.item.NetworkedInventory;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class ItemFilter implements IInventory, IItemFilter {
@@ -93,43 +90,60 @@ public class ItemFilter implements IInventory, IItemFilter {
return doesItemPassFilter(item);
}
@SuppressWarnings("SimplifiableConditionalExpression")
public boolean doesItemPassFilter(ItemStack item) {
if(!isValid()) {
return true;
boolean allow = isValid();
if(allow) {
allow = itemMatched(item);
}
boolean matched = itemMatched(item);
return isBlacklist ? !matched : matched;
return isBlacklist ? !allow : allow;
}
private boolean itemMatched(ItemStack item) {
if(item == null) {
return false;
}
boolean doFuzzy = false;
boolean fuzzyValue = false;
if(fuzzyMode != FuzzyMode.DISABLED && item.getItem().isDamageable()) {
doFuzzy = true;
fuzzyValue = fuzzyMode.compare(item);
boolean checkDamage = fuzzyMode != FuzzyMode.DISABLED;
boolean damageMatched = false;
if(checkDamage && item.getItem().isDamageable()) {
damageMatched = fuzzyMode.compare(item);
}
if(isItemListEmpty()) {
if (checkDamage) {
return damageMatched;
} else {
return false;
}
}
boolean matched = false;
int i = 0;
for (ItemStack it : items) {
if(it != null && Item.getIdFromItem(item.getItem()) == Item.getIdFromItem(it.getItem())) {
for (int i = 0; i < items.length; i++) {
ItemStack it = items[i];
if (it != null && Item.getIdFromItem(item.getItem()) == Item.getIdFromItem(it.getItem())) {
matched = true;
boolean fuzzyOk = doFuzzy && fuzzyMode.compare(it) == fuzzyValue;
if(matchMeta && !fuzzyOk && item.getItemDamage() != it.getItemDamage()) {
if(checkDamage && !damageMatched) {
matched = false;
} else if(matchNBT && !isNBTMatch(item, it)) {
} else if (matchMeta && item.getItemDamage() != it.getItemDamage()) {
matched = false;
}else if (matchNBT && !isNBTMatch(item, it)) {
matched = false;
}
}
if(!matched && useOreDict && isOreDicMatch(i, item)) {
if (!matched && useOreDict && isOreDicMatch(i, item)) {
matched = true;
}
if(matched) {
if (matched) {
break;
}
i++;
}
return matched;
}
@@ -184,12 +198,21 @@ public class ItemFilter implements IInventory, IItemFilter {
@Override
public boolean isValid() {
//allows fuzzy mode to be not dependent from filter items
if(fuzzyMode != FuzzyMode.DISABLED) {
return true;
}
return !isItemListEmpty();
}
private boolean isItemListEmpty() {
for (ItemStack item : items) {
if(item != null) {
return true;
if (item != null) {
return false;
}
}
return false;
return true;
}
public boolean isBlacklist() {