Remove Generated Favorites from Accepts Followings Tooltip

src/main/java/codechicken/nei/FavoriteRecipes.java

@@ -125,8 +125,7 @@ public void execute() {
             }
 
             FavoriteRecipes.autoFavorites = storage;
-            SubsetWidget.updateHiddenItems();
-            ItemList.updateFilter.restart();
+            updateSubsetVisibility();
         }
 
         protected List<PositionedStack> getOutputs(IRecipeHandler handler, int recipeIndex) {
@@ -139,10 +138,11 @@ protected List<PositionedStack> getOutputs(IRecipeHandler handler, int recipeInd
     private static final FavoriteStorage manualFavorites = new FavoriteStorage();
     private static FavoriteStorage autoFavorites = new FavoriteStorage();
     private static File favoriteFile;
+    private static int revision = 0;
 
     static {
         API.addSubset("Favorites.Manual", manualFavorites::contains);
-        API.addSubset("Favorites.Generated", stack -> autoFavorites.contains(stack));
+        API.addSubset("Favorites.Generated", stack -> FavoriteRecipes.autoFavorites.contains(stack));
     }
 
     private FavoriteRecipes() {}
@@ -254,18 +254,12 @@ private static void loadData() {
         }
 
         loadAutoGeneratedRecipes();
-
-        SubsetWidget.updateHiddenItems();
-        ItemList.updateFilter.restart();
     }
 
-    public static RecipeId getFavorite(ItemStack stack) {
-
+    public static RecipeId getManualFavorite(ItemStack stack) {
         if (NEIClientConfig.favoritesEnabled() && stack != null) {
-            final RecipeId recipeId = manualFavorites.getRecipeId(stack);
-            return recipeId != null ? recipeId : autoFavorites.getRecipeId(stack);
+            return manualFavorites.getRecipeId(stack);
         }
-
         return null;
     }
 
@@ -276,6 +270,16 @@ public static ItemStack getManualFavorite(RecipeId recipeId) {
         return null;
     }
 
+    public static RecipeId getFavorite(ItemStack stack) {
+
+        if (NEIClientConfig.favoritesEnabled() && stack != null) {
+            final RecipeId recipeId = manualFavorites.getRecipeId(stack);
+            return recipeId != null ? recipeId : autoFavorites.getRecipeId(stack);
+        }
+
+        return null;
+    }
+
     public static ItemStack getFavorite(RecipeId recipeId) {
 
         if (NEIClientConfig.favoritesEnabled() && recipeId != null) {
@@ -295,6 +299,10 @@ public static void reload() {
         load();
     }
 
+    public static boolean containsManual(ItemStack stack) {
+        return getManualFavorite(stack) != null;
+    }
+
     public static boolean contains(ItemStack stack) {
         return getFavorite(stack) != null;
     }
@@ -309,8 +317,7 @@ public static void setFavorite(ItemStack stack, RecipeId recipeId) {
             manualFavorites.add(stack, recipeId);
         }
 
-        SubsetWidget.updateHiddenItems();
-        ItemList.updateFilter.restart();
+        updateSubsetVisibility();
     }
 
     public static void loadAutoGeneratedRecipes() {
@@ -321,13 +328,17 @@ public static void loadAutoGeneratedRecipes() {
             singleRecipeFavoritesTask.stop();
             autoFavorites.clear();
 
-            SubsetWidget.updateHiddenItems();
-            ItemList.updateFilter.restart();
+            updateSubsetVisibility();
         }
     }
 
-    public static boolean isAutogenerated(RecipeId recipeId) {
-        return autoFavorites.getItemStack(recipeId) != null;
+    protected static void updateSubsetVisibility() {
+        SubsetWidget.updateHiddenItems();
+        FavoriteRecipes.revision++;
+    }
+
+    public static int getRevision() {
+        return revision;
     }
 
     public static void save() {

src/main/java/codechicken/nei/ItemCraftablesPanel.java

@@ -117,7 +117,8 @@ public List<CraftablesGridSlot> getMask() {
                                 .entrySet().stream()
                                 .sorted(
                                         Map.Entry.comparingByKey(
-                                                Comparator.comparing(FavoriteRecipes::contains).reversed()
+                                                Comparator.comparing(FavoriteRecipes::containsManual)
+                                                        .thenComparing(FavoriteRecipes::contains).reversed()
                                                         .thenComparing(ItemSorter.instance)))
                                 .limit(maxSlotIndex).collect(Collectors.toList());
                         int slotIndex = 0;

src/main/java/codechicken/nei/PositionedStack.java

@@ -104,7 +104,7 @@ public List<ItemStack> getFilteredPermutations(ItemFilter additionalFilter) {
         items = filteringPermutations(items, GuiRecipe.getSearchItemFilter());
         items = filteringPermutations(items, additionalFilter);
 
-        items.sort(Comparator.comparing(FavoriteRecipes::contains).reversed());
+        items.sort(Comparator.comparing(FavoriteRecipes::containsManual).reversed());
         return items;
     }
 

src/main/java/codechicken/nei/SearchField.java

@@ -222,7 +222,6 @@ public boolean handleClick(int mousex, int mousey, int button) {
     public void onTextChange(String oldText) {
         final String newText = text();
         if (!newText.equals(oldText)) {
-            if (newText.length() > 0) NEIClientConfig.logger.debug("Searching for " + newText);
             NEIClientConfig.setSearchExpression(newText);
             ItemList.updateFilter.restart();
         }