Fix tinkers transfer

3 files changed, 17 insertions, 9 deletions

diff --git a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/clean/InputCleanHandler.java b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/clean/InputCleanHandler.java
index 38fac60ce..934893518 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/clean/InputCleanHandler.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/clean/InputCleanHandler.java
@@ -43,7 +43,7 @@ public interface InputCleanHandler<T extends AbstractContainerMenu, D extends Di
     static <T extends AbstractContainerMenu> void returnSlotsToPlayerInventory(MenuInfoContext<T, ?, ?> context, DumpHandler<T, ?> dumpHandler, SlotAccessor slotAccessor) {
         ItemStack stackToReturn = slotAccessor.getItemStack();
         if (!stackToReturn.isEmpty()) {
-            for (; stackToReturn.getCount() > 0; slotAccessor.takeStack(1)) {
+            for (; !(stackToReturn = slotAccessor.getItemStack()).isEmpty(); slotAccessor.takeStack(1)) {
                 ItemStack stackToInsert = stackToReturn.copy();
                 stackToInsert.setCount(1);
                 if (!dumpGenericsFtw(context, dumpHandler, stackToInsert)) {
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/simple/RecipeBookGridMenuInfo.java b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/simple/RecipeBookGridMenuInfo.java
index 2f07aaa6c..66d6bc688 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/simple/RecipeBookGridMenuInfo.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/simple/RecipeBookGridMenuInfo.java
@@ -25,6 +25,8 @@ package me.shedaniel.rei.api.common.transfer.info.simple;
 
 import me.shedaniel.rei.api.common.display.SimpleGridMenuDisplay;
 import me.shedaniel.rei.api.common.transfer.RecipeFinder;
+import me.shedaniel.rei.api.common.transfer.info.MenuInfoContext;
+import net.minecraft.world.entity.player.StackedContents;
 import net.minecraft.world.inventory.RecipeBookMenu;
 import net.minecraft.world.item.ItemStack;
 
@@ -50,8 +52,8 @@ public class RecipeBookGridMenuInfo<T extends RecipeBookMenu<?>, D extends Simpl
     }
     
     @Override
-    public void populateRecipeFinder(T menu, RecipeFinder finder) {
-        menu.fillCraftSlotsStackedContents(new net.minecraft.world.entity.player.StackedContents() {
+    public void populateRecipeFinder(MenuInfoContext<T, ?, D> context, RecipeFinder finder) {
+        context.getMenu().fillCraftSlotsStackedContents(new StackedContents() {
             @Override
             public void accountSimpleStack(ItemStack stack) {
                 finder.addNormalItem(stack);
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/simple/SimplePlayerInventoryMenuInfo.java b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/simple/SimplePlayerInventoryMenuInfo.java
index 3c595f32b..43ffc068b 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/simple/SimplePlayerInventoryMenuInfo.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/simple/SimplePlayerInventoryMenuInfo.java
@@ -23,7 +23,6 @@
 
 package me.shedaniel.rei.api.common.transfer.info.simple;
 
-import com.google.common.base.MoreObjects;
 import me.shedaniel.rei.api.common.display.Display;
 import me.shedaniel.rei.api.common.transfer.RecipeFinder;
 import me.shedaniel.rei.api.common.transfer.RecipeFinderPopulator;
@@ -53,7 +52,7 @@ public interface SimplePlayerInventoryMenuInfo<T extends AbstractContainerMenu,
             for (SlotAccessor inventoryStack : getInventorySlots(context)) {
                 finder.addNormalItem(inventoryStack.getItemStack());
             }
-            populateRecipeFinder(context.getMenu(), finder);
+            populateRecipeFinder(context, finder);
         };
     }
     
@@ -76,11 +75,10 @@ public interface SimplePlayerInventoryMenuInfo<T extends AbstractContainerMenu,
     default DumpHandler<T, D> getDumpHandler() {
         return (context, stackToDump) -> {
             Iterable<SlotAccessor> inventoryStacks = getInventorySlots(context);
+            SlotAccessor occupiedSlotWithRoomForStack = DumpHandler.getOccupiedSlotWithRoomForStack(stackToDump, inventoryStacks);
+            SlotAccessor emptySlot = DumpHandler.getEmptySlot(inventoryStacks);
             
-            SlotAccessor nextSlot = MoreObjects.firstNonNull(
-                    DumpHandler.getOccupiedSlotWithRoomForStack(stackToDump, inventoryStacks),
-                    DumpHandler.getEmptySlot(inventoryStacks)
-            );
+            SlotAccessor nextSlot = occupiedSlotWithRoomForStack == null ? emptySlot : occupiedSlotWithRoomForStack;
             if (nextSlot == null) {
                 return false;
             }
@@ -99,8 +97,16 @@ public interface SimplePlayerInventoryMenuInfo<T extends AbstractContainerMenu,
                 .collect(Collectors.toList());
     }
     
+    @Deprecated(forRemoval = true)
     default void populateRecipeFinder(T menu, RecipeFinder finder) {}
     
+    default void populateRecipeFinder(MenuInfoContext<T, ?, D> context, RecipeFinder finder) {
+        for (SlotAccessor inventoryStack : getInputSlots(context)) {
+            finder.addNormalItem(inventoryStack.getItemStack());
+        }
+        populateRecipeFinder(context.getMenu(), finder);
+    }
+    
     /**
      * Used to forcefully clear the input slots, if things did not dump to the player's inventory successfully.
      * The default implementation here is to void the items, as with vanilla,