Merge pull request #98 from ComputerNerd100/main

NichtStudioCode · web-flow · commit b396f348b84e · 2024-12-02T18:21:58.000+01:00
Add support for player-context in singleton item providers
diff --git a/inventoryaccess/inventory-access-r1/pom.xml b/inventoryaccess/inventory-access-r1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.xenondevs.invui</groupId>
         <artifactId>invui-parent</artifactId>
-        <version>1.41</version>
+        <version>1.42</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/inventoryaccess/inventory-access-r10/pom.xml b/inventoryaccess/inventory-access-r10/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.xenondevs.invui</groupId>
         <artifactId>invui-parent</artifactId>
-        <version>1.41</version>
+        <version>1.42</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/inventoryaccess/inventory-access-r11/pom.xml b/inventoryaccess/inventory-access-r11/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.xenondevs.invui</groupId>
         <artifactId>invui-parent</artifactId>
-        <version>1.41</version>
+        <version>1.42</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/inventoryaccess/inventory-access-r12/pom.xml b/inventoryaccess/inventory-access-r12/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.xenondevs.invui</groupId>
         <artifactId>invui-parent</artifactId>
-        <version>1.41</version>
+        <version>1.42</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/inventoryaccess/inventory-access-r13/pom.xml b/inventoryaccess/inventory-access-r13/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.xenondevs.invui</groupId>
         <artifactId>invui-parent</artifactId>
-        <version>1.41</version>
+        <version>1.42</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/inventoryaccess/inventory-access-r14/pom.xml b/inventoryaccess/inventory-access-r14/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.xenondevs.invui</groupId>
         <artifactId>invui-parent</artifactId>
-        <version>1.41</version>
+        <version>1.42</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/inventoryaccess/inventory-access-r15/pom.xml b/inventoryaccess/inventory-access-r15/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.xenondevs.invui</groupId>
         <artifactId>invui-parent</artifactId>
-        <version>1.41</version>
+        <version>1.42</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/inventoryaccess/inventory-access-r16/pom.xml b/inventoryaccess/inventory-access-r16/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.xenondevs.invui</groupId>
         <artifactId>invui-parent</artifactId>
-        <version>1.41</version>
+        <version>1.42</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/inventoryaccess/inventory-access-r17/pom.xml b/inventoryaccess/inventory-access-r17/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.xenondevs.invui</groupId>
         <artifactId>invui-parent</artifactId>
-        <version>1.41</version>
+        <version>1.42</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/inventoryaccess/inventory-access-r18/pom.xml b/inventoryaccess/inventory-access-r18/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.xenondevs.invui</groupId>
         <artifactId>invui-parent</artifactId>
-        <version>1.41</version>
+        <version>1.42</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/inventoryaccess/inventory-access-r19/pom.xml b/inventoryaccess/inventory-access-r19/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.xenondevs.invui</groupId>
         <artifactId>invui-parent</artifactId>
-        <version>1.41</version>
+        <version>1.42</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/inventoryaccess/inventory-access-r2/pom.xml b/inventoryaccess/inventory-access-r2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.xenondevs.invui</groupId>
         <artifactId>invui-parent</artifactId>
-        <version>1.41</version>
+        <version>1.42</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/inventoryaccess/inventory-access-r20/pom.xml b/inventoryaccess/inventory-access-r20/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.xenondevs.invui</groupId>
         <artifactId>invui-parent</artifactId>
-        <version>1.41</version>
+        <version>1.42</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/inventoryaccess/inventory-access-r21/pom.xml b/inventoryaccess/inventory-access-r21/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.xenondevs.invui</groupId>
         <artifactId>invui-parent</artifactId>
-        <version>1.41</version>
+        <version>1.42</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/inventoryaccess/inventory-access-r3/pom.xml b/inventoryaccess/inventory-access-r3/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.xenondevs.invui</groupId>
         <artifactId>invui-parent</artifactId>
-        <version>1.41</version>
+        <version>1.42</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/inventoryaccess/inventory-access-r4/pom.xml b/inventoryaccess/inventory-access-r4/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.xenondevs.invui</groupId>
         <artifactId>invui-parent</artifactId>
-        <version>1.41</version>
+        <version>1.42</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/inventoryaccess/inventory-access-r5/pom.xml b/inventoryaccess/inventory-access-r5/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.xenondevs.invui</groupId>
         <artifactId>invui-parent</artifactId>
-        <version>1.41</version>
+        <version>1.42</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/inventoryaccess/inventory-access-r6/pom.xml b/inventoryaccess/inventory-access-r6/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.xenondevs.invui</groupId>
         <artifactId>invui-parent</artifactId>
-        <version>1.41</version>
+        <version>1.42</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/inventoryaccess/inventory-access-r7/pom.xml b/inventoryaccess/inventory-access-r7/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.xenondevs.invui</groupId>
         <artifactId>invui-parent</artifactId>
-        <version>1.41</version>
+        <version>1.42</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/inventoryaccess/inventory-access-r8/pom.xml b/inventoryaccess/inventory-access-r8/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.xenondevs.invui</groupId>
         <artifactId>invui-parent</artifactId>
-        <version>1.41</version>
+        <version>1.42</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/inventoryaccess/inventory-access-r9/pom.xml b/inventoryaccess/inventory-access-r9/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.xenondevs.invui</groupId>
         <artifactId>invui-parent</artifactId>
