3 files changed, 30 insertions, 8 deletions
diff --git a/src/main/java/me/shedaniel/rei/client/ClientHelper.java b/src/main/java/me/shedaniel/rei/client/ClientHelper.java
index 8ca032457..6fad5e437 100644
--- a/src/main/java/me/shedaniel/rei/client/ClientHelper.java
+++ b/src/main/java/me/shedaniel/rei/client/ClientHelper.java
@@ -1,5 +1,6 @@
 package me.shedaniel.rei.client;
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import io.netty.buffer.Unpooled;
 import me.shedaniel.rei.RoughlyEnoughItemsCore;
@@ -16,9 +17,7 @@ import net.fabricmc.fabric.impl.client.keybinding.KeyBindingRegistryImpl;
 import net.fabricmc.loader.FabricLoader;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.Mouse;
-import net.minecraft.client.gui.ContainerGui;
 import net.minecraft.client.gui.Gui;
-import net.minecraft.client.resource.language.I18n;
 import net.minecraft.client.util.InputUtil;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentHelper;
@@ -32,9 +31,8 @@ import net.minecraft.util.PacketByteBuf;
 import net.minecraft.util.registry.Registry;
 
 import java.awt.*;
-import java.awt.event.KeyEvent;
+import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -126,6 +124,17 @@ public class ClientHelper implements ClientLoaded, ClientModInitializer {
         MinecraftClient.getInstance().openGui(new ConfigWidget(parent));
     }
     
+    public static List<ItemStack> getInventoryItemsTypes() {
+        List<DefaultedList<ItemStack>> field_7543 = ImmutableList.of(MinecraftClient.getInstance().player.inventory.main, MinecraftClient.getInstance().player.inventory.armor
+                , MinecraftClient.getInstance().player.inventory.offHand);
+        List<ItemStack> inventoryStacks = new ArrayList<>();
+        field_7543.forEach(itemStacks -> itemStacks.forEach(itemStack -> {
+            if (!itemStack.getItem().equals(Items.AIR))
+                inventoryStacks.add(itemStack);
+        }));
+        return inventoryStacks;
+    }
+    
     @Override
     public void clientLoaded() {
         Registry.ITEM.forEach(item -> {
diff --git a/src/main/java/me/shedaniel/rei/client/ConfigHelper.java b/src/main/java/me/shedaniel/rei/client/ConfigHelper.java
index 5261ee291..3f1cb79c2 100644
--- a/src/main/java/me/shedaniel/rei/client/ConfigHelper.java
+++ b/src/main/java/me/shedaniel/rei/client/ConfigHelper.java
@@ -67,18 +67,22 @@ public class ConfigHelper {
         config.itemListOrdering = ordering;
     }
     
-    public void setAscending(boolean ascending) {
-        config.isAscending = ascending;
-    }
-    
     public boolean isAscending() {
         return config.isAscending;
     }
     
+    public void setAscending(boolean ascending) {
+        config.isAscending = ascending;
+    }
+    
     public boolean craftableOnly() {
         return craftableOnly && config.enableCraftableOnlyButton;
     }
     
+    public void toggleCraftableOnly() {
+        craftableOnly = !craftableOnly;
+    }
+    
     public boolean showCraftableOnlyButton() {
         return config.enableCraftableOnlyButton;
     }
diff --git a/src/main/java/me/shedaniel/rei/client/GuiHelper.java b/src/main/java/me/shedaniel/rei/client/GuiHelper.java
index f9b14e4a8..bae2d852a 100644
--- a/src/main/java/me/shedaniel/rei/client/GuiHelper.java
+++ b/src/main/java/me/shedaniel/rei/client/GuiHelper.java
@@ -1,15 +1,20 @@
 package me.shedaniel.rei.client;
 
+import com.google.common.collect.Lists;
 import me.shedaniel.rei.gui.ContainerGuiOverlay;
 import me.shedaniel.rei.gui.widget.TextFieldWidget;
 import me.shedaniel.rei.listeners.IMixinContainerGui;
 import net.minecraft.client.gui.ContainerGui;
+import net.minecraft.item.ItemStack;
+
+import java.util.List;
 
 public class GuiHelper {
     
     public static TextFieldWidget searchField;
     private static boolean overlayVisible = true;
     private static ContainerGuiOverlay overlay;
+    public static List<ItemStack> inventoryStacks = Lists.newArrayList();
     
     public static boolean isOverlayVisible() {
         return overlayVisible;
@@ -27,6 +32,10 @@ public class GuiHelper {
         return overlay;
     }
     
+    public static ContainerGuiOverlay getLastOverlay() {
+        return overlay;
+    }
+    
     public static void setOverlay(ContainerGuiOverlay overlay) {
         GuiHelper.overlay = overlay;
         overlay.onInitialized();