Gui by inventory dsl

Author: NichtStudioCode

invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/dsl/DslProperties.kt

@@ -2,20 +2,19 @@
 
 package xyz.xenondevs.invui.dsl
 
-import org.bukkit.Material
 import org.bukkit.inventory.ItemStack
 import xyz.xenondevs.commons.provider.MutableProvider
 import xyz.xenondevs.commons.provider.Provider
 import xyz.xenondevs.commons.provider.mapNonNull
 import xyz.xenondevs.commons.provider.mutableProvider
-import xyz.xenondevs.commons.provider.provider
 import xyz.xenondevs.invui.ExperimentalReactiveApi
 import xyz.xenondevs.invui.gui.Gui
+import xyz.xenondevs.invui.inventory.Inventory
 import xyz.xenondevs.invui.item.Item
 import xyz.xenondevs.invui.item.ItemProvider
 import xyz.xenondevs.invui.item.ItemWrapper
 import xyz.xenondevs.invui.item.setItemProvider
-
+import kotlin.math.ceil
 
 class ItemDslProperty internal constructor() {
 
@@ -40,14 +39,45 @@ class ItemDslProperty internal constructor() {
 
 }
 
-class GuiDslProperty internal constructor(width: Int, height: Int) {
+internal data class Dimensions(val width: Int, val height: Int) {
+    val size: Int
+        get() = width * height
+}
+
+class GuiDslProperty internal constructor(
+    private val dimensions: List<Dimensions>,
+    defaultGui: Gui = Gui.empty(dimensions[0].width, dimensions[0].height),
+    private val arbitraryHeight: Boolean = false,
+) {
 
-    internal var value: Gui = Gui.empty(width, height)
+    internal var value: Gui = defaultGui
+    
+    internal constructor(
+        width: Int, height: Int,
+        defaultGui: Gui = Gui.empty(width, height), 
+        arbitraryHeight: Boolean = false
+    ) : this(listOf(Dimensions(width, height)), defaultGui, arbitraryHeight)
 
     infix fun by(gui: Gui) {
         this.value = gui
     }
 
+    infix fun by(inventory: Inventory) {
+        if (arbitraryHeight) {
+            value = Gui.of(
+                dimensions[0].width,
+                ceil(inventory.size / dimensions[0].width.toDouble()).toInt(),
+                inventory
+            )
+        } else {
+            val dim = dimensions
+                .filter { it.size >= inventory.size }
+                .minByOrNull { it.size - inventory.size }
+                ?: dimensions.first()
+            value = Gui.of(dim.width, dim.height, inventory)
+        }
+    }
+    
 }
 
 class NullableItemProviderDslProperty internal constructor() : ProviderDslProperty<ItemProvider?>(null) {

invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/dsl/StonecutterWindowDsl.kt

@@ -26,7 +26,7 @@ internal class StonecutterWindowDslImpl(
 ) : AbstractSplitWindowDsl<StonecutterWindow, StonecutterWindow.Builder>(viewer), StonecutterWindowDsl {
 
     override val upperGui = GuiDslProperty(2, 1)
-    override val buttonsGui = GuiDslProperty(4, 0)
+    override val buttonsGui = GuiDslProperty(4, 0, arbitraryHeight = true)
     override val selectedSlot = MutableProviderDslProperty(-1)
 
     override fun createBuilder() = StonecutterWindow.builder()

invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/dsl/WindowDsl.kt

@@ -7,6 +7,7 @@ import org.bukkit.entity.Player
 import org.bukkit.event.inventory.InventoryCloseEvent
 import xyz.xenondevs.invui.ClickEvent
 import xyz.xenondevs.invui.ExperimentalReactiveApi
+import xyz.xenondevs.invui.internal.util.InventoryUtils
 import xyz.xenondevs.invui.window.Window
 import xyz.xenondevs.invui.window.setTitle
 
@@ -100,7 +101,7 @@ internal abstract class AbstractSplitWindowDsl<W : Window, B : Window.Builder.Sp
     viewer: Player
 ) : AbstractWindowDsl<W, B>(viewer), SplitWindowDsl {
 
-    override val lowerGui = GuiDslProperty(9, 4)
+    override val lowerGui = GuiDslProperty(9, 4, InventoryUtils.createPlayerReferencingInventoryGui(viewer))
 
     override fun applyToBuilder(builder: B) {
         super.applyToBuilder(builder)
@@ -112,7 +113,18 @@ internal abstract class AbstractSplitWindowDsl<W : Window, B : Window.Builder.Sp
 @ExperimentalDslApi
 internal class NormalSplitWindowDslImpl(viewer: Player) : AbstractSplitWindowDsl<Window, Window.Builder.Normal.Split>(viewer), NormalSplitWindowDsl {
 
-    override val upperGui = GuiDslProperty(9, 6)
+    override val upperGui = GuiDslProperty(
+        dimensions = listOf(
+            Dimensions(9, 6),
+            Dimensions(9, 5),
+            Dimensions(9, 4),
+            Dimensions(9, 3),
+            Dimensions(9, 2),
+            Dimensions(9, 1),
+            Dimensions(5, 1),
+            Dimensions(3, 3),
+        )
+    )
 
     override fun createBuilder() = Window.builder()
 
@@ -126,7 +138,16 @@ internal class NormalSplitWindowDslImpl(viewer: Player) : AbstractSplitWindowDsl
 @ExperimentalDslApi
 internal class NormalMergedWindowDslImpl(viewer: Player) : AbstractWindowDsl<Window, Window.Builder.Normal.Merged>(viewer), NormalMergedWindowDsl {
 
-    override val gui = GuiDslProperty(9, 10)
+    override val gui = GuiDslProperty(
+        dimensions = listOf(
+            Dimensions(9, 10),
+            Dimensions(9, 9),
+            Dimensions(9, 8),
+            Dimensions(9, 7),
+            Dimensions(9, 6),
+            Dimensions(9, 5),
+        )
+    )
 
     override fun createBuilder() = Window.mergedBuilder()