-        <version>1.41</version>
+        <version>1.42</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/inventoryaccess/inventory-access/pom.xml b/inventoryaccess/inventory-access/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.xenondevs.invui</groupId>
         <artifactId>invui-parent</artifactId>
-        <version>1.41</version>
+        <version>1.42</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/invui-core/pom.xml b/invui-core/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>xyz.xenondevs.invui</groupId>
         <artifactId>invui-parent</artifactId>
-        <version>1.41</version>
+        <version>1.42</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/invui-core/src/main/java/xyz/xenondevs/invui/gui/SlotElement.java b/invui-core/src/main/java/xyz/xenondevs/invui/gui/SlotElement.java
@@ -1,5 +1,6 @@
 package xyz.xenondevs.invui.gui;
 
+import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import xyz.xenondevs.invui.inventory.Inventory;
 import xyz.xenondevs.invui.item.Item;
@@ -12,6 +13,10 @@ public interface SlotElement {
     
     ItemStack getItemStack(String lang);
     
+    default ItemStack getItemStack(Player viewer, String lang) {
+        return getItemStack(lang);
+    }
+    
     SlotElement getHoldingElement();
     
     /**
@@ -34,6 +39,11 @@ public ItemStack getItemStack(String lang) {
             return item.getItemProvider().get(lang);
         }
         
+        @Override
+        public ItemStack getItemStack(Player viewer, String lang) {
+            return item.getItemProvider(viewer).get(lang);
+        }
+        
         @Override
         public SlotElement getHoldingElement() {
             return this;
@@ -143,6 +153,11 @@ public ItemStack getItemStack(String lang) {
             return holdingElement != null ? holdingElement.getItemStack(lang) : null;
         }
         
+        @Override
+        public ItemStack getItemStack(Player viewer, String lang) {
+            SlotElement holdingElement = getHoldingElement();
+            return holdingElement != null ? holdingElement.getItemStack(viewer, lang) : null;
+        }
     }
     
 }
diff --git a/invui-core/src/main/java/xyz/xenondevs/invui/item/Item.java b/invui-core/src/main/java/xyz/xenondevs/invui/item/Item.java
@@ -18,8 +18,23 @@ public interface Item {
      * This method gets called every time a {@link Window} is notified ({@link #notifyWindows()}).
      *
      * @return The {@link ItemProvider}
+     * @throws UnsupportedOperationException if neither this method nor {@link #getItemProvider(Player)} is overridden
      */
-    ItemProvider getItemProvider();
+    default ItemProvider getItemProvider() {
+        throw new UnsupportedOperationException("Either getItemProvider() or getItemProvider(Player) must be overridden!");
+    }
+    
+    /**
+     * Gets the {@link ItemProvider} for a specific {@link Player}.
+     * This method gets called every time a {@link Window} is notified ({@link #notifyWindows()}).
+     * <p>The default implementation delegates to {@link #getItemProvider()}</p>
+     *
+     * @param viewer the viewer (provides context for rendering player-specific information in the item)
+     * @return The {@link ItemProvider}
+     */
+    default ItemProvider getItemProvider(Player viewer) {
+        return getItemProvider();
+    }
     
     /**
      * Adds an {@link AbstractWindow} to the window set, telling the {@link Item} that it is
diff --git a/invui-core/src/main/java/xyz/xenondevs/invui/window/AbstractWindow.java b/invui-core/src/main/java/xyz/xenondevs/invui/window/AbstractWindow.java
@@ -89,7 +89,7 @@ protected void redrawItem(int index) {
     protected void redrawItem(int index, SlotElement element, boolean setItem) {
         // put ItemStack in inventory
         ItemStack itemStack;
-        if (element == null || (element instanceof SlotElement.InventorySlotElement && element.getItemStack(getLang()) == null)) {
+        if (element == null || (element instanceof SlotElement.InventorySlotElement && element.getItemStack(this.viewer, getLang()) == null)) {
             ItemProvider background = getGuiAt(index).getFirst().getBackground();
             itemStack = background == null ? null : background.get(getLang());
         } else if (element instanceof SlotElement.LinkedSlotElement && element.getHoldingElement() == null) {
@@ -106,7 +106,7 @@ protected void redrawItem(int index, SlotElement element, boolean setItem) {
             itemStack = background == null ? null : background.get(getLang());
         } else {
             SlotElement holdingElement = element.getHoldingElement();
-            itemStack = holdingElement.getItemStack(getLang());
+            itemStack = holdingElement.getItemStack(this.viewer, getLang());
             
             if (holdingElement instanceof SlotElement.ItemSlotElement) {
                 // This makes every item unique to prevent Shift-DoubleClick "clicking" multiple items at the same time.
diff --git a/invui-kotlin/pom.xml b/invui-kotlin/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>xyz.xenondevs.invui</groupId>
         <artifactId>invui-parent</artifactId>
-        <version>1.41</version>
+        <version>1.42</version>
     </parent>
 
     <artifactId>invui-kotlin</artifactId>
diff --git a/invui/pom.xml b/invui/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>xyz.xenondevs.invui</groupId>
         <artifactId>invui-parent</artifactId>
-        <version>1.41</version>
+        <version>1.42</version>
     </parent>
 
     <artifactId>invui</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>xyz.xenondevs.invui</groupId>
     <artifactId>invui-parent</artifactId>
-    <version>1.41</version>
+    <version>1.42</version>
     <packaging>pom</packaging>
 
     <properties>
