Move player inventory gui creation to InventoryUtils

Author: NichtStudioCode

invui/src/main/java/xyz/xenondevs/invui/internal/util/InventoryUtils.java

@@ -5,6 +5,10 @@
 import org.bukkit.entity.Item;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
+import xyz.xenondevs.invui.gui.Gui;
+import xyz.xenondevs.invui.inventory.Inventory;
+import xyz.xenondevs.invui.inventory.OperationCategory;
+import xyz.xenondevs.invui.inventory.ReferencingInventory;
 import xyz.xenondevs.invui.util.ItemUtils;
 
 public class InventoryUtils {
@@ -159,4 +163,19 @@ public static void addToInventoryOrDrop(Player player, ItemStack itemStack) {
             .ifPresent(entry -> dropItemLikePlayer(player, entry.getValue()));
     }
 
+    /**
+     * Creates a new gui that references the player's inventory and handles interactions in the same way
+     * that the player inventory does.
+     *
+     * @param player The player whose inventory to reference
+     * @return The new gui that references the player's inventory
+     */
+    public static Gui createPlayerReferencingInventoryGui(Player player) {
+        Inventory inv = ReferencingInventory.fromPlayerStorageContents(player.getInventory());
+        inv.reverseIterationOrder(OperationCategory.ADD); // shift-clicking moves to bottom right
+        inv.setGuiPriority(OperationCategory.ADD, Integer.MAX_VALUE); // shift-click always moves between upper and lower inv
+        inv.setGuiPriority(OperationCategory.COLLECT, Integer.MIN_VALUE); // double-click collects from lower inv last
+        return Gui.of(9, 4, inv);
+    }
+    
 }

invui/src/main/java/xyz/xenondevs/invui/window/AbstractSplitWindow.java

@@ -8,9 +8,7 @@
 import xyz.xenondevs.invui.gui.Gui;
 import xyz.xenondevs.invui.gui.SlotElement;
 import xyz.xenondevs.invui.internal.menu.CustomContainerMenu;
-import xyz.xenondevs.invui.inventory.Inventory;
-import xyz.xenondevs.invui.inventory.OperationCategory;
-import xyz.xenondevs.invui.inventory.ReferencingInventory;
+import xyz.xenondevs.invui.internal.util.InventoryUtils;
 import xyz.xenondevs.invui.state.MutableProperty;
 
 import java.util.function.Supplier;
@@ -55,15 +53,9 @@ public S setLowerGui(Supplier<? extends Gui> guiSupplier) {
         }
 
         protected AbstractGui supplyLowerGui(Player viewer) {
-            if (lowerGuiSupplier == null) {
-                Inventory inv = ReferencingInventory.fromPlayerStorageContents(viewer.getInventory());
-                inv.reverseIterationOrder(OperationCategory.ADD); // shift-clicking moves to bottom right
-                inv.setGuiPriority(OperationCategory.ADD, Integer.MAX_VALUE); // shift-click always moves between upper and lower inv
-                inv.setGuiPriority(OperationCategory.COLLECT, Integer.MIN_VALUE); // double-click collects from lower inv last
-                return (AbstractGui) Gui.of(9, 4, inv);
-            }
-            
-            return (AbstractGui) lowerGuiSupplier.get();
+            return lowerGuiSupplier != null 
+                ? (AbstractGui) lowerGuiSupplier.get() 
+                : (AbstractGui) InventoryUtils.createPlayerReferencingInventoryGui(viewer); 
         }
 
     }