Re-add JEI integration

build.gradle

@@ -95,10 +95,13 @@ processResources {
 
 dependencies {
     minecraft 'net.minecraftforge:forge:1.15.1-30.0.41'
-    //compileOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.11:api")
+
+    compileOnly fg.deobf("mezz.jei:jei-1.15.1:6.0.0.1:api")
+    runtimeOnly fg.deobf("mezz.jei:jei-1.15.1:6.0.0.1")
+
     //compileOnly 'mouse-tweaks:MouseTweaks:2.12:mc1.14.4'
+
     //runtimeOnly fg.deobf('crafting-tweaks:CraftingTweaks_1.14.4:10.1.3')
-    //runtimeOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.11")
 }
 
 jar {

src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GuiContainerHandler.java

@@ -21,7 +21,7 @@ public class GuiContainerHandler implements IGuiContainerHandler<BaseScreen> {
             GridScreen grid = (GridScreen) screen;
 
             if (!grid.getSearchField().isFocused() && grid.isOverSlotArea(mouseX, mouseY)) {
-                return grid.getSlotNumber() >= 0 && grid.getSlotNumber() < grid.getView().getStacks().size() ? grid.getView().getStacks().get(grid.getSlotNumber()).getIngredient() : null;
+                return (grid.getSlotNumber() >= 0 && grid.getSlotNumber() < grid.getView().getStacks().size()) ? grid.getView().getStacks().get(grid.getSlotNumber()).getIngredient() : null;
             }
         }
 

src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridTransferMessage.java

@@ -4,6 +4,7 @@ import com.raoulvdberge.refinedstorage.api.network.grid.GridType;
 import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
 import com.raoulvdberge.refinedstorage.container.GridContainer;
 import com.raoulvdberge.refinedstorage.util.StackUtils;
+import mezz.jei.api.gui.ingredient.IGuiIngredient;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.inventory.container.Slot;
 import net.minecraft.item.ItemStack;
@@ -15,9 +16,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.function.Supplier;
 
-// TODO
 public class GridTransferMessage {
-    //private Map<Integer, ? extends IGuiIngredient<ItemStack>> inputs;
+    private Map<Integer, ? extends IGuiIngredient<ItemStack>> inputs;
     private List<Slot> slots;
 
     private ItemStack[][] recipe = new ItemStack[9][];
@@ -25,10 +25,10 @@ public class GridTransferMessage {
     public GridTransferMessage() {
     }
 
-    /*public GridTransferMessage(Map<Integer, ? extends IGuiIngredient<ItemStack>> inputs, List<Slot> slots) {
+    public GridTransferMessage(Map<Integer, ? extends IGuiIngredient<ItemStack>> inputs, List<Slot> slots) {
         this.inputs = inputs;
         this.slots = slots;
-    }*/
+    }
 
     public static GridTransferMessage decode(PacketBuffer buf) {
         GridTransferMessage msg = new GridTransferMessage();
@@ -52,7 +52,7 @@ public class GridTransferMessage {
         buf.writeInt(message.slots.size());
 
         for (Slot slot : message.slots) {
-            /*IGuiIngredient<ItemStack> ingredient = message.inputs.get(slot.getSlotIndex() + 1);
+            IGuiIngredient<ItemStack> ingredient = message.inputs.get(slot.getSlotIndex() + 1);
 
             List<ItemStack> ingredients = new ArrayList<>();
 
@@ -68,7 +68,7 @@ public class GridTransferMessage {
 
             for (ItemStack possibleStack : ingredients) {
                 StackUtils.writeItemStack(buf, possibleStack);
-            }*/
+            }
         }
     }
 

src/main/java/com/raoulvdberge/refinedstorage/screen/widget/ScrollbarWidget.java

@@ -3,6 +3,7 @@ package com.raoulvdberge.refinedstorage.screen.widget;
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.raoulvdberge.refinedstorage.RS;
+import com.raoulvdberge.refinedstorage.integration.jei.GridRecipeTransferHandler;
 import com.raoulvdberge.refinedstorage.integration.jei.JeiIntegration;
 import com.raoulvdberge.refinedstorage.screen.BaseScreen;
 import com.raoulvdberge.refinedstorage.util.RenderUtils;
@@ -71,9 +72,9 @@ public class ScrollbarWidget implements IGuiEventListener {
 
         if (button == 0 && RenderUtils.inBounds(x, y, width, height, mx, my)) {
             // Prevent accidental scrollbar click after clicking recipe transfer button
-            /* TODO if (JeiIntegration.isLoaded() && System.currentTimeMillis() - GridRecipeTransferHandler.LAST_TRANSFER_TIME <= GridRecipeTransferHandler.TRANSFER_SCROLLBAR_DELAY_MS) {
+            if (JeiIntegration.isLoaded() && System.currentTimeMillis() - GridRecipeTransferHandler.LAST_TRANSFER_TIME <= GridRecipeTransferHandler.TRANSFER_SCROLLBAR_DELAY_MS) {
                 return false;
-            }*/
+            }
 
             updateOffset(my);
 

src/main/java/com/raoulvdberge/refinedstorage/screen/widget/SearchWidget.java

@@ -3,6 +3,7 @@ package com.raoulvdberge.refinedstorage.screen.widget;
 import com.raoulvdberge.refinedstorage.RSKeyBindings;
 import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
 import com.raoulvdberge.refinedstorage.integration.jei.JeiIntegration;
+import com.raoulvdberge.refinedstorage.integration.jei.RSJeiPlugin;
 import com.raoulvdberge.refinedstorage.render.RenderSettings;
 import com.raoulvdberge.refinedstorage.screen.BaseScreen;
 import net.minecraft.client.gui.FontRenderer;
@@ -28,7 +29,7 @@ public class SearchWidget extends TextFieldWidget {
 
     public void updateJei() {
         if (JeiIntegration.isLoaded() && (mode == IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED || mode == IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED)) {
-            /// TODO RSJeiPlugin.RUNTIME.getIngredientFilter().setFilterText(getText());
+            RSJeiPlugin.RUNTIME.getIngredientFilter().setFilterText(getText());
         }
     }