Remove Gui#remove in favor of Gui#setSlotElement with null

Author: NichtStudioCode

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

@@ -583,11 +583,6 @@ public void setSlotElement(int index, @Nullable SlotElement slotElement) {
         }
     }
 
-    @Override
-    public void remove(int index) {
-        setSlotElement(index, null);
-    }
-    
     @Override
     public @Nullable SlotElement getSlotElement(int index) {
         return slotElements[index];
@@ -606,11 +601,7 @@ public SlotElement[] getSlotElements() {
 
     @Override
     public void setItem(int index, @Nullable Item item) {
-        if (item == null) {
-            remove(index);
-            return;
-        }
-        setSlotElement(index, new SlotElement.Item(item));
+        setSlotElement(index, item != null ? new SlotElement.Item(item) : null);
     }
 
     @Override
@@ -861,16 +852,6 @@ public void setItem(int x, int y, @Nullable Item item) {
         return getItem(convToIndex(x, y));
     }
 
-    @Override
-    public void remove(Slot slot) {
-        remove(slot.x(), slot.y());
-    }
-    
-    @Override
-    public void remove(int x, int y) {
-        remove(convToIndex(x, y));
-    }
-    
     @Override
     public boolean isTagged(int x, int y, char key) {
         return isTagged(convToIndex(x, y), key);

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

@@ -12,7 +12,6 @@
 import java.util.List;
 import java.util.SequencedSet;
 import java.util.function.BiConsumer;
-import java.util.function.Consumer;
 
 sealed abstract class AbstractPagedGui<C>
     extends AbstractGui
@@ -107,9 +106,7 @@ private void updatePageContent() {
         List<SlotElement> slotElements = (pages != null && !pages.isEmpty()) ? pages.get(getPage()) : List.of();
 
         for (int i = 0; i < contentListSlots.length; i++) {
-            if (slotElements.size() > i)
-                setSlotElement(contentListSlots[i], slotElements.get(i));
-            else remove(contentListSlots[i]);
+            setSlotElement(contentListSlots[i], slotElements.size() > i ? slotElements.get(i) : null);
         }
     }
 

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

@@ -182,8 +182,7 @@ private void updateContent() {
         List<SlotElement> slotElements = elements.subList(offset, Math.min(elements.size(), contentListSlots.length + offset));
 
         for (int i = 0; i < contentListSlots.length; i++) {
-            if (slotElements.size() > i) setSlotElement(contentListSlots[i], slotElements.get(i));
-            else remove(contentListSlots[i]);
+            setSlotElement(contentListSlots[i], slotElements.size() > i ? slotElements.get(i) : null);
         }
     }
 

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

@@ -380,28 +380,6 @@ static Gui single(Inventory inventory, int slot, ItemProvider background) {
      */
     void setBackground(@Nullable ItemProvider itemProvider);
 
-    /**
-     * Removes the {@link SlotElement} that is placed on that {@link Slot}.
-     *
-     * @param slot The slot
-     */
-    void remove(Slot slot);
-    
-    /**
-     * Removes an {@link Item} by its coordinates.
-     *
-     * @param x The x coordinate
-     * @param y The y coordinate
-     */
-    void remove(int x, int y);
-    
-    /**
-     * Remove the {@link SlotElement} that is placed on the slot.
-     *
-     * @param index The slot index of the {@link SlotElement} that should be removed
-     */
-    void remove(int index);
-    
     /**
      * Applies the given {@link Structure} to the {@link Gui}.
      *

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

@@ -101,10 +101,7 @@ private void updateContent() {
         if (currentTab != -1) {
             List<SlotElement.GuiLink> slotElements = linkingElements.get(currentTab);
             for (int i = 0; i < contentListSlots.length; i++) {
-                int slot = contentListSlots[i];
-                if (slotElements != null && slotElements.size() > i)
-                    setSlotElement(contentListSlots[i], slotElements.get(i));
-                else remove(slot);
+                setSlotElement(contentListSlots[i], slotElements != null && slotElements.size() > i ? slotElements.get(i) : null);
             }
         } else {
             for (int slot : contentListSlots) {