feat: add fill operations to item containers

Closes #14

Author: StillLutto

core/src/main/kotlin/com/undefined/cassini/container/item/FillOperations.kt

@@ -0,0 +1,55 @@
+package com.undefined.cassini.container.item
+
+import com.undefined.cassini.element.item.ItemElement
+
+/**
+ * Operations for filling areas of an item container with elements.
+ */
+interface FillOperations {
+
+    fun setElement(row: Int, column: Int, element: ItemElement)
+    fun removeElement(row: Int, column: Int)
+
+    /**
+     * Fills the border of the container with [element].
+     */
+    fun fillBorder(element: ItemElement)
+
+    /**
+     * Fills the entire container with [element].
+     */
+    fun fill(element: ItemElement)
+
+    /**
+     * Fills a rectangular area with the specified item. Rows and columns specified are inclusive.
+     */
+    fun fill(fromRow: Int, fromColumn: Int, toRow: Int, toColumn: Int, element: ItemElement) {
+        for (row in fromRow..toRow) {
+            for (column in fromColumn..toColumn) {
+                setElement(row, column, element)
+            }
+        }
+    }
+
+    /**
+     * Clears all items in the specified rectangular area. Rows and columns specified are inclusive.
+     */
+    fun clear(fromRow: Int, fromColumn: Int, toRow: Int, toColumn: Int) {
+        for (row in fromRow..toRow) {
+            for (column in fromColumn..toColumn) {
+                removeElement(row, column)
+            }
+        }
+    }
+
+    /**
+     * Fills the specified row with [element].
+     */
+    fun fillRow(row: Int, element: ItemElement)
+
+    /**
+     * Fills the specified column with [element].
+     */
+    fun fillColumn(column: Int, element: ItemElement)
+
+}

core/src/main/kotlin/com/undefined/cassini/container/item/ItemContainer.kt

@@ -3,14 +3,15 @@ package com.undefined.cassini.container.item
 import com.undefined.cassini.container.Container
 import com.undefined.cassini.element.CartesianCoordinate
 import com.undefined.cassini.element.item.ItemElement
+import com.undefined.cassini.menu.item.ItemMenu
 
 /**
- * Represents a container in an [com.undefined.cassini.menu.item.ItemMenu]. Any null values are simply empty items.
+ * Represents a container in an [ItemMenu]. Any null values are simply empty items.
  */
-interface ItemContainer<T : ItemContainer<T>> : Container<T, ItemElement?> {
+interface ItemContainer<T : ItemContainer<T>> : Container<T, ItemElement?>, FillOperations {
 
-    fun removeElement(row: Int, column: Int)
-    fun setElement(row: Int, column: Int, element: ItemElement)
+    override fun removeElement(row: Int, column: Int)
+    override fun setElement(row: Int, column: Int, element: ItemElement)
 
     /**
      * Calculates a [CartesianCoordinate] from a [slot].

core/src/main/kotlin/com/undefined/cassini/container/item/ItemContainerImpl.kt

@@ -3,10 +3,8 @@ package com.undefined.cassini.container.item
 import com.undefined.cassini.container.Container
 import com.undefined.cassini.element.CartesianCoordinate
 import com.undefined.cassini.element.item.ItemElement
-import com.undefined.cassini.element.item.StaticItemElement
 import com.undefined.cassini.menu.item.ItemMenu
 import org.jetbrains.annotations.Range
-import kotlin.collections.plus
 
 /**
  * The primary implementation of [ItemContainer]; representing a container in an [ItemMenu]. Any null values are simply empty items.
@@ -21,7 +19,6 @@ open class ItemContainerImpl(
      */
     lateinit var menu: ItemMenu<*>
 
-//    private val slotIterator: BoxSlotIterator by lazy { BoxSlotIterator(menu, startSlot = 0, rows, columns) }
     private val elements: Array<Array<ItemElement?>> = Array(height) { Array(width) { null } } // grid map of elements
     private val containers: LinkedHashMap<Int, ItemContainerImpl> = linkedMapOf() // slot to container
 
@@ -30,9 +27,6 @@ open class ItemContainerImpl(
     }
 
     override fun setElement(row: Int, column: Int, element: ItemElement) {
-//        require(row <= slotIterator.width)
-//        require(column <= slotIterator.width)
-
         elements[row][column] = element
         element.containers.add(this)
     }
@@ -101,4 +95,18 @@ open class ItemContainerImpl(
         return currentElements
     }
 
+    // FILL OPERATIONS
+    override fun fillBorder(element: ItemElement) {
+        fillRow(0, element)
+        fillRow(height - 1, element)
+
+        fillColumn(0, element)
+        fillColumn(width - 1, element)
+    }
+
+    override fun fill(element: ItemElement) = fill(0, 0, height - 1, width - 1, element)
+
+    override fun fillRow(row: Int, element: ItemElement) = fill(row, 0, row, width - 1, element)
+    override fun fillColumn(column: Int, element: ItemElement) = fill(0, column, height - 1, column, element)
+
 }

modules/chest/src/main/kotlin/com/undefined/cassini/menu/item/ChestMenu.kt

@@ -10,7 +10,7 @@ abstract class ChestMenu(
     rows: Int,
     parent: Menu<*, *>? = null,
     override val settings: ItemMenuSettings = ItemMenuSettings(),
-    rootContainer: ItemContainerImpl = ItemContainerImpl(MAX_WIDTH, MAX_HEIGHT)
+    rootContainer: ItemContainerImpl = ItemContainerImpl(MAX_WIDTH, rows)
 ) : SingleContainerItemMenu<ChestMenu>(
     title = title,
     size = rows * MAX_WIDTH,

server/src/main/kotlin/TestMenu.kt

@@ -12,38 +12,11 @@ class TestMenu(parent: Menu<*, *>? = null) : ChestMenu(!"Change Lore", 3, parent
     override fun initialize(player: Player) {
         preventClicking()
         createPattern {
-            setElement(6, StaticItemElement(Material.DIAMOND))
+            fillBorder(StaticItemElement(Material.GLASS))
+//            fill(StaticItemElement(Material.STONE))
+//            fillRow(1, StaticItemElement(Material.GOLD_BLOCK))
+//            fillColumn(4, StaticItemElement(Material.EMERALD_BLOCK))
         }
-
-        val container = ItemContainerImpl(3, 3)
-        for (slot in 0..<(container.width * container.height)) {
-            container.setElement(slot, StaticItemElement(Material.REDSTONE))
-        }
-        addContainer(container)
-
-//        val iterator = BoxSlotIterator(this, 0, 2, 2)
-//        for ((i, _) in iterator) {
-//            setElement(i, StaticItemElement(Material.REDSTONE))
-//        }
-//        update()
-//        val yayElement = StaticItemElement(Material.PAPER) {
-//            val element = element as? StaticItemElement ?: return@StaticItemElement
-//            element.item.editMeta { meta ->
-//                meta.displayName(!"<green>YAY!")
-//            }
-//            element.update()
-//        }
-//        setElement(13, yayElement)
-//
-//        val otherElement = StaticItemElement(Material.RED_CONCRETE) {
-//            back()
-//        }
-//        setElement(14, otherElement)
-//
-//        val randomElement = StaticItemElement(Material.GREEN_CONCRETE) {
-//            player.openMenu(OtherTestMenu(this@TestMenu))
-//        }
-//        setElement(12, randomElement)
     }
 
 }