diff --git a/src/main/java/codechicken/nei/NEIClientConfig.java b/src/main/java/codechicken/nei/NEIClientConfig.java index f1c9ce9c..1fa7e4fc 100644 --- a/src/main/java/codechicken/nei/NEIClientConfig.java +++ b/src/main/java/codechicken/nei/NEIClientConfig.java @@ -1,9 +1,6 @@ package codechicken.nei; -import static codechicken.lib.gui.GuiDraw.drawString; - import java.io.File; -import java.util.Arrays; import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; @@ -18,6 +15,7 @@ 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; @@ -27,6 +25,9 @@ import org.apache.logging.log4j.Logger; import org.lwjgl.input.Keyboard; import com.google.common.base.Objects; +import com.google.common.reflect.TypeToken; +import com.google.gson.Gson; +import com.google.gson.JsonParseException; import codechicken.core.CCUpdateChecker; import codechicken.core.ClientUtils; @@ -181,313 +182,75 @@ 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").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("@"); - if (preModName.length() != 1) { - logger.warn("Search prefix inventory.search.modNameSearchPrefix has invalid length! Resetting to default."); - preModName = "@"; - tag.getTag("inventory.search.modNameSearchPrefix").setValue(preModName); - } - API.addOption(new OptionTextField("inventory.search.modNameSearchPrefix") { + tag.getTag("inventory.search.modNameSearchMode").setComment("Search mode for Mod Names (prefix: @)") + .getIntValue(1); + API.addOption(new OptionCycled("inventory.search.modNameSearchMode", 3, true) { @Override - public void draw(int mousex, int mousey, float frame) { - drawString(getPrefix(), 10, 6, -1); - textField.w = 60; - textField.x = slot.slotWidth() - textField.w; - textField.draw(mousex, mousey); + public String getButtonText() { + return translateN(name + "." + value(), EnumChatFormatting.LIGHT_PURPLE + "@"); } - @Override - public boolean isValidValue(String s) { - if (s.length() == 1) { - return !Arrays.asList( - getTag("inventory.search.tooltipSearchPrefix").getValue(), - getTag("inventory.search.identifierSearchPrefix").getValue(), - getTag("inventory.search.oreDictSearchPrefix").getValue(), - getTag("inventory.search.subsetsSearchPrefix").getValue()).contains(s); - } - return false; - } - - @Override - protected TextField createTextField() { - return new DefaultOptionTextField() { - - @Override - public int getTextColour() { - return isValidValue(text()) ? 0xFF55FF : 0xAA0000; - } - }; - } }); - tag.getTag("inventory.search.tooltipSearchMode").setComment("Search mode for Tooltips").getIntValue(0); - API.addOption(new OptionCycled("inventory.search.tooltipSearchMode", 3, true)); - - 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) { - if (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); - } - } else { - logger.warn("Search prefix inventory.search.tooltipSearchPrefix has invalid length! Resetting to default."); - preModName = "#"; - tag.getTag("inventory.search.tooltipSearchPrefix").setValue(preModName); - } - API.addOption(new OptionTextField("inventory.search.tooltipSearchPrefix") { + tag.getTag("inventory.search.tooltipSearchMode").setComment("Search mode for Tooltips (prefix: #)") + .getIntValue(0); + API.addOption(new OptionCycled("inventory.search.tooltipSearchMode", 3, true) { @Override - public void draw(int mousex, int mousey, float frame) { - drawString(getPrefix(), 10, 6, -1); - textField.w = 60; - textField.x = slot.slotWidth() - textField.w; - textField.draw(mousex, mousey); + public String getButtonText() { + return translateN(name + "." + value(), EnumChatFormatting.YELLOW + "#"); } - @Override - public boolean isValidValue(String s) { - if (s.length() == 1) { - return !Arrays.asList( - getTag("inventory.search.modNameSearchPrefix").getValue(), - getTag("inventory.search.identifierSearchPrefix").getValue(), - getTag("inventory.search.oreDictSearchPrefix").getValue(), - getTag("inventory.search.subsetsSearchPrefix").getValue()).contains(s); - } - return false; - } - - @Override - protected TextField createTextField() { - return new DefaultOptionTextField() { - - @Override - public int getTextColour() { - return isValidValue(text()) ? 0xFFFF55 : 0xAA0000; - } - }; - } }); tag.getTag("inventory.search.identifierSearchMode").setComment("Search mode for identifier (prefix: &)") .getIntValue(0); - API.addOption(new OptionCycled("inventory.search.identifierSearchMode", 3, true)); - - 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); - } - } else { - logger.warn( - "Search prefix inventory.search.identifierSearchPrefix has invalid length! Resetting to default."); - preModName = "&"; - tag.getTag("inventory.search.identifierSearchPrefix").setValue(preModName); - } - API.addOption(new OptionTextField("inventory.search.identifierSearchPrefix") { + API.addOption(new OptionCycled("inventory.search.identifierSearchMode", 3, true) { @Override - public void draw(int mousex, int mousey, float frame) { - drawString(getPrefix(), 10, 6, -1); - textField.w = 60; - textField.x = slot.slotWidth() - textField.w; - textField.draw(mousex, mousey); + public String getButtonText() { + return translateN(name + "." + value(), EnumChatFormatting.GOLD + "&"); } - @Override - public boolean isValidValue(String s) { - if (s.length() == 1) { - return !Arrays.asList( - getTag("inventory.search.modNameSearchPrefix").getValue(), - getTag("inventory.search.tooltipSearchPrefix").getValue(), - getTag("inventory.search.oreDictSearchPrefix").getValue(), - getTag("inventory.search.subsetsSearchPrefix").getValue()).contains(s); - } - return false; - } - - @Override - protected TextField createTextField() { - return new DefaultOptionTextField() { - - @Override - public int getTextColour() { - return isValidValue(text()) ? 0xFFAA00 : 0xAA0000; - } - }; - } }); tag.getTag("inventory.search.oreDictSearchMode").setComment("Search mode for Tag Names (prefix: $)") .getIntValue(0); - API.addOption(new OptionCycled("inventory.search.oreDictSearchMode", 3, true)); - - 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); - } - } else { - logger.warn("Search prefix inventory.search.oreDictSearchPrefix has invalid length! Resetting to default."); - preModName = "$"; - tag.getTag("inventory.search.oreDictSearchPrefix").setValue(preModName); - } - API.addOption(new OptionTextField("inventory.search.oreDictSearchPrefix") { + API.addOption(new OptionCycled("inventory.search.oreDictSearchMode", 3, true) { @Override - public void draw(int mousex, int mousey, float frame) { - drawString(getPrefix(), 10, 6, -1); - textField.w = 60; - textField.x = slot.slotWidth() - textField.w; - textField.draw(mousex, mousey); + public String getButtonText() { + return translateN(name + "." + value(), EnumChatFormatting.AQUA + "$"); } - @Override - public boolean isValidValue(String s) { - if (s.length() == 1) { - return !Arrays.asList( - getTag("inventory.search.modNameSearchPrefix").getValue(), - getTag("inventory.search.tooltipSearchPrefix").getValue(), - getTag("inventory.search.identifierSearchPrefix").getValue(), - getTag("inventory.search.subsetsSearchPrefix").getValue()).contains(s); - } - return false; - } - - @Override - protected TextField createTextField() { - return new DefaultOptionTextField() { - - @Override - public int getTextColour() { - return isValidValue(text()) ? 0x55FFFF : 0xAA0000; - } - }; - } }); tag.getTag("inventory.search.subsetsSearchMode").setComment("Search mode for Item Subsets (prefix: %)") .getIntValue(2); - API.addOption(new OptionCycled("inventory.search.subsetsSearchMode", 3, true)); - - 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("%"); - 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); - } - } else { - logger.warn("Search prefix inventory.search.subsetsSearchPrefix has invalid length! Resetting to default."); - preModName = "%"; - tag.getTag("inventory.search.subsetsSearchPrefix").setValue(preModName); - } - API.addOption(new OptionTextField("inventory.search.subsetsSearchPrefix") { + API.addOption(new OptionCycled("inventory.search.subsetsSearchMode", 3, true) { @Override - public void draw(int mousex, int mousey, float frame) { - drawString(getPrefix(), 10, 6, -1); - textField.w = 60; - textField.x = slot.slotWidth() - textField.w; - textField.draw(mousex, mousey); + public String getButtonText() { + return translateN(name + "." + value(), EnumChatFormatting.DARK_PURPLE + "%"); } - @Override - public boolean isValidValue(String s) { - if (s.length() == 1) { - return !Arrays.asList( - getTag("inventory.search.modNameSearchPrefix").getValue(), - getTag("inventory.search.tooltipSearchPrefix").getValue(), - getTag("inventory.search.identifierSearchPrefix").getValue(), - getTag("inventory.search.oreDictSearchPrefix").getValue()).contains(s); - } - return false; - } - - @Override - protected TextField createTextField() { - return new DefaultOptionTextField() { - - @Override - public int getTextColour() { - return isValidValue(text()) ? 0xAA00AA : 0xAA0000; - } - }; - } }); + String prefixRedefinitions = tag.getTag("inventory.search.prefixRedefinitions").setComment( + "Redefine search prefixes by providing a char-to-char map (JSON). The keys are the original prefixes, the values the new ones. Example: { \"$\": \"€\", \"#\": \"+\", \"@\": \"°\", \"%\": \"!\" }") + .getValue("{}"); + try { + TypeToken> typeToken = new TypeToken>() { + + private static final long serialVersionUID = 1L; + }; + Map charMap = new Gson().fromJson(prefixRedefinitions, typeToken.getType()); + SearchField.searchParser.prefixRedefinitions.putAll(charMap); + } catch (JsonParseException e) { + logger.warn("Failed to convert prefix redefinitions from JSON to CharToCharMap:", e); + } + 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 37d47d9e..0ebf81a4 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 defaultPrefix; + protected final char prefix; protected final EnumChatFormatting highlightedColor; - public SearchParserProvider(char defaultPrefix, String name, EnumChatFormatting highlightedColor, + public SearchParserProvider(char prefix, String name, EnumChatFormatting highlightedColor, Function createFilter) { - this.defaultPrefix = defaultPrefix; + this.prefix = prefix; this.name = name; this.highlightedColor = highlightedColor; this.createFilter = createFilter; @@ -74,8 +74,7 @@ public class SearchField extends TextField implements ItemFilterProvider { @Override public char getPrefix() { - String prefix = NEIClientConfig.getStringSetting("inventory.search." + this.name + "SearchPrefix"); - return prefix.length() == 0 ? this.defaultPrefix : prefix.charAt(0); + return this.prefix; } @Override diff --git a/src/main/java/codechicken/nei/SearchTokenParser.java b/src/main/java/codechicken/nei/SearchTokenParser.java index c0207b24..98580956 100644 --- a/src/main/java/codechicken/nei/SearchTokenParser.java +++ b/src/main/java/codechicken/nei/SearchTokenParser.java @@ -5,7 +5,6 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.StringJoiner; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -20,6 +19,8 @@ import codechicken.nei.ItemList.EverythingItemFilter; import codechicken.nei.ItemList.NegatedItemFilter; import codechicken.nei.ItemList.NothingItemFilter; import codechicken.nei.api.ItemFilter; +import gnu.trove.map.TCharCharMap; +import gnu.trove.map.hash.TCharCharHashMap; public class SearchTokenParser { @@ -71,6 +72,7 @@ public class SearchTokenParser { protected final List searchProviders; protected final ProvidersCache providersCache = new ProvidersCache(); + protected final TCharCharMap prefixRedefinitions = new TCharCharHashMap(); public SearchTokenParser(List searchProviders) { this.searchProviders = searchProviders; @@ -109,7 +111,9 @@ public class SearchTokenParser { public ISearchParserProvider getProvider(char ch) { return getProviders().stream() - .filter(provider -> provider.getSearchMode() == SearchMode.PREFIX && provider.getPrefix() == ch) + .filter( + provider -> provider.getSearchMode() == SearchMode.PREFIX + && getRedefinedPrefix(provider.getPrefix()) == ch) .findFirst().orElse(null); } @@ -128,18 +132,24 @@ public class SearchTokenParser { } public Pattern getSplitPattern() { - StringJoiner prefixes = new StringJoiner(""); - prefixes.add(String.valueOf('\0')); + StringBuilder prefixes = new StringBuilder().append('\0'); for (ISearchParserProvider provider : getProviders()) { if (provider.getSearchMode() == SearchMode.PREFIX) { - prefixes.add(String.valueOf(provider.getPrefix())); + prefixes.append(getRedefinedPrefix(provider.getPrefix())); } } return Pattern.compile("((-*)([" + Pattern.quote(prefixes.toString()) + "]*)(\\\".*?(?:\\\"|$)|\\S+))"); } + private char getRedefinedPrefix(char prefix) { + if (this.prefixRedefinitions.containsKey(prefix)) { + return this.prefixRedefinitions.get(prefix); + } + return prefix; + } + private ItemFilter parseSearchText(String filterText) { if (filterText.isEmpty()) { diff --git a/src/main/java/codechicken/nei/SubsetWidget.java b/src/main/java/codechicken/nei/SubsetWidget.java index 3752eb06..57704b89 100644 --- a/src/main/java/codechicken/nei/SubsetWidget.java +++ b/src/main/java/codechicken/nei/SubsetWidget.java @@ -380,8 +380,7 @@ public class SubsetWidget extends Button implements ItemFilterProvider, ItemsLoa } public char getPrefix() { - String prefix = NEIClientConfig.getStringSetting("inventory.search.subsetsSearchPrefix"); - return prefix.length() == 0 ? '%' : prefix.charAt(0); + return '%'; } public EnumChatFormatting getHighlightedColor() { diff --git a/src/main/java/codechicken/nei/api/ItemInfo.java b/src/main/java/codechicken/nei/api/ItemInfo.java index aaf8aa1d..f490a8b0 100644 --- a/src/main/java/codechicken/nei/api/ItemInfo.java +++ b/src/main/java/codechicken/nei/api/ItemInfo.java @@ -144,11 +144,6 @@ public class ItemInfo { API.addSearchProvider( new SearchParserProvider('\0', "default", EnumChatFormatting.RESET, PatternItemFilter::new) { - @Override - public char getPrefix() { - return defaultPrefix; - } - @Override public SearchMode getSearchMode() { return SearchMode.ALWAYS; diff --git a/src/main/java/codechicken/nei/config/OptionTextField.java b/src/main/java/codechicken/nei/config/OptionTextField.java index c077e5b4..dec8a649 100644 --- a/src/main/java/codechicken/nei/config/OptionTextField.java +++ b/src/main/java/codechicken/nei/config/OptionTextField.java @@ -11,7 +11,26 @@ import codechicken.nei.config.GuiOptionList.OptionScrollSlot; public class OptionTextField extends Option { - protected final TextField textField = createTextField(); + protected final TextField textField = new TextField("test") { + + { + this.h = 20; + } + + @Override + public void onTextChange(String oldText) { + // don't override global if text hasn't changed + if (focused() && isValidValue(text()) && (!defaulting() || !text().equals(getTag().getValue()))) { + getTag().setValue(text()); + } + } + + @Override + public void setFocus(boolean focus) { + if (!focus && !isValidValue(text())) setText(renderTag().getValue()); + super.setFocus(focus); + } + }; public OptionTextField(String name) { super(name); @@ -72,30 +91,4 @@ public class OptionTextField extends Option { public boolean isValidValue(String s) { return true; } - - protected TextField createTextField() { - return new DefaultOptionTextField(); - } - - protected class DefaultOptionTextField extends TextField { - - public DefaultOptionTextField() { - super("test"); - this.h = 20; - } - - @Override - public void onTextChange(String oldText) { - // don't override global if text hasn't changed - if (focused() && isValidValue(text()) && (!defaulting() || !text().equals(getTag().getValue()))) { - getTag().setValue(text()); - } - } - - @Override - public void setFocus(boolean focus) { - if (!focus && !isValidValue(text())) setText(renderTag().getValue()); - super.setFocus(focus); - } - } } diff --git a/src/main/resources/assets/nei/lang/de_DE.lang b/src/main/resources/assets/nei/lang/de_DE.lang index 5daaf625..5a43bd29 100644 --- a/src/main/resources/assets/nei/lang/de_DE.lang +++ b/src/main/resources/assets/nei/lang/de_DE.lang @@ -106,29 +106,24 @@ nei.options.inventory.search.patternMode.1=Erweitert nei.options.inventory.search.patternMode.2=Regex nei.options.inventory.search.modNameSearchMode=Modname Suchmodus nei.options.inventory.search.modNameSearchMode.0=Immer -nei.options.inventory.search.modNameSearchMode.1=Präfix +nei.options.inventory.search.modNameSearchMode.1=Präfix: %s nei.options.inventory.search.modNameSearchMode.2=Nie -nei.options.inventory.search.modNameSearchPrefix=Modname Suchpräfix nei.options.inventory.search.tooltipSearchMode=Tooltip Suchmodus nei.options.inventory.search.tooltipSearchMode.0=Immer -nei.options.inventory.search.tooltipSearchMode.1=Präfix +nei.options.inventory.search.tooltipSearchMode.1=Präfix: %s nei.options.inventory.search.tooltipSearchMode.2=Nie -nei.options.inventory.search.tooltipSearchPrefix=Tooltip Suchpräfix nei.options.inventory.search.identifierSearchMode=Identifikator Suchmodus nei.options.inventory.search.identifierSearchMode.0=Immer -nei.options.inventory.search.identifierSearchMode.1=Präfix +nei.options.inventory.search.identifierSearchMode.1=Präfix: %s nei.options.inventory.search.identifierSearchMode.2=Nie -nei.options.inventory.search.identifierSearchPrefix=Identifier Suchpräfix nei.options.inventory.search.oreDictSearchMode=OreDict Suchmodus nei.options.inventory.search.oreDictSearchMode.0=Immer -nei.options.inventory.search.oreDictSearchMode.1=Präfix +nei.options.inventory.search.oreDictSearchMode.1=Präfix: %s nei.options.inventory.search.oreDictSearchMode.2=Nie -nei.options.inventory.search.oreDictSearchPrefix=OreDict Suchpräfix nei.options.inventory.search.subsetsSearchMode=Item-SubSet Suchmodus nei.options.inventory.search.subsetsSearchMode.0=Immer -nei.options.inventory.search.subsetsSearchMode.1=Präfix +nei.options.inventory.search.subsetsSearchMode.1=Präfix: %s nei.options.inventory.search.subsetsSearchMode.2=Nie -nei.options.inventory.search.subsetsSearchPrefix=Item-SubSet Suchpräfix nei.options.inventory.utilities=Nützliches nei.options.inventory.utilities.tip=Wähle Inhalte für den Mehrzweckmodus nei.options.inventory.utilities.time=Zeit diff --git a/src/main/resources/assets/nei/lang/en_US.lang b/src/main/resources/assets/nei/lang/en_US.lang index d559e3de..20a3b04c 100644 --- a/src/main/resources/assets/nei/lang/en_US.lang +++ b/src/main/resources/assets/nei/lang/en_US.lang @@ -225,31 +225,26 @@ 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 Mode +nei.options.inventory.search.modNameSearchMode=Mod Name Search nei.options.inventory.search.modNameSearchMode.0=Always -nei.options.inventory.search.modNameSearchMode.1=Prefix +nei.options.inventory.search.modNameSearchMode.1=Prefix: %s nei.options.inventory.search.modNameSearchMode.2=Never -nei.options.inventory.search.modNameSearchPrefix=Mod Name Search Prefix -nei.options.inventory.search.tooltipSearchMode=Tooltip Search Mode +nei.options.inventory.search.tooltipSearchMode=Tooltip Search nei.options.inventory.search.tooltipSearchMode.0=Always -nei.options.inventory.search.tooltipSearchMode.1=Prefix +nei.options.inventory.search.tooltipSearchMode.1=Prefix: %s nei.options.inventory.search.tooltipSearchMode.2=Never -nei.options.inventory.search.tooltipSearchPrefix=Tooltip Search Prefix -nei.options.inventory.search.identifierSearchMode=Identifier Search Mode +nei.options.inventory.search.identifierSearchMode=Resource ID Search nei.options.inventory.search.identifierSearchMode.0=Always -nei.options.inventory.search.identifierSearchMode.1=Prefix +nei.options.inventory.search.identifierSearchMode.1=Prefix: %s nei.options.inventory.search.identifierSearchMode.2=Never -nei.options.inventory.search.identifierSearchPrefix=Identifier Search Prefix -nei.options.inventory.search.oreDictSearchMode=OreDict Search Mode +nei.options.inventory.search.oreDictSearchMode=OreDict Search nei.options.inventory.search.oreDictSearchMode.0=Always -nei.options.inventory.search.oreDictSearchMode.1=Prefix +nei.options.inventory.search.oreDictSearchMode.1=Prefix: %s nei.options.inventory.search.oreDictSearchMode.2=Never -nei.options.inventory.search.oreDictSearchPrefix=OreDict Search Prefix -nei.options.inventory.search.subsetsSearchMode=Item Subset Search Mode +nei.options.inventory.search.subsetsSearchMode=Item Subsets Search nei.options.inventory.search.subsetsSearchMode.0=Always -nei.options.inventory.search.subsetsSearchMode.1=Prefix +nei.options.inventory.search.subsetsSearchMode.1=Prefix: %s nei.options.inventory.search.subsetsSearchMode.2=Never -nei.options.inventory.search.subsetsSearchPrefix=Item Subset Search Prefix nei.options.inventory.guirecipe.creativeTabStyle=Creative or JEI tab style nei.options.inventory.guirecipe.creativeTabStyle.true=Creative nei.options.inventory.guirecipe.creativeTabStyle.false=JEI