DSL: move params of onXY functions to receiver

Author: NichtStudioCode

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

@@ -12,13 +12,16 @@ import xyz.xenondevs.invui.window.CraftingWindow
 fun craftingWindow(viewer: Player, craftingWindow: CraftingWindowDsl.() -> Unit): CraftingWindow =
     CraftingWindowDslImpl(viewer).apply(craftingWindow).build()
 
+@ExperimentalDslApi
+class RecipeClick internal constructor(val recipeKey: Key)
+
 @ExperimentalDslApi
 sealed interface CraftingWindowDsl : SplitWindowDsl {
 
     val craftingGui: GuiDslProperty
     val resultGui: GuiDslProperty
 
-    fun onRecipeClick(handler: (recipeKey: Key) -> Unit)
+    fun onRecipeClick(handler: RecipeClick.() -> Unit)
 
 }
 
@@ -29,9 +32,9 @@ internal class CraftingWindowDslImpl(
 
     override val craftingGui = GuiDslProperty(3, 3)
     override val resultGui = GuiDslProperty(1, 1)
-    private val recipeClickHandlers = mutableListOf<(Key) -> Unit>()
+    private val recipeClickHandlers = mutableListOf<RecipeClick.() -> Unit>()
 
-    override fun onRecipeClick(handler: (Key) -> Unit) {
+    override fun onRecipeClick(handler: RecipeClick.() -> Unit) {
         recipeClickHandlers += handler
     }
 
@@ -42,7 +45,7 @@ internal class CraftingWindowDslImpl(
         builder.apply {
             setCraftingGui(craftingGui.value)
             setResultGui(resultGui.value)
-            recipeClickHandlers.forEach { addRecipeClickHandler(it) }
+            recipeClickHandlers.forEach { handler -> addRecipeClickHandler { RecipeClick(it).handler() } }
         }
     }
 

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

@@ -2,7 +2,6 @@
 
 package xyz.xenondevs.invui.dsl
 
-import net.kyori.adventure.key.Key
 import org.bukkit.entity.Player
 import xyz.xenondevs.invui.ExperimentalReactiveApi
 import xyz.xenondevs.invui.dsl.property.GuiDslProperty
@@ -23,7 +22,7 @@ sealed interface FurnaceWindowDsl : SplitWindowDsl {
     val cookProgress: ProviderDslProperty<Double>
     val burnProgress: ProviderDslProperty<Double>
 
-    fun onRecipeClick(handler: (Key) -> Unit)
+    fun onRecipeClick(handler: RecipeClick.() -> Unit)
 
 }
 
@@ -36,9 +35,9 @@ internal class FurnaceWindowDslImpl(
     override val resultGui = GuiDslProperty(1, 1)
     override val cookProgress = ProviderDslProperty(0.0)
     override val burnProgress = ProviderDslProperty(0.0)
-    private val recipeClickHandlers = mutableListOf<(Key) -> Unit>()
+    private val recipeClickHandlers = mutableListOf<RecipeClick.() -> Unit>()
 
-    override fun onRecipeClick(handler: (Key) -> Unit) {
+    override fun onRecipeClick(handler: RecipeClick.() -> Unit) {
         recipeClickHandlers += handler
     }
 
@@ -51,7 +50,7 @@ internal class FurnaceWindowDslImpl(
             setResultGui(resultGui.value)
             setCookProgress(cookProgress.delegate)
             setBurnProgress(burnProgress.delegate)
-            recipeClickHandlers.forEach { addRecipeClickHandler(it) }
+            recipeClickHandlers.forEach { handler -> addRecipeClickHandler { RecipeClick(it).handler() } }
         }
     }
 

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

@@ -13,37 +13,40 @@ import xyz.xenondevs.invui.item.setItemProvider
 fun item(item: ItemDsl.() -> Unit): Item =
     ItemDslImpl().apply(item).build()
 
+@ExperimentalDslApi
+class BundleSelect internal constructor(val player: Player, val bundleSlot: Int)
+
 @ItemDslMarker
 @ExperimentalDslApi
 sealed interface ItemDsl {
 
     val itemProvider: ItemProviderDslProperty
 
-    fun onClick(handler: (click: Click) -> Unit)
+    fun onClick(handler: Click.() -> Unit)
 
-    fun onBundleSelect(handler: (player: Player, slot: Int) -> Unit)
+    fun onBundleSelect(handler: BundleSelect.() -> Unit)
 
 }
 
 @ExperimentalDslApi
 internal class ItemDslImpl : ItemDsl {
 
     override val itemProvider = ItemProviderDslProperty()
-    private val clickHandlers = mutableListOf<(Click) -> Unit>()
-    private val bundleSelectHandlers = mutableListOf<(Player, Int) -> Unit>()
+    private val clickHandlers = mutableListOf<Click.() -> Unit>()
+    private val bundleSelectHandlers = mutableListOf<BundleSelect.() -> Unit>()
 
-    override fun onClick(handler: (click: Click) -> Unit) {
+    override fun onClick(handler: Click.() -> Unit) {
         clickHandlers += handler
     }
 
-    override fun onBundleSelect(handler: (player: Player, slot: Int) -> Unit) {
+    override fun onBundleSelect(handler: BundleSelect.() -> Unit) {
         bundleSelectHandlers += handler
     }
 
     fun build() = Item.builder().apply {
         setItemProvider(itemProvider.delegate)
         clickHandlers.forEach { addClickHandler(it) }
-        bundleSelectHandlers.forEach { addBundleSelectHandler(it) }
+        bundleSelectHandlers.forEach { handler -> addBundleSelectHandler { player, bundleSlot -> BundleSelect(player, bundleSlot).handler() }}
     }.build()
 
 }

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

@@ -23,6 +23,9 @@ fun window(viewer: Player, window: NormalSplitWindowDsl.() -> Unit): Window =
 fun mergedWindow(viewer: Player, window: NormalMergedWindowDsl.() -> Unit): Window =
     NormalMergedWindowDslImpl(viewer).apply(window).build()
 
+@ExperimentalDslApi
+class Close internal constructor(val reason: InventoryCloseEvent.Reason)
+
 @ExperimentalDslApi
 @WindowDslMarker
 sealed interface WindowDsl {
@@ -33,9 +36,9 @@ sealed interface WindowDsl {
 
     fun onOpen(handler: () -> Unit)
 
-    fun onClose(handler: (reason: InventoryCloseEvent.Reason) -> Unit)
+    fun onClose(handler: Close.() -> Unit)
 
-    fun onOutsideClick(handler: (ClickEvent) -> Unit)
+    fun onOutsideClick(handler: ClickEvent.() -> Unit)
 
 }
 
@@ -69,18 +72,18 @@ internal abstract class AbstractWindowDsl<W : Window, B : Window.Builder<W, B>>(
     override val closeable = ProviderDslProperty(true)
     override val fallbackWindow = ProviderDslProperty<Window?>(null)
     private val openHandlers = mutableListOf<() -> Unit>()
-    private val closeHandlers = mutableListOf<(InventoryCloseEvent.Reason) -> Unit>()
-    private val outsideClickHandlers = mutableListOf<(ClickEvent) -> Unit>()
+    private val closeHandlers = mutableListOf<Close.() -> Unit>()
+    private val outsideClickHandlers = mutableListOf<ClickEvent.() -> Unit>()
 
     override fun onOpen(handler: () -> Unit) {
         openHandlers += handler
     }
 
-    override fun onClose(handler: (InventoryCloseEvent.Reason) -> Unit) {
+    override fun onClose(handler: Close.() -> Unit) {
         closeHandlers += handler
     }
 
-    override fun onOutsideClick(handler: (ClickEvent) -> Unit) {
+    override fun onOutsideClick(handler: ClickEvent.() -> Unit) {
         outsideClickHandlers += handler
     }
 
@@ -93,7 +96,7 @@ internal abstract class AbstractWindowDsl<W : Window, B : Window.Builder<W, B>>(
             setCloseable(closeable.delegate)
             setFallbackWindow(fallbackWindow.delegate)
             openHandlers.forEach { addOpenHandler(it) }
-            closeHandlers.forEach { addCloseHandler(it) }
+            closeHandlers.forEach { handler -> addCloseHandler { Close(it).handler() } }
             outsideClickHandlers.forEach { addOutsideClickHandler(it) }
         }
     }