diff --git a/build/build.properties b/build/build.properties index 41580a31..df531c1f 100644 --- a/build/build.properties +++ b/build/build.properties @@ -2,4 +2,4 @@ mc_version=1.7.10 forge_version=10.13.0.1151 ccl_version=1.1.1.98 ccc_version=1.0.4.+ -mod_version=1.0.3 +mod_version=1.0.4 diff --git a/src/codechicken/nei/SearchField.java b/src/codechicken/nei/SearchField.java index 084749fe..e00049a0 100644 --- a/src/codechicken/nei/SearchField.java +++ b/src/codechicken/nei/SearchField.java @@ -1,5 +1,6 @@ package codechicken.nei; +import codechicken.nei.ItemList.AnyMultiItemFilter; import codechicken.nei.ItemList.EverythingItemFilter; import codechicken.nei.ItemList.PatternItemFilter; import codechicken.nei.api.API; @@ -24,10 +25,30 @@ public class SearchField extends TextField implements ItemFilterProvider public static interface ISearchProvider { /** - * Return null to ignore this provider and use the normal searching protocol + * @return false if this filter should only be used if no other non-default filters match the search string + */ + public boolean isPrimary(); + + /** + * @return An item filter for items matching SearchTex null to ignore this provider */ public ItemFilter getFilter(String searchText); } + + private static class DefaultSearchProvider implements ISearchProvider + { + @Override + public boolean isPrimary() { + return false; + } + + @Override + public ItemFilter getFilter(String searchText) { + Pattern pattern = getPattern(searchText); + return pattern == null ? null : new PatternItemFilter(pattern); + } + } + public static List searchProviders = new LinkedList(); long lastclicktime; @@ -35,6 +56,7 @@ public class SearchField extends TextField implements ItemFilterProvider public SearchField(String ident) { super(ident); API.addItemFilter(this); + API.addSearchProvider(new DefaultSearchProvider()); } public static boolean searchInventories() { @@ -53,10 +75,9 @@ public class SearchField extends TextField implements ItemFilterProvider @Override public boolean handleClick(int mousex, int mousey, int button) { if (button == 0) { - if (focused() && (System.currentTimeMillis() - lastclicktime < 500))//double click - { - world.nbt.setBoolean("searchinventories", !searchInventories()); - world.saveNBT(); + if (focused() && (System.currentTimeMillis() - lastclicktime < 500)) {//double click + NEIClientConfig.world.nbt.setBoolean("searchinventories", !searchInventories()); + NEIClientConfig.world.saveNBT(); } lastclicktime = System.currentTimeMillis(); } @@ -81,9 +102,9 @@ public class SearchField extends TextField implements ItemFilterProvider } public static Pattern getPattern(String search) { - switch(NEIClientConfig.getIntSetting("inventory.searchmode")) { + switch (NEIClientConfig.getIntSetting("inventory.searchmode")) { case 0://plain - search = "\\Q"+search+"\\E"; + search = "\\Q" + search + "\\E"; break; case 1: search = search @@ -104,13 +125,16 @@ public class SearchField extends TextField implements ItemFilterProvider public ItemFilter getFilter() { String s_filter = text().toLowerCase(); - for(ISearchProvider p : searchProviders) { + List primary = new LinkedList(); + List secondary = new LinkedList(); + for (ISearchProvider p : searchProviders) { ItemFilter filter = p.getFilter(s_filter); - if(filter != null) - return filter; + if (filter != null) + (p.isPrimary() ? primary : secondary).add(filter); } - Pattern pattern = getPattern(s_filter); - return pattern == null ? new EverythingItemFilter() : new PatternItemFilter(pattern); + if (!primary.isEmpty()) return new AnyMultiItemFilter(primary); + if (!secondary.isEmpty()) return new AnyMultiItemFilter(secondary); + return new EverythingItemFilter(); } } diff --git a/src/codechicken/nei/SubsetWidget.java b/src/codechicken/nei/SubsetWidget.java index 4ac5421d..822b71cd 100644 --- a/src/codechicken/nei/SubsetWidget.java +++ b/src/codechicken/nei/SubsetWidget.java @@ -701,6 +701,11 @@ public class SubsetWidget extends Button implements ItemFilterProvider, ItemsLoa }; } + @Override + public boolean isPrimary() { + return true; + } + @Override public ItemFilter getFilter(String searchText) { if(!searchText.startsWith("@"))