Compare commits

...
8 changed files with 70 additions and 18 deletions

No files matched your search

@@ -29,7 +29,7 @@ public class SearchTextFormatter implements TextFormatter {
text = SearchTokenParser.SPACE_PATTERN.matcher(text).replaceAll("\\\\ ");
}
final SearchExpressionFormatVisitor visitor = new SearchExpressionFormatVisitor(searchParser);
return SearchExpressionUtils.visitSearchExpression(text, visitor);
return SearchExpressionUtils.visitRecipeSearchExpression(text, visitor);
} else {
final StringBuilder formattedText = new StringBuilder();
@@ -238,9 +238,13 @@ public class SearchTokenParser {
if (spaceMode == 1) {
text = SearchTokenParser.SPACE_PATTERN.matcher(text).replaceAll("\\\\ ");
}
return new IsRegisteredItemFilter(
SearchExpressionUtils.visitSearchExpression(text, new ItemFilterVisitor(this)));
if (skipRecipeTokens) {
return new IsRegisteredItemFilter(
SearchExpressionUtils.visitRecipeSearchExpression(text, new ItemFilterVisitor(this)));
} else {
return new IsRegisteredItemFilter(
SearchExpressionUtils.visitSearchExpression(text, new ItemFilterVisitor(this)));
}
});
}
@@ -320,7 +324,7 @@ public class SearchTokenParser {
text = SearchTokenParser.SPACE_PATTERN.matcher(text).replaceAll("\\\\ ");
}
return SearchExpressionUtils.visitSearchExpression(text, new RecipeFilterVisitor(this));
return SearchExpressionUtils.visitRecipeSearchExpression(text, new RecipeFilterVisitor(this));
});
}
@@ -38,7 +38,11 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
public void tickKeyStates() {
if (Minecraft.getMinecraft().currentScreen != null) return;
if (KeyManager.keyStates.get("world.moboverlay").down) mobOverlay = (mobOverlay + 1) % 2;
if (KeyManager.keyStates.get("world.moboverlay").down) {
mobOverlay = (mobOverlay + 1) % 2;
NEIClientUtils
.printChatMessage(new ChatComponentText(NEIClientUtils.translate("chat.moboverlay." + mobOverlay)));
}
if (KeyManager.keyStates.get("world.chunkoverlay").down) {
chunkOverlay = (chunkOverlay + 1) % (NEIModContainer.isGT5Loaded() ? 4 : 3);
// 0-2 (or 3 with gt)
@@ -14,4 +14,8 @@ public abstract class AbstractSearchExpressionVisitor<T> extends SearchExpressio
return searchParser;
}
public T fail() {
return defaultResult();
}
}
@@ -37,6 +37,20 @@ public class ItemFilterVisitor extends AbstractSearchExpressionVisitor<ItemFilte
}
}
// Should only be called for collecting ingredients permutations
@Override
public ItemFilter visitRecipeSearchExpression(SearchExpressionParser.RecipeSearchExpressionContext ctx) {
if (ctx.recipeClauseExpression() != null) {
final List<ItemFilter> anyFilters = new ArrayList<>();
final List<ItemFilter> allFilters = new ArrayList<>();
for (SearchExpressionParser.RecipeClauseExpressionContext clauseCtx : ctx.recipeClauseExpression()) {
addIngredientPermutationItemFilter(clauseCtx.searchExpression(), anyFilters, allFilters);
}
return constructFilter(anyFilters, allFilters);
}
return defaultResult();
}
@Override
public ItemFilter visitOrExpression(SearchExpressionParser.OrExpressionContext ctx) {
return visitChildren(ctx, AnyMultiItemFilter::new);
@@ -79,6 +93,31 @@ public class ItemFilterVisitor extends AbstractSearchExpressionVisitor<ItemFilte
return new NothingItemFilter();
}
private void addIngredientPermutationItemFilter(SearchExpressionParser.SearchExpressionContext ctx,
List<ItemFilter> anyFilters, List<ItemFilter> allFilters) {
// Only for ingredients or default
if (ctx.type == 0 || ctx.type == 3) {
if (ctx.allRecipe) {
allFilters.add(visit(ctx));
} else {
anyFilters.add(visit(ctx));
}
}
}
private ItemFilter constructFilter(List<ItemFilter> anyFilters, List<ItemFilter> allFilters) {
if (anyFilters.isEmpty()) {
return constructFilter(allFilters, AllMultiItemFilter::new);
}
if (allFilters.isEmpty()) {
return constructFilter(anyFilters, AnyMultiItemFilter::new);
}
final List<ItemFilter> filters = new ArrayList<>();
filters.add(constructFilter(allFilters, AllMultiItemFilter::new));
filters.add(constructFilter(anyFilters, AnyMultiItemFilter::new));
return constructFilter(filters, AllMultiItemFilter::new);
}
private String getTokenCleanText(SearchExpressionParser.TokenContext ctx) {
String cleanText = null;
if (ctx.PLAIN_TEXT() != null) {
@@ -52,6 +52,17 @@ public class SearchExpressionUtils {
}
public static <T> T visitSearchExpression(String text, AbstractSearchExpressionVisitor<T> visitor) {
SearchExpressionParser parser = createSearchExpressionParser(text, visitor.getSearchParser(), visitor);
SearchExpressionParser.RecipeSearchExpressionContext recipeCtx = parser.recipeSearchExpression();
// Manually check whether it's not a recipe expression, because parser would parse it either way
if (recipeCtx.recipeClauseExpression() != null && recipeCtx.recipeClauseExpression().size() == 1
&& recipeCtx.recipeClauseExpression(0).searchExpression().type == 3) {
return visitor.visitSearchExpression(recipeCtx.recipeClauseExpression(0).searchExpression());
}
return visitor.fail();
}
public static <T> T visitRecipeSearchExpression(String text, AbstractSearchExpressionVisitor<T> visitor) {
SearchExpressionParser parser = createSearchExpressionParser(text, visitor.getSearchParser(), visitor);
return visitor.visitRecipeSearchExpression(parser.recipeSearchExpression());
}
@@ -557,7 +557,6 @@ connor135246.campfirebackport.client.compat.nei.NEICampfireStateChangerHandler,c
smelting,Natura:NetherFurnace,,Natura,TRUE,,,,,,
crafting,gregtech:gt.metaitem.01:32744,,gregtech,TRUE,gregapi_post,,,,,"GT5 start: for readability, keep all GTNH-related catalysts below"
gt.recipe.primitiveblastfurnace,gregtech:gt.blockmachines:140,,gregtech,TRUE,gregapi_post,,,,,
gt.recipe.primitiveblastfurnace,gregtech:gt.blockmachines:108,,gregtech,TRUE,gregapi_post,,,,,
smelting,gregtech:gt.blockmachines:103,,gregtech,TRUE,gregapi_post,,,,,
smelting,gregtech:gt.blockmachines:104,,gregtech,TRUE,gregapi_post,,,,,
gt.recipe.macerator,gregtech:gt.blockmachines:106,,gregtech,TRUE,gregapi_post,,,,,
@@ -1172,11 +1171,8 @@ gt.recipe.circuitassembler,gregtech:gt.blockmachines:12096,,dreamcraft,TRUE,,,,,
gt.recipe.alloysmelter,gregtech:gt.blockmachines:31023,,miscutils,TRUE,,,,,,
gt.recipe.assembler,gregtech:gt.blockmachines:876,,miscutils,TRUE,,,,,,
gt.recipe.metalbender,gregtech:gt.blockmachines:792,,miscutils,TRUE,,,,,,
gt.recipe.compressor,gregtech:gt.blockmachines:860,,miscutils,TRUE,,,,,,
gt.recipe.cuttingsaw,gregtech:gt.blockmachines:992,,miscutils,TRUE,,,,,,
gt.recipe.extractor,gregtech:gt.blockmachines:860,,miscutils,TRUE,,,,,,
gt.recipe.extruder,gregtech:gt.blockmachines:859,,miscutils,TRUE,,,,,,
gt.recipe.lathe,gregtech:gt.blockmachines:860,,miscutils,TRUE,,,,,,
gt.recipe.macerator,gregtech:gt.blockmachines:31041,,miscutils,TRUE,,,,,,
gt.recipe.macerator,gregtech:gt.blockmachines:797,,miscutils,TRUE,,,,,,
ic2.recycler,gregtech:gt.blockmachines:799,,miscutils,TRUE,,,,,,
@@ -1185,15 +1181,9 @@ gt.recipe.thermalcentrifuge,gregtech:gt.blockmachines:849,,miscutils,TRUE,,,,,,
gt.recipe.orewasher,gregtech:gt.blockmachines:850,,miscutils,TRUE,,,,,,
gt.recipe.packager,gregtech:gt.blockmachines:942,,miscutils,TRUE,,,,,,
gt.recipe.rockbreaker,gregtech:gt.blockmachines:31065,,miscutils,TRUE,,,,,,
gt.recipe.fermenter,gregtech:gt.blockmachines:860,,miscutils,TRUE,,,,,,
gt.recipe.fluidextractor,gregtech:gt.blockmachines:860,,miscutils,TRUE,,,,,,
gt.recipe.fluidsolidifier,gregtech:gt.blockmachines:860,,miscutils,TRUE,,,,,,
gt.recipe.distillery,gregtech:gt.blockmachines:31021,,miscutils,TRUE,,,,,,
gt.recipe.distillationtower,gregtech:gt.blockmachines:31021,,miscutils,TRUE,,,,,,
gt.recipe.chemicalbath,gregtech:gt.blockmachines:850,,miscutils,TRUE,,,,,,
gt.recipe.polarizer,gregtech:gt.blockmachines:860,,miscutils,TRUE,,,,,,
gt.recipe.autoclave,gregtech:gt.blockmachines:860,,miscutils,TRUE,,,,,,
gt.recipe.laserengraver,gregtech:gt.blockmachines:860,,miscutils,TRUE,,,,,,
gt.recipe.press,gregtech:gt.blockmachines:792,,miscutils,TRUE,,,,,,
gt.recipe.slicer,gregtech:gt.blockmachines:992,,miscutils,TRUE,,,,,,
gt.recipe.sifter,gregtech:gt.blockmachines:840,,miscutils,TRUE,,,,,,
@@ -1201,8 +1191,6 @@ gt.recipe.arcfurnace,gregtech:gt.blockmachines:862,,miscutils,TRUE,,,,,,
gt.recipe.plasmaarcfurnace,gregtech:gt.blockmachines:862,,miscutils,TRUE,,,,,,
gt.recipe.blastfurnace,gregtech:gt.blockmachines:963,,miscutils,TRUE,,,,,,
gt.recipe.implosioncompressor,gregtech:gt.blockmachines:964,,miscutils,TRUE,,,,,,
gt.recipe.dieselgeneratorfuel,gregtech:gt.blockmachines:960,,miscutils,TRUE,,10,,,,
gt.recipe.gasturbinefuel,gregtech:gt.blockmachines:961,,miscutils,TRUE,,10,,,,
gtpp.recipe.chemicaldehydrator,gregtech:gt.blockmachines:911,,miscutils,TRUE,,,,,,
gtpp.recipe.chemicaldehydrator,gregtech:gt.blockmachines:912,,miscutils,TRUE,,,,,,
gtpp.recipe.chemicaldehydrator,gregtech:gt.blockmachines:813,,miscutils,TRUE,,,,,,
1 handler itemName nbtInfo modId modRequired excludedModId priority minVersion maxVersion forceClassName itemNotes
557 smelting Natura:NetherFurnace Natura TRUE
558 crafting gregtech:gt.metaitem.01:32744 gregtech TRUE gregapi_post GT5 start: for readability, keep all GTNH-related catalysts below
559 gt.recipe.primitiveblastfurnace gregtech:gt.blockmachines:140 gregtech TRUE gregapi_post
gt.recipe.primitiveblastfurnace gregtech:gt.blockmachines:108 gregtech TRUE gregapi_post
560 smelting gregtech:gt.blockmachines:103 gregtech TRUE gregapi_post
561 smelting gregtech:gt.blockmachines:104 gregtech TRUE gregapi_post
562 gt.recipe.macerator gregtech:gt.blockmachines:106 gregtech TRUE gregapi_post
1171 gt.recipe.alloysmelter gregtech:gt.blockmachines:31023 miscutils TRUE
1172 gt.recipe.assembler gregtech:gt.blockmachines:876 miscutils TRUE
1173 gt.recipe.metalbender gregtech:gt.blockmachines:792 miscutils TRUE
gt.recipe.compressor gregtech:gt.blockmachines:860 miscutils TRUE
1174 gt.recipe.cuttingsaw gregtech:gt.blockmachines:992 miscutils TRUE
gt.recipe.extractor gregtech:gt.blockmachines:860 miscutils TRUE
1175 gt.recipe.extruder gregtech:gt.blockmachines:859 miscutils TRUE
gt.recipe.lathe gregtech:gt.blockmachines:860 miscutils TRUE
1176 gt.recipe.macerator gregtech:gt.blockmachines:31041 miscutils TRUE
1177 gt.recipe.macerator gregtech:gt.blockmachines:797 miscutils TRUE
1178 ic2.recycler gregtech:gt.blockmachines:799 miscutils TRUE
1181 gt.recipe.orewasher gregtech:gt.blockmachines:850 miscutils TRUE
1182 gt.recipe.packager gregtech:gt.blockmachines:942 miscutils TRUE
1183 gt.recipe.rockbreaker gregtech:gt.blockmachines:31065 miscutils TRUE
gt.recipe.fermenter gregtech:gt.blockmachines:860 miscutils TRUE
gt.recipe.fluidextractor gregtech:gt.blockmachines:860 miscutils TRUE
gt.recipe.fluidsolidifier gregtech:gt.blockmachines:860 miscutils TRUE
1184 gt.recipe.distillery gregtech:gt.blockmachines:31021 miscutils TRUE
1185 gt.recipe.distillationtower gregtech:gt.blockmachines:31021 miscutils TRUE
1186 gt.recipe.chemicalbath gregtech:gt.blockmachines:850 miscutils TRUE
gt.recipe.polarizer gregtech:gt.blockmachines:860 miscutils TRUE
gt.recipe.autoclave gregtech:gt.blockmachines:860 miscutils TRUE
gt.recipe.laserengraver gregtech:gt.blockmachines:860 miscutils TRUE
1187 gt.recipe.press gregtech:gt.blockmachines:792 miscutils TRUE
1188 gt.recipe.slicer gregtech:gt.blockmachines:992 miscutils TRUE
1189 gt.recipe.sifter gregtech:gt.blockmachines:840 miscutils TRUE
1191 gt.recipe.plasmaarcfurnace gregtech:gt.blockmachines:862 miscutils TRUE
1192 gt.recipe.blastfurnace gregtech:gt.blockmachines:963 miscutils TRUE
1193 gt.recipe.implosioncompressor gregtech:gt.blockmachines:964 miscutils TRUE
gt.recipe.dieselgeneratorfuel gregtech:gt.blockmachines:960 miscutils TRUE 10
gt.recipe.gasturbinefuel gregtech:gt.blockmachines:961 miscutils TRUE 10
1194 gtpp.recipe.chemicaldehydrator gregtech:gt.blockmachines:911 miscutils TRUE
1195 gtpp.recipe.chemicaldehydrator gregtech:gt.blockmachines:912 miscutils TRUE
1196 gtpp.recipe.chemicaldehydrator gregtech:gt.blockmachines:813 miscutils TRUE
@@ -137,6 +137,8 @@ nei.chat.chunkoverlay.0=Chunk Overlay: Off
nei.chat.chunkoverlay.1=Chunk Overlay: Chunk Corners
nei.chat.chunkoverlay.2=Chunk Overlay: Chunks
nei.chat.chunkoverlay.3=Chunk Overlay: GT Ore Veins
nei.chat.moboverlay.0=Mob Spawning Overlay: §cOff
nei.chat.moboverlay.1=Mob Spawning Overlay: §2On
nei.chat.item_link.text=<%s> §6Click to add bookmark: %s
nei.chat.bookmark_added.text=Bookmark added!