mirror of
https://github.com/GTNewHorizons/NotEnoughItems.git
synced 2026-11-22 05:02:11 +00:00
Improved searching API to have primary and secondary filters
This commit is contained in:
1 parent
35841ebe9b
commit
a1879a9654
3 files changed
+42
-13
No files matched your search
@@ -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<ISearchProvider> searchProviders = new LinkedList<ISearchProvider>();
|
||||
|
||||
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<ItemFilter> primary = new LinkedList<ItemFilter>();
|
||||
List<ItemFilter> secondary = new LinkedList<ItemFilter>();
|
||||
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();
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user