Remove some gui related capturing lambdas

pupnewfster · pupnewfster · commit 4f5ef0e152da · 2024-04-09T14:33:46.000-05:00
diff --git a/src/main/java/mekanism/client/gui/GuiMekanism.java b/src/main/java/mekanism/client/gui/GuiMekanism.java
@@ -5,8 +5,8 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.BiFunction;
 import java.util.function.BooleanSupplier;
-import java.util.function.Function;
 import java.util.function.Supplier;
 import mekanism.api.text.ILangEntry;
 import mekanism.client.gui.element.GuiElement;
@@ -194,7 +194,8 @@ public ItemStack getCarriedItem() {
     }
 
     @Nullable
-    private ComponentPath handleNavigationWithWindows(Function<ContainerEventHandler, @Nullable ComponentPath> handleNavigation) {
+    private <NAVIGATION extends FocusNavigationEvent> ComponentPath handleNavigationWithWindows(NAVIGATION navigation,
+          BiFunction<ContainerEventHandler, NAVIGATION, @Nullable ComponentPath> handleNavigation) {
         GuiWindow topWindow = windows.head();
         List<GuiEventListener> combinedChildren;
         //Note: As allowContainer wise only allows interacting with slots, which we don't have navigation for, we check against allowAll.
@@ -239,7 +240,7 @@ public ScreenRectangle getRectangle() {
                 return GuiMekanism.this.getRectangle();
             }
         };
-        ComponentPath componentPath = handleNavigation.apply(handlerWithWindows);
+        ComponentPath componentPath = handleNavigation.apply(handlerWithWindows, navigation);
         if (componentPath == null) {
             return null;
         } else if (componentPath instanceof ComponentPath.Path path) {
@@ -259,7 +260,7 @@ public ComponentPath handleTabNavigation(@NotNull FocusNavigationEvent.TabNaviga
         if (windows.isEmpty()) {
             return super.handleTabNavigation(navigation);
         }
-        return handleNavigationWithWindows(handlerWithWindows -> handlerWithWindows.handleTabNavigation(navigation));
+        return handleNavigationWithWindows(navigation, ContainerEventHandler::handleTabNavigation);
     }
 
     @Nullable
@@ -268,7 +269,7 @@ public ComponentPath handleArrowNavigation(@NotNull FocusNavigationEvent.ArrowNa
         if (windows.isEmpty()) {
             return super.handleArrowNavigation(navigation);
         }
-        return handleNavigationWithWindows(handlerWithWindows -> handlerWithWindows.handleArrowNavigation(navigation));
+        return handleNavigationWithWindows(navigation, ContainerEventHandler::handleArrowNavigation);
     }
 
     @Override
@@ -376,7 +377,7 @@ protected void renderLabels(@NotNull GuiGraphics guiGraphics, int mouseX, int mo
         // then render tooltips, translating above max z offset to prevent clashing
         GuiElement tooltipElement = getWindowHovering(mouseX, mouseY);
         if (tooltipElement == null) {
-            tooltipElement = (GuiElement) GuiUtils.findChild(children(), child -> child instanceof GuiElement && child.isMouseOver(mouseX, mouseY));
+            tooltipElement = (GuiElement) GuiUtils.findChild(children(), mouseX, mouseY, (child, x, y) -> child instanceof GuiElement && child.isMouseOver(x, y));
         }
 
         // translate forwards using RenderSystem. this should never have to happen as we do all the necessary translations with MatrixStacks,
@@ -458,7 +459,7 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
         }
         // otherwise, we send it to the current element (this is the same as super.super [ContainerEventHandler#mouseClicked], but in reverse order)
         //TODO: Why do we do this in reverse order?
-        GuiEventListener clickedChild = GuiUtils.findChild(children(), child -> child.mouseClicked(mouseX, mouseY, button));
+        GuiEventListener clickedChild = GuiUtils.findChild(children(), mouseX, mouseY, button, GuiEventListener::mouseClicked);
         if (clickedChild != null) {
             setFocused(clickedChild);
             if (button == GLFW.GLFW_MOUSE_BUTTON_LEFT) {
@@ -491,7 +492,7 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
                 return true;
             }
         }
-        return GuiUtils.checkChildren(children(), child -> child instanceof GuiElement && child.keyPressed(keyCode, scanCode, modifiers)) ||
+        return GuiUtils.checkChildren(children(), keyCode, scanCode, modifiers, (child, k, s, m) -> child instanceof GuiElement && child.keyPressed(k, s, m)) ||
                super.keyPressed(keyCode, scanCode, modifiers);
     }
 
@@ -502,7 +503,7 @@ public boolean charTyped(char c, int keyCode) {
                 return true;
             }
         }
