Change window-related methods to use AbstractWindow

invui/src/main/java/xyz/xenondevs/invui/item/Item.java

@@ -6,6 +6,7 @@ import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
+import xyz.xenondevs.invui.window.AbstractWindow;
 import xyz.xenondevs.invui.window.Window;
 
 import java.util.Set;
@@ -21,20 +22,20 @@ public interface Item {
     ItemProvider getItemProvider();
     
     /**
-     * Adds a {@link Window} to the window set, telling the {@link Item} that it is
+     * Adds an {@link AbstractWindow} to the window set, telling the {@link Item} that it is
-     * currently being displayed in that {@link Window}.
+     * currently being displayed in that {@link AbstractWindow}.
      *
-     * @param window The {@link Window} the {@link Item} is currently displayed in.
+     * @param window The {@link AbstractWindow} the {@link Item} is currently displayed in.
      */
-    void addWindow(Window window);
+    void addWindow(AbstractWindow window);
     
     /**
-     * Removes a {@link Window} from the window set, telling the {@link Item} that it
+     * Removes an {@link AbstractWindow} from the window set, telling the {@link Item} that it
-     * is no longer being displayed in that {@link Window}.
+     * is no longer being displayed in that {@link AbstractWindow}.
      *
-     * @param window The {@link Window} the {@link Item} is no longer displayed in.
+     * @param window The {@link AbstractWindow} the {@link Item} is no longer displayed in.
      */
-    void removeWindow(Window window);
+    void removeWindow(AbstractWindow window);
     
     /**
      * Gets an immutable {@link Set} of all the {@link Window}s where this

invui/src/main/java/xyz/xenondevs/invui/item/impl/AbstractItem.java

@@ -9,25 +9,19 @@ import java.util.HashSet;
 import java.util.Set;
 
 /**
- * The base for all {@link Item}s.
+ * An abstract implementation of the {@link Item} interface.
  */
-public abstract class BaseItem implements Item {
+public abstract class AbstractItem implements Item {
     
     private final Set<AbstractWindow> windows = new HashSet<>();
     
     @Override
-    public void addWindow(Window window) {
+    public void addWindow(AbstractWindow window) {
-        if (!(window instanceof AbstractWindow))
+        windows.add(window);
-            throw new IllegalArgumentException("Illegal window implementation");
-        
-        windows.add((AbstractWindow) window);
     }
     
     @Override
-    public void removeWindow(Window window) {
+    public void removeWindow(AbstractWindow window) {
-        if (!(window instanceof AbstractWindow))
-            throw new IllegalArgumentException("Illegal window implementation");
-        
         windows.remove(window);
     }
     

invui/src/main/java/xyz/xenondevs/invui/item/impl/AsyncItem.java

@@ -19,7 +19,7 @@ import java.util.function.Supplier;
  * An {@link Item} that creates it's {@link ItemProvider} asynchronously and displays
  * a placeholder {@link ItemProvider} until the actual {@link ItemProvider} has been created.
  */
-public class AsyncItem extends BaseItem {
+public class AsyncItem extends AbstractItem {
     
     private volatile ItemProvider itemProvider;
     

invui/src/main/java/xyz/xenondevs/invui/item/impl/AutoCycleItem.java

@@ -15,7 +15,7 @@ import xyz.xenondevs.invui.window.Window;
  * An {@link Item} that automatically cycles through a predefined array of
  * {@link ItemProvider} at a predefined speed.
  */
-public class AutoCycleItem extends BaseItem {
+public class AutoCycleItem extends AbstractItem {
     
     private final ItemProvider[] itemProviders;
     private final int period;

invui/src/main/java/xyz/xenondevs/invui/item/impl/CycleItem.java

@@ -13,7 +13,7 @@ import java.util.function.BiConsumer;
 /**
  * An {@link Item} that cycles through a predefined array of {@link ItemProvider}s when clicked.
  */
-public class CycleItem extends BaseItem {
+public class CycleItem extends AbstractItem {
     
     private final ItemProvider[] states;
     

invui/src/main/java/xyz/xenondevs/invui/item/impl/SimpleItem.java

@@ -14,7 +14,7 @@ import java.util.function.Consumer;
 /**
  * A simple {@link Item} that does nothing.
  */
-public class SimpleItem extends BaseItem {
+public class SimpleItem extends AbstractItem {
     
     private final ItemProvider itemProvider;
     private final Consumer<Click> clickHandler;

invui/src/main/java/xyz/xenondevs/invui/item/impl/SuppliedItem.java

@@ -11,7 +11,7 @@ import xyz.xenondevs.invui.item.ItemProvider;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-public class SuppliedItem extends BaseItem {
+public class SuppliedItem extends AbstractItem {
     
     private final Supplier<? extends ItemProvider> builderSupplier;
     private final Function<Click, Boolean> clickHandler;

invui/src/main/java/xyz/xenondevs/invui/item/impl/controlitem/ControlItem.java

@@ -3,14 +3,14 @@ package xyz.xenondevs.invui.item.impl.controlitem;
 import xyz.xenondevs.invui.gui.Gui;
 import xyz.xenondevs.invui.item.Item;
 import xyz.xenondevs.invui.item.ItemProvider;
-import xyz.xenondevs.invui.item.impl.BaseItem;
+import xyz.xenondevs.invui.item.impl.AbstractItem;
 
 /**
  * A special type of {@link Item} that stores the {@link Gui} in which it is displayed.
  *
  * @param <G> The Gui Type this {@link ControlItem} will control. Not checked when adding it to a Gui.
  */
-public abstract class ControlItem<G extends Gui> extends BaseItem {
+public abstract class ControlItem<G extends Gui> extends AbstractItem {
     
     private G gui;
     

invui/src/main/java/xyz/xenondevs/invui/virtualinventory/VirtualInventory.java

@@ -77,28 +77,22 @@ public class VirtualInventory {
     }
     
     /**
-     * Adds a {@link Window} to the set of {@link Window}s, telling the {@link VirtualInventory} that
+     * Adds an {@link AbstractWindow} to the set of {@link AbstractWindow AbstractWindows}, telling the {@link VirtualInventory} that
-     * its contents are now being displayed in that {@link Window}.
+     * its contents are now being displayed in that {@link AbstractWindow}.
      *
      * @param window The {@link Window} to be added.
      */
-    public void addWindow(Window window) {
+    public void addWindow(AbstractWindow window) {
-        if (!(window instanceof AbstractWindow))
+        windows.add(window);
-            throw new IllegalArgumentException("Illegal window implementation");
-        
-        windows.add((AbstractWindow) window);
     }
     
     /**
-     * Removes a {@link Window} from the set of {@link Window}s, telling the {@link VirtualInventory} that
+     * Removes an {@link AbstractWindow} from the set of {@link AbstractWindow AbstractWindows}, telling the {@link VirtualInventory} that
-     * its contents are no longer being displayed in that {@link Window}.
+     * its contents are no longer being displayed in that {@link AbstractWindow}.
      *
-     * @param window The {@link Window} to be removed.
+     * @param window The {@link AbstractWindow} to be removed.
      */
-    public void removeWindow(Window window) {
+    public void removeWindow(AbstractWindow window) {
-        if (!(window instanceof AbstractWindow))
-            throw new IllegalArgumentException("Illegal window implementation");
-        
         windows.remove(window);
     }
     

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

@@ -44,31 +44,23 @@ public class WindowManager implements Listener {
     }
     
     /**
-     * Adds a {@link Window} to the list of windows.
+     * Adds an {@link AbstractWindow} to the list of windows.
      * This method is usually called by the {@link Window} itself.
      *
-     * @param window The {@link Window} to add
+     * @param window The {@link AbstractWindow} to add
      */
-    public void addWindow(Window window) {
+    public void addWindow(AbstractWindow window) {
-        if (!(window instanceof AbstractWindow))
+        windows.put(window.getInventories()[0], window);
-            throw new IllegalArgumentException("Illegal window implementation");
-        
-        AbstractWindow abstractWindow = (AbstractWindow) window;
-        windows.put(abstractWindow.getInventories()[0], abstractWindow);
     }
     
     /**
-     * Removes a {@link Window} from the list of windows.
+     * Removes an {@link AbstractWindow} from the list of windows.
      * This method is usually called by the {@link Window} itself.
      *
-     * @param window The {@link Window} to remove
+     * @param window The {@link AbstractWindow} to remove
      */
-    public void removeWindow(Window window) {
+    public void removeWindow(AbstractWindow window) {
-        if (!(window instanceof AbstractWindow))
+        windows.remove(window.getInventories()[0]);
-            throw new IllegalArgumentException("Illegal window implementation");
-        
-        AbstractWindow abstractWindow = (AbstractWindow) window;
-        windows.remove(abstractWindow.getInventories()[0]);
     }
     
     /**