From c621a16ab3d3d94be3926e72a77aba2636197e6c Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Sat, 5 Sep 2020 15:36:09 +0200
Subject: [PATCH] Added JEI ghost ingredient dragging support.

---
 CHANGELOG.md                                             | 3 +++
 build.gradle                                             | 6 +++---
 .../integration/jei/GhostIngredientHandler.java          | 9 +++++++--
 .../refinedstorage/integration/jei/RSJeiPlugin.java      | 4 +---
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e99aa5925..52d1e71a9 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Refined Storage Changelog
 
+### 1.9.5
+- Added JEI ghost ingredient dragging support (raoulvdberge)
+
 ### 1.9.4
 - Fixed JEI recipes/usages keys not working in Grids (raoulvdberge)
 
diff --git a/build.gradle b/build.gradle
index 3b211a745..3d06afe90 100755
--- a/build.gradle
+++ b/build.gradle
@@ -94,10 +94,10 @@ processResources {
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.16.2-33.0.20'
+    minecraft 'net.minecraftforge:forge:1.16.2-33.0.37'
 
-    compileOnly fg.deobf("mezz.jei:jei-1.16.2:7.1.3.19:api")
-    runtimeOnly fg.deobf("mezz.jei:jei-1.16.2:7.1.3.19")
+    compileOnly fg.deobf("mezz.jei:jei-1.16.2:7.3.2.25:api")
+    runtimeOnly fg.deobf("mezz.jei:jei-1.16.2:7.3.2.25")
 
     compileOnly 'mouse-tweaks:MouseTweaks:2.13:mc1.16.2'
 
diff --git a/src/main/java/com/refinedmods/refinedstorage/integration/jei/GhostIngredientHandler.java b/src/main/java/com/refinedmods/refinedstorage/integration/jei/GhostIngredientHandler.java
index 8534d780c..8f2ed69f5 100644
--- a/src/main/java/com/refinedmods/refinedstorage/integration/jei/GhostIngredientHandler.java
+++ b/src/main/java/com/refinedmods/refinedstorage/integration/jei/GhostIngredientHandler.java
@@ -1,13 +1,18 @@
 package com.refinedmods.refinedstorage.integration.jei;
 
+import com.refinedmods.refinedstorage.RS;
 import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot;
 import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot;
 import com.refinedmods.refinedstorage.container.slot.legacy.LegacyFilterSlot;
+import com.refinedmods.refinedstorage.network.SetFilterSlotMessage;
+import com.refinedmods.refinedstorage.network.SetFluidFilterSlotMessage;
 import com.refinedmods.refinedstorage.screen.BaseScreen;
+import com.refinedmods.refinedstorage.util.StackUtils;
 import mezz.jei.api.gui.handlers.IGhostIngredientHandler;
 import net.minecraft.client.renderer.Rectangle2d;
 import net.minecraft.inventory.container.Slot;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidAttributes;
 import net.minecraftforge.fluids.FluidStack;
 
 import java.util.ArrayList;
@@ -37,7 +42,7 @@ public class GhostIngredientHandler implements IGhostIngredientHandler<BaseScree
                         public void accept(I ingredient) {
                             slot.putStack((ItemStack) ingredient);
 
-                            // RS.INSTANCE.network.sendToServer(new MessageSlotFilterSet(slot.slotNumber, (ItemStack) ingredient));
+                            RS.NETWORK_HANDLER.sendToServer(new SetFilterSlotMessage(slot.slotNumber, (ItemStack) ingredient));
                         }
                     });
                 }
@@ -51,7 +56,7 @@ public class GhostIngredientHandler implements IGhostIngredientHandler<BaseScree
 
                         @Override
                         public void accept(I ingredient) {
-                            // RS.INSTANCE.network.sendToServer(new MessageSlotFilterSetFluid(slot.slotNumber, StackUtils.copy((FluidStack) ingredient, Fluid.BUCKET_VOLUME)));
+                            RS.NETWORK_HANDLER.sendToServer(new SetFluidFilterSlotMessage(slot.slotNumber, StackUtils.copy((FluidStack) ingredient, FluidAttributes.BUCKET_VOLUME)));
                         }
                     });
                 }
diff --git a/src/main/java/com/refinedmods/refinedstorage/integration/jei/RSJeiPlugin.java b/src/main/java/com/refinedmods/refinedstorage/integration/jei/RSJeiPlugin.java
index 454f1bac0..be645ce6b 100644
--- a/src/main/java/com/refinedmods/refinedstorage/integration/jei/RSJeiPlugin.java
+++ b/src/main/java/com/refinedmods/refinedstorage/integration/jei/RSJeiPlugin.java
@@ -28,9 +28,7 @@ public class RSJeiPlugin implements IModPlugin {
     @Override
     public void registerGuiHandlers(IGuiHandlerRegistration registration) {
         registration.addGenericGuiContainerHandler(BaseScreen.class, new GuiContainerHandler());
-
-        // TODO: https://github.com/mezz/JustEnoughItems/issues/1307
-        // registration.addGhostIngredientHandler(BaseScreen.class, new GhostIngredientHandler());
+        registration.addGhostIngredientHandler(BaseScreen.class, new GhostIngredientHandler());
     }
 
     @Override