InventorySlotElementSupplier with offset + non-cycling suppliers

Author: NichtStudioCode

invui/src/main/java/xyz/xenondevs/invui/gui/AbstractGui.java

@@ -755,21 +755,6 @@ public void setItem(char key, Supplier<? extends @Nullable Item> itemSupplier) {
         }
     }
 
-    @Override
-    public void setInventory(char key, Inventory inventory) {
-        setSlotElement(key, new InventorySlotElementSupplier(inventory));
-    }
-    
-    @Override
-    public void setInventory(char key, Inventory inventory, ItemProvider background) {
-        setSlotElement(key, new InventorySlotElementSupplier(inventory, background));
-    }
-    
-    @Override
-    public void setGui(char key, Gui gui) {
-        setSlotElement(key, new GuiSlotElementSupplier(gui));
-    }
-    
     @Override
     public SequencedCollection<? extends Slot> getSlots(char key) {
         var matrix = ingredientMatrix;
@@ -1014,70 +999,6 @@ public S applyPreset(IngredientPreset preset) {
             return (S) this;
         }
 
-        @Override
-        public S addIngredient(char key, ItemStack itemStack) {
-            if (structure == null)
-                throw new IllegalStateException("Structure is not set");
-            structure.addIngredient(key, itemStack);
-            return (S) this;
-        }
-        
-        @Override
-        public S addIngredient(char key, ItemProvider itemProvider) {
-            if (structure == null)
-                throw new IllegalStateException("Structure is not set");
-            structure.addIngredient(key, itemProvider);
-            return (S) this;
-        }
-        
-        @Override
-        public S addIngredient(char key, Item item) {
-            if (structure == null)
-                throw new IllegalStateException("Structure is not set");
-            structure.addIngredient(key, item);
-            return (S) this;
-        }
-        
-        @Override
-        public S addIngredient(char key, Item.Builder<?> builder) {
-            if (structure == null)
-                throw new IllegalStateException("Structure is not set");
-            structure.addIngredient(key, builder);
-            return (S) this;
-        }
-        
-        @Override
-        public S addIngredient(char key, Supplier<? extends Item> itemSupplier) {
-            if (structure == null)
-                throw new IllegalStateException("Structure is not set");
-            structure.addIngredient(key, itemSupplier);
-            return (S) this;
-        }
-        
-        @Override
-        public S addIngredient(char key, Inventory inventory) {
-            if (structure == null)
-                throw new IllegalStateException("Structure is not set");
-            structure.addIngredient(key, inventory);
-            return (S) this;
-        }
-        
-        @Override
-        public S addIngredient(char key, Inventory inventory, @Nullable ItemProvider background) {
-            if (structure == null)
-                throw new IllegalStateException("Structure is not set");
-            structure.addIngredient(key, inventory, background);
-            return (S) this;
-        }
-        
-        @Override
-        public S addIngredient(char key, Gui gui) {
-            if (structure == null)
-                throw new IllegalStateException("Structure is not set");
-            structure.addIngredient(key, gui);
-            return (S) this;
-        }
-        
         @Override
         public S addIngredient(char key, SlotElement element) {
             if (structure == null)

invui/src/main/java/xyz/xenondevs/invui/gui/AbstractIngredientMapper.java

@@ -24,46 +24,6 @@ public S applyPreset(IngredientPreset preset) {
         return (S) this;
     }
 
-    @Override
-    public S addIngredient(char key, ItemStack itemStack) {
-        return addIngredient(key, new ItemWrapper(itemStack));
-    }
-    
-    @Override
-    public S addIngredient(char key, ItemProvider itemProvider) {
-        return addIngredient(key, Item.simple(itemProvider));
-    }
-    
-    @Override
-    public S addIngredient(char key, Item item) {
-        return addIngredient(key, new SlotElement.Item(item));
-    }
-    
-    @Override
-    public S addIngredient(char key, Item.Builder<?> builder) {
-        return addIngredient(key, builder::build);
-    }
-    
-    @Override
-    public S addIngredient(char key, Supplier<? extends Item> itemSupplier) {
-        return addIngredientElementSupplier(key, () -> new SlotElement.Item(itemSupplier.get()));
-    }
-    
-    @Override
-    public S addIngredient(char key, Inventory inventory) {
-        return addIngredientElementSupplier(key, new InventorySlotElementSupplier(inventory));
-    }
-    
-    @Override
-    public S addIngredient(char key, Inventory inventory, @Nullable ItemProvider background) {
-        return addIngredientElementSupplier(key, new InventorySlotElementSupplier(inventory, background));
-    }
-    
-    @Override
-    public S addIngredient(char key, Gui gui) {
-        return addIngredientElementSupplier(key, new GuiSlotElementSupplier(gui));
-    }
-    
     @Override
     public S addIngredient(char key, SlotElement element) {
         handleUpdate();

invui/src/main/java/xyz/xenondevs/invui/gui/Gui.java

@@ -341,7 +341,21 @@ static Gui single(Inventory inventory, int slot, ItemProvider background) {
      * @param inventory The {@link Inventory} that should be placed on these slots
      * @see #applyStructure(Structure)
      */
-    void setInventory(char key, Inventory inventory);
+    default void setInventory(char key, Inventory inventory) {
+        setSlotElement(key, new InventorySlotElementSupplier(inventory, null, 0));
+    }
+    
+    /**
+     * Fills the slots associated with the given key through a {@link Structure} with the given {@link Inventory},
+     * starting at the given offset slot.
+     *
+     * @param key       The key
+     * @param inventory The {@link Inventory} that should be placed on these slots
+     * @param offset    The slot offset inside the {@link Inventory} to start from
+     */
+    default void setInventory(char key, Inventory inventory, int offset) {
+        setSlotElement(key, new InventorySlotElementSupplier(inventory, null, offset));
+    }
 
     /**
      * Fills the slots associated with the given key through a {@link Structure} with the given {@link Inventory},
@@ -352,7 +366,22 @@ static Gui single(Inventory inventory, int slot, ItemProvider background) {
      * @param background The {@link ItemProvider} for empty slots of the {@link Inventory}
      * @see #applyStructure(Structure)
      */
-    void setInventory(char key, Inventory inventory, ItemProvider background);
+    default void setInventory(char key, Inventory inventory, @Nullable ItemProvider background) {
+        setSlotElement(key, new InventorySlotElementSupplier(inventory, background, 0));
+    }
+    
+    /**
+     * Fills the slots associated with the given key through a {@link Structure} with the given {@link Inventory},
+     * using the given {@link ItemProvider} as background for empty slots, starting at the given offset slot.
+     *
+     * @param key        The key
+     * @param inventory  The {@link Inventory} that should be placed on these slots
+     * @param background The {@link ItemProvider} for empty slots of the {@link Inventory}
+     * @param offset     The slot offset inside the {@link Inventory} to start from
+     */
+    default void setInventory(char key, Inventory inventory, @Nullable ItemProvider background, int offset) {
+        setSlotElement(key, new InventorySlotElementSupplier(inventory, background, offset));
+    }
 
     /**
      * Fills the slots associated with the given key through a {@link Structure} with the given {@link Gui},
@@ -361,7 +390,9 @@ static Gui single(Inventory inventory, int slot, ItemProvider background) {
      * @param key The key
      * @param gui The {@link Gui} that should be placed on these slots
      */
-    void setGui(char key, Gui gui);
+    default void setGui(char key, Gui gui) {
+        setSlotElement(key, new GuiSlotElementSupplier(gui));
+    }
 
     /**
      * Gets the {@link ItemProvider} that will be used if nothing else

invui/src/main/java/xyz/xenondevs/invui/gui/GuiSlotElementSupplier.java

@@ -1,8 +1,6 @@
 package xyz.xenondevs.invui.gui;
 
-import java.util.function.Supplier;
-
-class GuiSlotElementSupplier implements Supplier<SlotElement.GuiLink> {
+class GuiSlotElementSupplier implements ResettableSlotElementSupplier<SlotElement.GuiLink> {
 
     private final Gui gui;
     private int slot;
@@ -16,9 +14,15 @@ public GuiSlotElementSupplier(Gui gui) {
 
     @Override
     public SlotElement.GuiLink get() {
-        var element = new SlotElement.GuiLink(gui, slot);
-        slot = (slot + 1) % gui.getSize();
-        return element;
+        if (slot >= gui.getSize())
+            throw new IllegalStateException("No more slots available");
+        
+        return new SlotElement.GuiLink(gui, slot++);
+    }
+    
+    @Override
+    public void reset() {
+        slot = 0;
     }
 
 }

invui/src/main/java/xyz/xenondevs/invui/gui/Ingredient.java

@@ -82,4 +82,14 @@ boolean isMarker() {
         return marker != null;
     }
 
+    /**
+     * Calls {@link ResettableSlotElementSupplier#reset()} if this {@link #isSlotElement()} and
+     * a {@link ResettableSlotElementSupplier} is used as the supplier.
+     */
+    void reset() {
+        if (elementSupplier instanceof ResettableSlotElementSupplier<?> e) {
+            e.reset();
+        }
+    }
+    
 }