-        return GuiUtils.checkChildren(children(), child -> child instanceof GuiElement && child.charTyped(c, keyCode)) || super.charTyped(c, keyCode);
+        return GuiUtils.checkChildrenChar(children(), c, keyCode, (child, ch, k) -> child instanceof GuiElement && child.charTyped(ch, k)) || super.charTyped(c, keyCode);
     }
 
     /**
@@ -550,8 +551,12 @@ protected Slot findSlot(double mouseX, double mouseY) {
                 if (overNoButtons && slot.isActive()) {
                     if (window == null) {
                         return slot;
-                    } else if (virtual && window.childrenContainsElement(element -> element instanceof GuiVirtualSlot v && v.isElementForSlot((IVirtualSlot) slot))) {
-                        return slot;
+                    } else if (virtual) {
+                        for (GuiElement child : window.children()) {
+                            if (child instanceof GuiVirtualSlot v && v.isElementForSlot((IVirtualSlot) slot)) {
+                                return slot;
+                            }
+                        }
                     }
                 }
             }
@@ -570,8 +575,14 @@ protected boolean isMouseOverSlot(@NotNull Slot slot, double mouseX, double mous
                 if (super.isHovering(xPos, yPos, 16, 16, mouseX, mouseY)) {
                     GuiWindow window = getWindowHovering(mouseX, mouseY);
                     //If we are hovering over a window, check if the virtual slot is a child of the window
-                    if (window == null || window.childrenContainsElement(element -> element instanceof GuiVirtualSlot v && v.isElementForSlot(virtualSlot))) {
-                        return overNoButtons(window, mouseX, mouseY);
+                    if (window == null) {
+                        return overNoButtons((GuiWindow) null, mouseX, mouseY);
+                    } else {
+                        for (GuiElement child : window.children()) {
+                            if (child instanceof GuiVirtualSlot v && v.isElementForSlot(virtualSlot)) {
+                                return overNoButtons(window, mouseX, mouseY);
+                            }
+                        }
                     }
                 }
             }
@@ -582,14 +593,18 @@ protected boolean isMouseOverSlot(@NotNull Slot slot, double mouseX, double mous
 
     private boolean overNoButtons(@Nullable GuiWindow window, double mouseX, double mouseY) {
         if (window == null) {
-            for (GuiEventListener child : children()) {
-                if (child.isMouseOver(mouseX, mouseY)) {
-                    return false;
-                }
+            return overNoButtons(children(), mouseX, mouseY);
+        }
+        return overNoButtons(window.children(), mouseX, mouseY);
+    }
+
+    private static boolean overNoButtons(List<? extends GuiEventListener> children, double mouseX, double mouseY) {
+        for (GuiEventListener child : children) {
+            if (child.isMouseOver(mouseX, mouseY)) {
+                return false;
             }
-            return true;
         }
-        return !window.childrenContainsElement(e -> e.isMouseOver(mouseX, mouseY));
+        return true;
     }
 
     private boolean isVirtualSlotAvailable(IVirtualSlot virtualSlot) {
diff --git a/src/main/java/mekanism/client/gui/GuiUtils.java b/src/main/java/mekanism/client/gui/GuiUtils.java
@@ -180,6 +180,73 @@ public static <CHILD extends GuiEventListener> CHILD findChild(List<? extends CH
         return null;
     }
 
+    // reverse-order iteration over children w/ built-in GuiElement check, runs a basic anyMatch with checker
+    public static <CHILD extends GuiEventListener> boolean checkChildren(List<? extends CHILD> children, double mouseX, double mouseY, MouseOverPredicate<CHILD> checker) {
+        return findChild(children, mouseX, mouseY, checker) != null;
+    }
+
+    @Nullable
+    public static <CHILD extends GuiEventListener> CHILD findChild(List<? extends CHILD> children, double mouseX, double mouseY, MouseOverPredicate<CHILD> checker) {
+        for (int i = children.size() - 1; i >= 0; i--) {
+            CHILD child = children.get(i);
+            if (checker.test(child, mouseX, mouseY)) {
+                return child;
+            }
+        }
+        return null;
+    }
+
+    @Nullable
+    public static <CHILD extends GuiEventListener> CHILD findChild(List<? extends CHILD> children, double mouseX, double mouseY, int button, MouseClickedPredicate<CHILD> checker) {
+        for (int i = children.size() - 1; i >= 0; i--) {
+            CHILD child = children.get(i);
+            if (checker.test(child, mouseX, mouseY, button)) {
+                return child;
+            }
+        }
+        return null;
+    }
+
+    public static <CHILD extends GuiEventListener> boolean checkChildren(List<? extends CHILD> children, int keyCode, int scanCode, int modifiers, KeyPressedPredicate<CHILD> checker) {
+        for (int i = children.size() - 1; i >= 0; i--) {
+            CHILD child = children.get(i);
+            if (checker.test(child, keyCode, scanCode, modifiers)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static <CHILD extends GuiEventListener> boolean checkChildrenChar(List<? extends CHILD> children, char c, int keyCode, CharTypedPredicate<CHILD> checker) {
+        for (int i = children.size() - 1; i >= 0; i--) {
+            CHILD child = children.get(i);
+            if (checker.test(child, c, keyCode)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public interface MouseOverPredicate<ELEMENT> {
+
+        boolean test(ELEMENT element, double mouseX, double mouseY);
+    }
+
+    public interface MouseClickedPredicate<ELEMENT> {
+
+        boolean test(ELEMENT element, double mouseX, double mouseY, int button);
+    }
+
+    public interface KeyPressedPredicate<ELEMENT> {
+
+        boolean test(ELEMENT element, int keyCode, int scanCode, int modifiers);
+    }
+
+    public interface CharTypedPredicate<ELEMENT> {
+
+        boolean test(ELEMENT element, char c, int keyCode);
+    }
+
     public static int drawString(GuiGraphics guiGraphics, Font font, Component component, float x, float y, int color, boolean drawShadow) {
         return guiGraphics.drawString(font, component.getVisualOrderText(), x, y, color, drawShadow);
     }
diff --git a/src/main/java/mekanism/client/gui/element/GuiElement.java b/src/main/java/mekanism/client/gui/element/GuiElement.java
@@ -187,7 +187,7 @@ public void resize(int prevLeft, int prevTop, int left, int top) {
         }
     }
 
-    public boolean childrenContainsElement(Predicate<GuiElement> checker) {
+    public final boolean childrenContainsElement(Predicate<GuiElement> checker) {
         for (GuiElement child : children) {
             if (child.containsElement(checker)) {
                 return true;
@@ -320,7 +320,7 @@ public final void setDragging(boolean dragging) {
     public Optional<GuiEventListener> getChildAt(double mouseX, double mouseY) {
         if (checkWindows(mouseX, mouseY)) {
             //If we are are not covered by a window, try to locate which child we are over
-            return Optional.ofNullable(GuiUtils.findChild(children, child -> child.isMouseOver(mouseX, mouseY)));
+            return Optional.ofNullable(GuiUtils.findChild(children, mouseX, mouseY, GuiElement::isMouseOver));
         }
         return Optional.empty();
     }
@@ -405,7 +405,7 @@ protected boolean supportsArrowNavigation() {
     //TODO - 1.20: Do we want things like the merged bars/gauges to have setFocused also mark the "children" as focused?
     @Override
     public boolean mouseClicked(double mouseX, double mouseY, int button) {
-        GuiElement clickedChild = GuiUtils.findChild(children, child -> child.mouseClicked(mouseX, mouseY, button));
+        GuiElement clickedChild = GuiUtils.findChild(children, mouseX, mouseY, button, GuiElement::mouseClicked);
         //Note: This setFocused call is outside the clickedChild find, so that if we couldn't find one
         // then we un-focus whatever child is currently focused
         if (clickedChild != null) {
@@ -420,12 +420,12 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
 
     @Override
     public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
-        return GuiUtils.checkChildren(children, child -> child.keyPressed(keyCode, scanCode, modifiers)) || super.keyPressed(keyCode, scanCode, modifiers);
+        return GuiUtils.checkChildren(children, keyCode, scanCode, modifiers, GuiElement::keyPressed) || super.keyPressed(keyCode, scanCode, modifiers);
     }
 
     @Override
     public boolean charTyped(char c, int keyCode) {
-        return GuiUtils.checkChildren(children, child -> child.charTyped(c, keyCode)) || super.charTyped(c, keyCode);
+        return GuiUtils.checkChildrenChar(children, c, keyCode, GuiElement::charTyped) || super.charTyped(c, keyCode);
     }
 
     @Override
@@ -449,7 +449,13 @@ public void onRelease(double mouseX, double mouseY) {
 
     @Override
     public boolean mouseScrolled(double mouseX, double mouseY, double xDelta, double yDelta) {
-        return GuiUtils.checkChildren(children, child -> child.mouseScrolled(mouseX, mouseY, xDelta, yDelta)) || super.mouseScrolled(mouseX, mouseY, xDelta, yDelta);
+        for (int i = children.size() - 1; i >= 0; i--) {
+            GuiElement child = children.get(i);
+            if (child.mouseScrolled(mouseX, mouseY, xDelta, yDelta)) {
+                return true;
+            }
+        }
+        return super.mouseScrolled(mouseX, mouseY, xDelta, yDelta);
     }
 
     @Override
@@ -511,7 +517,7 @@ protected boolean resetColorBeforeRender() {
 
     @Override
     public boolean isMouseOver(double mouseX, double mouseY) {
-        return super.isMouseOver(mouseX, mouseY) || GuiUtils.checkChildren(children, child -> child.isMouseOver(mouseX, mouseY));
+        return super.isMouseOver(mouseX, mouseY) || GuiUtils.checkChildren(children, mouseX, mouseY, GuiElement::isMouseOver);
     }
 
     /**
