diff --git a/src/main/java/codechicken/nei/ItemList.java b/src/main/java/codechicken/nei/ItemList.java index 485cfdf8..b83d383c 100644 --- a/src/main/java/codechicken/nei/ItemList.java +++ b/src/main/java/codechicken/nei/ItemList.java @@ -139,7 +139,7 @@ public class ItemList { @Override public boolean matches(ItemStack item) { for (ItemFilter filter : filters) try { - if (filter.matches(item)) return true; + if (filter != null && filter.matches(item)) return true; } catch (Exception e) { NEIClientConfig.logger.error("Exception filtering " + item + " with " + filter, e); } diff --git a/src/main/java/codechicken/nei/NEIClientConfig.java b/src/main/java/codechicken/nei/NEIClientConfig.java index eadeca14..5aade44a 100644 --- a/src/main/java/codechicken/nei/NEIClientConfig.java +++ b/src/main/java/codechicken/nei/NEIClientConfig.java @@ -14,7 +14,6 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraft.world.storage.SaveFormatComparator; import net.minecraftforge.common.MinecraftForge; @@ -183,60 +182,105 @@ public class NEIClientConfig { tag.getTag("inventory.search.quoteDropItemName").setComment("Quote Drop Item Name").getBooleanValue(true); API.addOption(new OptionToggleButton("inventory.search.quoteDropItemName", true)); - tag.getTag("inventory.search.modNameSearchMode").setComment("Search mode for Mod Names (prefix: @)") - .getIntValue(1); - API.addOption(new OptionCycled("inventory.search.modNameSearchMode", 3, true) { + String preModName = tag.getTag("inventory.search.modNameSearchPrefix").setComment( + "Search prefix for Mod Names (leave empty to always search for Mod Names, enter anything longer than one character to disable)") + .getValue("@"); - @Override - public String getButtonText() { - return translateN(name + "." + value(), EnumChatFormatting.LIGHT_PURPLE + "@"); + String preTooltip = tag.getTag("inventory.search.tooltipSearchPrefix").setComment( + "Search mode for Tooltips (leave empty to always search for Tooltips, enter anything longer than one character to disable)") + .getValue(""); + if (preTooltip.length() == 1 && preTooltip.equals(preModName)) { + // conflicting prefix char + logger.warn( + "Search prefix inventory.search.tooltipSearchPrefix conflicts with inventory.search.modNameSearchPrefix ({})! Resetting to default.", + preTooltip); + preTooltip = ""; + tag.getTag("inventory.search.tooltipSearchPrefix").setValue(preTooltip); + } + + String preIdentifier = tag.getTag("inventory.search.identifierSearchPrefix").setComment( + "Search mode for identifier (leave empty to always search for identifier, enter anything longer than one character to disable)") + .getValue(""); + if (preIdentifier.length() == 1) { + if (preIdentifier.equals(preModName)) { + // conflicting prefix char + logger.warn( + "Search prefix inventory.search.identifierSearchPrefix conflicts with inventory.search.modNameSearchPrefix ({})! Resetting to default.", + preIdentifier); + preIdentifier = ""; + tag.getTag("inventory.search.identifierSearchPrefix").setValue(preIdentifier); + } else if (preIdentifier.equals(preTooltip)) { + // conflicting prefix char + logger.warn( + "Search prefix inventory.search.identifierSearchPrefix conflicts with inventory.search.tooltipSearchPrefix ({})! Resetting to default.", + preIdentifier); + preIdentifier = ""; + tag.getTag("inventory.search.identifierSearchPrefix").setValue(preIdentifier); } + } - }); - - tag.getTag("inventory.search.tooltipSearchMode").setComment("Search mode for Tooltips (prefix: #)") - .getIntValue(0); - API.addOption(new OptionCycled("inventory.search.tooltipSearchMode", 3, true) { - - @Override - public String getButtonText() { - return translateN(name + "." + value(), EnumChatFormatting.YELLOW + "#"); + String preODName = tag.getTag("inventory.search.oreDictSearchPrefix").setComment( + "Search mode for Ore Dictionary Tags (leave empty to always search for Ore Dictionary Tags, enter anything longer than one character to disable)") + .getValue(""); + if (preODName.length() == 1) { + if (preODName.equals(preModName)) { + // conflicting prefix char + logger.warn( + "Search prefix inventory.search.oreDictSearchPrefix conflicts with inventory.search.modNameSearchPrefix ({})! Resetting to default.", + preIdentifier); + preODName = ""; + tag.getTag("inventory.search.oreDictSearchPrefix").setValue(preODName); + } else if (preODName.equals(preTooltip)) { + // conflicting prefix char + logger.warn( + "Search prefix inventory.search.oreDictSearchPrefix conflicts with inventory.search.tooltipSearchPrefix ({})! Resetting to default.", + preIdentifier); + preODName = ""; + tag.getTag("inventory.search.oreDictSearchPrefix").setValue(preODName); + } else if (preODName.equals(preIdentifier)) { + // conflicting prefix char + logger.warn( + "Search prefix inventory.search.oreDictSearchPrefix conflicts with inventory.search.identifierSearchPrefix ({})! Resetting to default.", + preIdentifier); + preODName = ""; + tag.getTag("inventory.search.oreDictSearchPrefix").setValue(preODName); } + } - }); - - tag.getTag("inventory.search.identifierSearchMode").setComment("Search mode for identifier (prefix: &)") - .getIntValue(0); - API.addOption(new OptionCycled("inventory.search.identifierSearchMode", 3, true) { - - @Override - public String getButtonText() { - return translateN(name + "." + value(), EnumChatFormatting.GOLD + "&"); + String preSubset = tag.getTag("inventory.search.subsetsSearchPrefix").setComment( + "Search mode for Item Subsets (leave empty to always search for Item Subsets, enter anything longer than one character to disable)") + .getValue("DISABLE"); + if (preSubset.length() == 1) { + if (preSubset.equals(preModName)) { + // conflicting prefix char + logger.warn( + "Search prefix inventory.search.subsetsSearchPrefix conflicts with inventory.search.modNameSearchPrefix ({})! Resetting to default.", + preIdentifier); + preSubset = ""; + tag.getTag("inventory.search.subsetsSearchPrefix").setValue(preSubset); + } else if (preSubset.equals(preTooltip)) { + // conflicting prefix char + logger.warn( + "Search prefix inventory.search.subsetsSearchPrefix conflicts with inventory.search.tooltipSearchPrefix ({})! Resetting to default.", + preIdentifier); + preSubset = ""; + tag.getTag("inventory.search.subsetsSearchPrefix").setValue(preSubset); + } else if (preSubset.equals(preIdentifier)) { + // conflicting prefix char + logger.warn( + "Search prefix inventory.search.subsetsSearchPrefix conflicts with inventory.search.identifierSearchPrefix ({})! Resetting to default.", + preIdentifier); + preSubset = ""; + tag.getTag("inventory.search.subsetsSearchPrefix").setValue(preSubset); + } else if (preSubset.equals(preODName)) { + // conflicting prefix char + logger.warn( + "Search prefix inventory.search.subsetsSearchPrefix conflicts with inventory.search.oreDictSearchPrefix ({})! Resetting to default.", + preIdentifier); + preSubset = ""; + tag.getTag("inventory.search.subsetsSearchPrefix").setValue(preSubset); } - - }); - - tag.getTag("inventory.search.oreDictSearchMode").setComment("Search mode for Tag Names (prefix: $)") - .getIntValue(0); - API.addOption(new OptionCycled("inventory.search.oreDictSearchMode", 3, true) { - - @Override - public String getButtonText() { - return translateN(name + "." + value(), EnumChatFormatting.AQUA + "$"); - } - - }); - - tag.getTag("inventory.search.subsetsSearchMode").setComment("Search mode for Item Subsets (prefix: %)") - .getIntValue(2); - API.addOption(new OptionCycled("inventory.search.subsetsSearchMode", 3, true) { - - @Override - public String getButtonText() { - return translateN(name + "." + value(), EnumChatFormatting.DARK_PURPLE + "%"); - } - - }); + } tag.getTag("inventory.bookmarks.enabled").setComment("Enable/Disable Bookmark Panel").getBooleanValue(true); API.addOption(new OptionToggleButton("inventory.bookmarks.enabled", true)); diff --git a/src/main/java/codechicken/nei/SearchField.java b/src/main/java/codechicken/nei/SearchField.java index 0ebf81a4..ac7d7309 100644 --- a/src/main/java/codechicken/nei/SearchField.java +++ b/src/main/java/codechicken/nei/SearchField.java @@ -44,12 +44,12 @@ public class SearchField extends TextField implements ItemFilterProvider { protected final Function createFilter; protected final String name; - protected final char prefix; + protected final char defaultPrefix; protected final EnumChatFormatting highlightedColor; - public SearchParserProvider(char prefix, String name, EnumChatFormatting highlightedColor, + public SearchParserProvider(char defaultPrefix, String name, EnumChatFormatting highlightedColor, Function createFilter) { - this.prefix = prefix; + this.defaultPrefix = defaultPrefix; this.name = name; this.highlightedColor = highlightedColor; this.createFilter = createFilter; @@ -74,7 +74,11 @@ public class SearchField extends TextField implements ItemFilterProvider { @Override public char getPrefix() { - return this.prefix; + String prefix = NEIClientConfig.getStringSetting("inventory.search." + this.name + "SearchPrefix"); + if (prefix.length() == 1) { + return prefix.charAt(0); + } + return this.defaultPrefix; } @Override @@ -84,7 +88,8 @@ public class SearchField extends TextField implements ItemFilterProvider { @Override public SearchMode getSearchMode() { - return SearchMode.fromInt(NEIClientConfig.getIntSetting("inventory.search." + this.name + "SearchMode")); + return SearchMode + .fromString(NEIClientConfig.getStringSetting("inventory.search." + this.name + "SearchPrefix")); } } diff --git a/src/main/java/codechicken/nei/SearchTokenParser.java b/src/main/java/codechicken/nei/SearchTokenParser.java index e5a21ddb..03d4cc4a 100644 --- a/src/main/java/codechicken/nei/SearchTokenParser.java +++ b/src/main/java/codechicken/nei/SearchTokenParser.java @@ -29,17 +29,12 @@ public class SearchTokenParser { PREFIX, NEVER; - public static SearchMode fromInt(int value) { - switch (value) { - case 0: - return ALWAYS; - case 1: - return PREFIX; - case 2: - return NEVER; - default: - return ALWAYS; - } + public static SearchMode fromString(String value) { + return switch (value.length()) { + case 0 -> ALWAYS; + case 1 -> PREFIX; + default -> NEVER; + }; } } diff --git a/src/main/java/codechicken/nei/SubsetWidget.java b/src/main/java/codechicken/nei/SubsetWidget.java index 96f0e59d..64f923ab 100644 --- a/src/main/java/codechicken/nei/SubsetWidget.java +++ b/src/main/java/codechicken/nei/SubsetWidget.java @@ -381,6 +381,10 @@ public class SubsetWidget extends Button implements ItemFilterProvider, ItemsLoa } public char getPrefix() { + String prefix = NEIClientConfig.getStringSetting("inventory.search.subsetsSearchPrefix"); + if (prefix.length() == 1) { + return prefix.charAt(0); + } return '%'; } @@ -390,7 +394,7 @@ public class SubsetWidget extends Button implements ItemFilterProvider, ItemsLoa @Override public SearchMode getSearchMode() { - return SearchMode.fromInt(NEIClientConfig.getIntSetting("inventory.search.subsetsSearchMode")); + return SearchMode.fromString(NEIClientConfig.getStringSetting("inventory.search.subsetsSearchPrefix")); } } diff --git a/src/main/java/codechicken/nei/api/ItemInfo.java b/src/main/java/codechicken/nei/api/ItemInfo.java index 15495388..0bbbc84f 100644 --- a/src/main/java/codechicken/nei/api/ItemInfo.java +++ b/src/main/java/codechicken/nei/api/ItemInfo.java @@ -141,11 +141,12 @@ public class ItemInfo { private static void addSearchProviders() { API.addSearchProvider( - new SearchParserProvider( - '\0', - "default", - EnumChatFormatting.RESET, - (pattern) -> new PatternItemFilter(pattern)) { + new SearchParserProvider('\0', "default", EnumChatFormatting.RESET, PatternItemFilter::new) { + + @Override + public char getPrefix() { + return defaultPrefix; + } @Override public SearchMode getSearchMode() { @@ -154,29 +155,12 @@ public class ItemInfo { }); API.addSearchProvider( - new SearchParserProvider( - '@', - "modName", - EnumChatFormatting.LIGHT_PURPLE, - (pattern) -> new ModNameFilter(pattern))); + new SearchParserProvider('@', "modName", EnumChatFormatting.LIGHT_PURPLE, ModNameFilter::new)); API.addSearchProvider( - new SearchParserProvider( - '$', - "oreDict", - EnumChatFormatting.AQUA, - (pattern) -> new OreDictionaryFilter(pattern))); + new SearchParserProvider('$', "oreDict", EnumChatFormatting.AQUA, OreDictionaryFilter::new)); + API.addSearchProvider(new SearchParserProvider('#', "tooltip", EnumChatFormatting.YELLOW, TooltipFilter::new)); API.addSearchProvider( - new SearchParserProvider( - '#', - "tooltip", - EnumChatFormatting.YELLOW, - (pattern) -> new TooltipFilter(pattern))); - API.addSearchProvider( - new SearchParserProvider( - '&', - "identifier", - EnumChatFormatting.GOLD, - (pattern) -> new IdentifierFilter(pattern))); + new SearchParserProvider('&', "identifier", EnumChatFormatting.GOLD, IdentifierFilter::new)); } private static void addIDDumps() { diff --git a/src/main/resources/assets/nei/lang/en_US.lang b/src/main/resources/assets/nei/lang/en_US.lang index cdd722f6..f16bc422 100644 --- a/src/main/resources/assets/nei/lang/en_US.lang +++ b/src/main/resources/assets/nei/lang/en_US.lang @@ -228,26 +228,6 @@ nei.options.inventory.search.patternMode.2=Regex nei.options.inventory.search.quoteDropItemName=Quote Drop Item Name nei.options.inventory.search.quoteDropItemName.true=Yes nei.options.inventory.search.quoteDropItemName.false=No -nei.options.inventory.search.modNameSearchMode=Mod Name Search -nei.options.inventory.search.modNameSearchMode.0=Always -nei.options.inventory.search.modNameSearchMode.1=Prefix: %s -nei.options.inventory.search.modNameSearchMode.2=Never -nei.options.inventory.search.tooltipSearchMode=Tooltip Search -nei.options.inventory.search.tooltipSearchMode.0=Always -nei.options.inventory.search.tooltipSearchMode.1=Prefix: %s -nei.options.inventory.search.tooltipSearchMode.2=Never -nei.options.inventory.search.identifierSearchMode=Resource ID Search -nei.options.inventory.search.identifierSearchMode.0=Always -nei.options.inventory.search.identifierSearchMode.1=Prefix: %s -nei.options.inventory.search.identifierSearchMode.2=Never -nei.options.inventory.search.oreDictSearchMode=OreDict Search -nei.options.inventory.search.oreDictSearchMode.0=Always -nei.options.inventory.search.oreDictSearchMode.1=Prefix: %s -nei.options.inventory.search.oreDictSearchMode.2=Never -nei.options.inventory.search.subsetsSearchMode=Item Subsets Search -nei.options.inventory.search.subsetsSearchMode.0=Always -nei.options.inventory.search.subsetsSearchMode.1=Prefix: %s -nei.options.inventory.search.subsetsSearchMode.2=Never nei.options.inventory.guirecipe.creativeTabStyle=Creative or JEI tab style nei.options.inventory.guirecipe.creativeTabStyle.true=Creative nei.options.inventory.guirecipe.creativeTabStyle.false=JEI diff --git a/src/main/resources/assets/nei/lang/ru_RU.lang b/src/main/resources/assets/nei/lang/ru_RU.lang index d7782cef..383dce7b 100644 --- a/src/main/resources/assets/nei/lang/ru_RU.lang +++ b/src/main/resources/assets/nei/lang/ru_RU.lang @@ -228,26 +228,6 @@ nei.options.inventory.search.patternMode.2=Регулярные выражени nei.options.inventory.search.quoteDropItemName=Цитировать название выброшенного предмета nei.options.inventory.search.quoteDropItemName.true=Да nei.options.inventory.search.quoteDropItemName.false=Нет -nei.options.inventory.search.modNameSearchMode=Поиск по названию мода -nei.options.inventory.search.modNameSearchMode.0=Всегда -nei.options.inventory.search.modNameSearchMode.1=Префикс: %s -nei.options.inventory.search.modNameSearchMode.2=Никогда -nei.options.inventory.search.tooltipSearchMode=Поиск по подсказкам -nei.options.inventory.search.tooltipSearchMode.0=Всегда -nei.options.inventory.search.tooltipSearchMode.1=Префикс: %s -nei.options.inventory.search.tooltipSearchMode.2=Никогда -nei.options.inventory.search.identifierSearchMode=Поиск по идентификатору ресурса -nei.options.inventory.search.identifierSearchMode.0=Всегда -nei.options.inventory.search.identifierSearchMode.1=Префикс: %s -nei.options.inventory.search.identifierSearchMode.2=Никогда -nei.options.inventory.search.oreDictSearchMode=Поиск по OreDict -nei.options.inventory.search.oreDictSearchMode.0=Всегда -nei.options.inventory.search.oreDictSearchMode.1=Префикс: %s -nei.options.inventory.search.oreDictSearchMode.2=Никогда -nei.options.inventory.search.subsetsSearchMode=Поиск по подмножествам предметов -nei.options.inventory.search.subsetsSearchMode.0=Всегда -nei.options.inventory.search.subsetsSearchMode.1=Префикс: %s -nei.options.inventory.search.subsetsSearchMode.2=Никогда nei.options.inventory.guirecipe.creativeTabStyle=Стиль вкладок: Творческий или JEI nei.options.inventory.guirecipe.creativeTabStyle.true=Творческий nei.options.inventory.guirecipe.creativeTabStyle.false=JEI