Fix bug

4 files changed, 16 insertions, 9 deletions

diff --git a/gradle.properties b/gradle.properties
index 475a33fc3..87ae622c6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-modVersion=2.4.0.60
+modVersion=2.4.0.61
 minecraftVersion=19w09a
 yarnVersion=19w09a.4
 fabricVersion=0.2.3.108
diff --git a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
index 43c199fde..0fafdda42 100644
--- a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
+++ b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
@@ -384,9 +384,10 @@ public class ContainerScreenOverlay extends ScreenComponent {
     
     @Override
     public boolean keyPressed(int int_1, int int_2, int int_3) {
-        for(InputListener listener : widgets)
-            if (listener.keyPressed(int_1, int_2, int_3))
-                return true;
+        if (ScreenHelper.isOverlayVisible())
+            for(InputListener listener : widgets)
+                if (listener.keyPressed(int_1, int_2, int_3))
+                    return true;
         if (ClientHelper.HIDE.matchesKey(int_1, int_2)) {
             ScreenHelper.toggleOverlayVisible();
             return true;
diff --git a/src/main/java/me/shedaniel/rei/gui/widget/ItemListOverlay.java b/src/main/java/me/shedaniel/rei/gui/widget/ItemListOverlay.java
index 4d5916a15..5af711e0c 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/ItemListOverlay.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/ItemListOverlay.java
@@ -95,7 +95,7 @@ public class ItemListOverlay extends DrawableHelper implements IWidget {
             int j = i + page * getTotalSlotsPerPage();
             if (j >= currentDisplayed.size())
                 break;
-            ItemSlotWidget slotWidget = new ItemSlotWidget((int) (startX + (i % width) * 18), (int) (startY + MathHelper.floor(i / width) * 18), currentDisplayed.get(j), false, true) {
+            ItemSlotWidget slotWidget = new ItemSlotWidget((int) (startX + (i % width) * 18), (int) (startY + MathHelper.floor(i / width) * 18), Collections.singletonList(currentDisplayed.get(j)), false, true, true) {
                 @Override
                 protected void drawToolTip(ItemStack itemStack) {
                     ClientPlayerEntity player = MinecraftClient.getInstance().player;
@@ -125,6 +125,14 @@ public class ItemListOverlay extends DrawableHelper implements IWidget {
         }
     }
     
+    @Override
+    public boolean keyPressed(int int_1, int int_2, int int_3) {
+        for(IWidget widget : widgets)
+            if (widget.keyPressed(int_1, int_2, int_3))
+                return true;
+        return false;
+    }
+    
     public List<ItemStack> getCurrentDisplayed() {
         return currentDisplayed;
     }
diff --git a/src/main/java/me/shedaniel/rei/gui/widget/ItemSlotWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/ItemSlotWidget.java
index 65d43e017..04f8ad9c8 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/ItemSlotWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/ItemSlotWidget.java
@@ -14,9 +14,7 @@ import net.minecraft.util.Identifier;
 import net.minecraft.util.math.MathHelper;
 
 import java.awt.*;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedList;
+import java.util.*;
 import java.util.List;
 
 public class ItemSlotWidget extends DrawableHelper implements HighlightableWidget {
@@ -27,7 +25,7 @@ public class ItemSlotWidget extends DrawableHelper implements HighlightableWidge
     private int x, y;
     
     public ItemSlotWidget(int x, int y, ItemStack itemStack, boolean drawBackground, boolean showToolTips) {
-        this(x, y, Arrays.asList(itemStack), drawBackground, showToolTips);
+        this(x, y, Collections.singletonList(itemStack), drawBackground, showToolTips);
     }
     
     public ItemSlotWidget(int x, int y, List<ItemStack> itemList, boolean drawBackground, boolean showToolTips) {