Fixed Favorite Recipes in bookmarks for ingredients (#720)

src/main/java/codechicken/nei/ItemHistoryPanel.java

@@ -7,14 +7,27 @@ import net.minecraft.item.ItemStack;
 
 import codechicken.nei.ItemsGrid.ItemsGridSlot;
 import codechicken.nei.ItemsGrid.MouseContext;
+import codechicken.nei.recipe.Recipe.RecipeId;
 import codechicken.nei.recipe.StackInfo;
 
-public class ItemHistoryPanel extends AbstractSubpanel<ItemsGrid<ItemsGridSlot, MouseContext>> {
+public class ItemHistoryPanel extends AbstractSubpanel<ItemsGrid<ItemHistoryPanel.HistoryGridSlot, MouseContext>> {
+
+    public static class HistoryGridSlot extends ItemsGridSlot {
+
+        public HistoryGridSlot(int slotIndex, int itemIndex, ItemStack item) {
+            super(slotIndex, itemIndex, item);
+        }
+
+        @Override
+        public RecipeId getRecipeId() {
+            return FavoriteRecipes.getFavorite(this.item);
+        }
+    }
 
     public ItemHistoryPanel() {
         this.grid = new ItemsGrid<>() {
 
-            protected List<ItemsGridSlot> gridMask;
+            protected List<HistoryGridSlot> gridMask;
 
             @Override
             protected void onGridChanged() {
@@ -23,12 +36,12 @@ public class ItemHistoryPanel extends AbstractSubpanel<ItemsGrid<ItemsGridSlot,
             }
 
             @Override
-            public List<ItemsGridSlot> getMask() {
+            public List<HistoryGridSlot> getMask() {
 
                 if (this.gridMask == null) {
                     this.gridMask = new ArrayList<>();
                     for (int slotIndex = 0; slotIndex < Math.min(size(), this.rows * this.columns); slotIndex++) {
-                        this.gridMask.add(new ItemsGridSlot(slotIndex, slotIndex, getItem(slotIndex)));
+                        this.gridMask.add(new HistoryGridSlot(slotIndex, slotIndex, getItem(slotIndex)));
                     }
                 }
 
@@ -37,7 +50,7 @@ public class ItemHistoryPanel extends AbstractSubpanel<ItemsGrid<ItemsGridSlot,
 
             @Override
             protected MouseContext getMouseContext(int mousex, int mousey) {
-                final ItemsGridSlot hovered = getSlotMouseOver(mousex, mousey);
+                final HistoryGridSlot hovered = getSlotMouseOver(mousex, mousey);
 
                 if (hovered != null) {
                     return new MouseContext(

src/main/java/codechicken/nei/recipe/GuiCraftingRecipe.java

@@ -13,6 +13,7 @@ import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.item.ItemStack;
 
 import codechicken.lib.gui.GuiDraw;
+import codechicken.nei.FavoriteRecipes;
 import codechicken.nei.ItemPanels;
 import codechicken.nei.ItemsGrid.ItemsGridSlot;
 import codechicken.nei.NEIClientConfig;
@@ -123,10 +124,10 @@ public class GuiCraftingRecipe extends GuiRecipe<ICraftingHandler> {
 
         final Point mouseover = GuiDraw.getMousePosition();
         final BookmarksGridSlot panelSlot = ItemPanels.bookmarkPanel.getSlotMouseOver(mouseover.x, mouseover.y);
-        RecipeId recipeId = null;
 
-        if (panelSlot != null && !panelSlot.isIngredient()) {
-            recipeId = panelSlot.getRecipeId();
+        if (panelSlot != null) {
+            return panelSlot.isIngredient() || panelSlot.getRecipeId() == null ? FavoriteRecipes.getFavorite(stackover)
+                    : panelSlot.getRecipeId();
         }
 
         ItemsGridSlot itemSlot = ItemPanels.itemPanel.getSlotMouseOver(mouseover.x, mouseover.y);
@@ -143,7 +144,7 @@ public class GuiCraftingRecipe extends GuiRecipe<ICraftingHandler> {
             return itemSlot.getRecipeId();
         }
 
-        return recipeId;
+        return null;
     }
 
     private GuiCraftingRecipe(ArrayList<ICraftingHandler> handlers, boolean limitToOneRecipe) {