Merge remote-tracking branch 'origin/8.x-1.18.2' into modularity

# Conflicts:
#	api/build.gradle
#	default-plugin/build.gradle
#	forge/src/main/java/me/shedaniel/rei/forge/PluginDetectorImpl.java
#	runtime-frontend/overlay-entries/src/main/java/me/shedaniel/rei/impl/client/gui/overlay/entries/EntryListStackEntry.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/AbstractDisplayViewingScreen.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/CompositeDisplayViewingScreen.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/DefaultDisplayViewingScreen.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/InternalWidgets.java

3 files changed, 22 insertions, 19 deletions

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/AbstractDisplayViewingScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/AbstractDisplayViewingScreen.java
index 7a704e62b..66d297f1b 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/AbstractDisplayViewingScreen.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/AbstractDisplayViewingScreen.java
@@ -31,6 +31,7 @@ import com.mojang.math.Matrix4f;
 import dev.architectury.fluid.FluidStack;
 import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.client.REIRuntime;
+import me.shedaniel.rei.api.client.config.ConfigObject;
 import me.shedaniel.rei.api.client.gui.screen.DisplayScreen;
 import me.shedaniel.rei.api.client.gui.widgets.Slot;
 import me.shedaniel.rei.api.client.gui.widgets.Tooltip;
@@ -48,8 +49,12 @@ import me.shedaniel.rei.api.common.entry.type.EntryType;
 import me.shedaniel.rei.api.common.entry.type.VanillaEntryTypes;
 import me.shedaniel.rei.api.common.util.CollectionUtils;
 import me.shedaniel.rei.impl.client.ClientHelperImpl;
+import me.shedaniel.rei.impl.client.REIRuntimeImpl;
+import me.shedaniel.rei.impl.client.gui.widget.EntryWidget;
+import me.shedaniel.rei.impl.client.gui.widget.entrylist.EntryListWidget;
 import me.shedaniel.rei.impl.display.DisplaySpec;
 import net.minecraft.ChatFormatting;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.chat.NarratorChatListener;
 import net.minecraft.client.gui.components.events.GuiEventListener;
@@ -378,7 +383,21 @@ public abstract class AbstractDisplayViewingScreen extends Screen implements Dis
     
     @Override
     public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
-        return super.keyPressed(keyCode, scanCode, modifiers) || (getOverlay().keyPressed(keyCode, scanCode, modifiers) && handleFocuses());
+        if (super.keyPressed(keyCode, scanCode, modifiers) || (getOverlay().keyPressed(keyCode, scanCode, modifiers) && handleFocuses()))
+            return true;
+        if (ConfigObject.getInstance().getPreviousScreenKeybind().matchesKey(keyCode, scanCode)) {
+            if (REIRuntimeImpl.getInstance().hasLastDisplayScreen()) {
+                minecraft.setScreen(REIRuntimeImpl.getInstance().getLastDisplayScreen());
+            } else {
+                minecraft.setScreen(REIRuntime.getInstance().getPreviousScreen());
+            }
+            return true;
+        }
+        if (this.minecraft.options.keyInventory.matches(keyCode, scanCode)) {
+            Minecraft.getInstance().setScreen(REIRuntime.getInstance().getPreviousScreen());
+            return true;
+        }
+        return false;
     }
     
     @Override
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/CompositeDisplayViewingScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/CompositeDisplayViewingScreen.java
index 4f77e677a..5e2da119e 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/CompositeDisplayViewingScreen.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/CompositeDisplayViewingScreen.java
@@ -446,18 +446,10 @@ public class CompositeDisplayViewingScreen extends AbstractDisplayViewingScreen
         for (GuiEventListener element : children())
             if (element.keyPressed(keyCode, scanCode, modifiers))
                 return true;
-        if (keyCode == 256 || this.minecraft.options.keyInventory.matches(keyCode, scanCode)) {
+        if (keyCode == 256) {
             Minecraft.getInstance().setScreen(REIRuntime.getInstance().getPreviousScreen());
             return true;
         }
-        if (ConfigObject.getInstance().getPreviousScreenKeybind().matchesKey(keyCode, scanCode)) {
-            if (DisplayScreenStack.hasLastDisplayScreen()) {
-                minecraft.setScreen(DisplayScreenStack.getLastDisplayScreen());
-            } else {
-                minecraft.setScreen(REIRuntime.getInstance().getPreviousScreen());
-            }
-            return true;
-        }
         return super.keyPressed(keyCode, scanCode, modifiers);
     }
 }
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/DefaultDisplayViewingScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/DefaultDisplayViewingScreen.java
index f11a66827..85504c2e1 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/DefaultDisplayViewingScreen.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/DefaultDisplayViewingScreen.java
@@ -123,18 +123,10 @@ public class DefaultDisplayViewingScreen extends AbstractDisplayViewingScreen {
         for (GuiEventListener element : children())
             if (element.keyPressed(keyCode, scanCode, modifiers))
                 return true;
-        if (keyCode == 256 || this.minecraft.options.keyInventory.matches(keyCode, scanCode)) {
+        if (keyCode == 256) {
             Minecraft.getInstance().setScreen(REIRuntime.getInstance().getPreviousScreen());
             return true;
         }
-        if (ConfigObject.getInstance().getPreviousScreenKeybind().matchesKey(keyCode, scanCode)) {
-            if (DisplayScreenStack.hasLastDisplayScreen()) {
-                minecraft.setScreen(DisplayScreenStack.getLastDisplayScreen());
-            } else {
-                minecraft.setScreen(REIRuntime.getInstance().getPreviousScreen());
-            }
-            return true;
-        }
         return super.keyPressed(keyCode, scanCode, modifiers);
     }