Add getResultStacks/getAuxiliaryStacks to IRecipeHandler (#1105)

This commit is contained in:
slprime authored and GitHub committed 2026-11-03 17:33:07 +02:00
1 parent aea4c2866a
commit ae0d6c6108
17 files changed
+277 -216

No files matched your search

@@ -5,6 +5,7 @@ import static org.junit.jupiter.api.Named.named;
import static org.mockito.Mockito.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.function.Function;
@@ -32,6 +33,8 @@ import codechicken.nei.ItemList.AnyMultiItemFilter;
import codechicken.nei.ItemList.PatternItemFilter;
import codechicken.nei.SearchField.SearchParserProvider;
import codechicken.nei.api.ItemFilter;
import codechicken.nei.api.ItemInfo;
import codechicken.nei.recipe.IRecipeHandler;
import codechicken.nei.search.IdentifierFilter;
@DisplayName("Search expression")
@@ -65,6 +68,7 @@ public class SearchTokenParserTest {
private static final ModeValue[] extendedPlusPatternMode = { patternModes[3] };
private static final ModeValue[] extendedPatternModes = { patternModes[1], patternModes[3] };
private static final ModeValue[] nonGrammarPatternModes = { patternModes[0], patternModes[1], patternModes[2] };
private static final ModeValue[] nonRegexPatternModes = { patternModes[0], patternModes[1], patternModes[3] };
private static final SearchParserProvider defaultParserProvider = parserProvider(
'\0',
@@ -140,6 +144,14 @@ public class SearchTokenParserTest {
spaceModes,
extendedPatternModes);
private static final List<Arguments> extendedOnlyAllSpaceModesTestProvider = combinationsProvider(
spaceModes,
new ModeValue[] { patternModes[1] });
private static final List<Arguments> nonRegexAllSpaceModesTestProvider = combinationsProvider(
spaceModes,
nonRegexPatternModes);
private static final List<Arguments> spaceIsAndExtendedPlusModeTestProvider = combinationsProvider(
spaceIsAndMode,
extendedPlusPatternMode);
@@ -176,6 +188,7 @@ public class SearchTokenParserTest {
config.when(() -> NEIClientConfig.getBooleanSetting(eq("inventory.search.logSearchExceptions")))
.thenReturn(false);
mockStatic(ItemInfo.class);
}
// All modes tests
@@ -321,6 +334,62 @@ public class SearchTokenParserTest {
assertTrue(matchedItems.contains(itemABC));
}
@DisplayName("Regex with delimiters")
@ParameterizedTest(name = "{argumentsWithNames}")
@FieldSource("extendedOnlyAllSpaceModesTestProvider")
public void testRegexWithDelimiters(int spaceMode, int patternMode) {
SearchTokenParser searchParser = new SearchTokenParser();
searchParser.addProvider(defaultParserProvider);
Set<ItemStack> matchedItems = testFilterAgainstAllItems(
spaceMode,
patternMode,
searchParser,
"r/^" + itemA.getDisplayName() + "|^" + itemC.getDisplayName() + "/",
true);
assertEquals(4, matchedItems.size());
assertTrue(matchedItems.contains(itemA));
assertTrue(matchedItems.contains(itemC));
assertTrue(matchedItems.contains(itemAB));
assertTrue(matchedItems.contains(itemABC));
}
@DisplayName("Regex followed by delimiter")
@ParameterizedTest(name = "{argumentsWithNames}")
@FieldSource("extendedAllSpaceModesTestProvider")
public void testRegexFollowedByDelimiter(int spaceMode, int patternMode) {
SearchTokenParser searchParser = new SearchTokenParser();
searchParser.addProvider(defaultParserProvider);
Set<ItemStack> matchedItems = testFilterAgainstAllItems(
spaceMode,
patternMode,
searchParser,
"r/^" + itemA.getDisplayName() + "$/|" + itemC.getDisplayName());
assertEquals(3, matchedItems.size());
assertTrue(matchedItems.contains(itemA));
assertTrue(matchedItems.contains(itemC));
assertTrue(matchedItems.contains(itemABC));
}
@DisplayName("Recipe context")
@ParameterizedTest(name = "{argumentsWithNames}")
@FieldSource("nonRegexAllSpaceModesTestProvider")
public void testRecipeContext(int spaceMode, int patternMode) {
SearchTokenParser searchParser = new SearchTokenParser();
searchParser.addProvider(defaultParserProvider);
IRecipeHandler handler = mock(IRecipeHandler.class);
when(handler.getIngredientStacks(0)).thenReturn(positionedStacks(itemA));
when(handler.getResultStacks(0)).thenReturn(positionedStacks(itemB));
when(handler.getAuxiliaryStacks(0)).thenReturn(positionedStacks(itemC));
assertTrue(testRecipeFilter(spaceMode, patternMode, searchParser, "<" + itemA.getDisplayName(), handler));
assertTrue(testRecipeFilter(spaceMode, patternMode, searchParser, ">" + itemB.getDisplayName(), handler));
assertTrue(testRecipeFilter(spaceMode, patternMode, searchParser, "^" + itemC.getDisplayName(), handler));
assertFalse(testRecipeFilter(spaceMode, patternMode, searchParser, "^" + itemB.getDisplayName(), handler));
assertFalse(testRecipeFilter(spaceMode, patternMode, searchParser, ">" + itemC.getDisplayName(), handler));
}
// Extended+ specific tests
@DisplayName("Sequence")
@@ -403,10 +472,14 @@ public class SearchTokenParserTest {
private static Set<ItemStack> testFilterAgainstAllItems(int spaceMode, int patternMode,
SearchTokenParser searchParser, String search) {
config.when(() -> NEIClientConfig.getIntSetting(eq("inventory.search.patternMode"))).thenReturn(patternMode);
config.when(() -> NEIClientConfig.getIntSetting(eq("inventory.search.spaceMode"))).thenReturn(spaceMode);
return testFilterAgainstAllItems(spaceMode, patternMode, searchParser, search, false);
}
ItemFilter filter = searchParser.getFilter(search);
private static Set<ItemStack> testFilterAgainstAllItems(int spaceMode, int patternMode,
SearchTokenParser searchParser, String search, boolean skipRecipeTokens) {
setModes(spaceMode, patternMode);
ItemFilter filter = searchParser.getFilter(search, skipRecipeTokens);
if (filter instanceof SearchTokenParser.IsRegisteredItemFilter) {
filter = ((SearchTokenParser.IsRegisteredItemFilter) filter).filter;
}
@@ -415,6 +488,23 @@ public class SearchTokenParserTest {
return matchedItems;
}
private static boolean testRecipeFilter(int spaceMode, int patternMode, SearchTokenParser searchParser,
String search, IRecipeHandler handler) {
setModes(spaceMode, patternMode);
return searchParser.getRecipeFilter(search).matches(handler, 0);
}
private static void setModes(int spaceMode, int patternMode) {
config.when(() -> NEIClientConfig.getIntSetting(eq("inventory.search.patternMode"))).thenReturn(patternMode);
config.when(() -> NEIClientConfig.getIntSetting(eq("inventory.search.spaceMode"))).thenReturn(spaceMode);
}
private static List<PositionedStack> positionedStacks(ItemStack stack) {
PositionedStack pStack = mock(PositionedStack.class);
pStack.items = new ItemStack[] { stack };
return Collections.singletonList(pStack);
}
private static SearchParserProvider parserProvider(char prefix, String name,
SearchTokenParser.SearchMode searchMode, Function<Pattern, ItemFilter> createFilter) {
return new SearchParserProvider(prefix, name, EnumChatFormatting.RESET, createFilter) {