DSL: change receivers of onXY functions to dsl-marked interfaces

Author: NichtStudioCode

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

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

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

@@ -22,7 +22,7 @@ sealed interface FurnaceWindowDsl : SplitWindowDsl {
     val cookProgress: ProviderDslProperty<Double>
     val burnProgress: ProviderDslProperty<Double>
 
-    fun onRecipeClick(handler: RecipeClick.() -> Unit)
+    fun onRecipeClick(handler: RecipeClickDsl.() -> Unit)
 
 }
 
@@ -35,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<RecipeClick.() -> Unit>()
+    private val recipeClickHandlers = mutableListOf<RecipeClickDsl.() -> Unit>()
 
-    override fun onRecipeClick(handler: RecipeClick.() -> Unit) {
+    override fun onRecipeClick(handler: RecipeClickDsl.() -> Unit) {
         recipeClickHandlers += handler
     }
 
@@ -50,7 +50,9 @@ internal class FurnaceWindowDslImpl(
             setResultGui(resultGui.value)
             setCookProgress(cookProgress)
             setBurnProgress(burnProgress)
-            recipeClickHandlers.forEach { handler -> addRecipeClickHandler { RecipeClick(it).handler() } }
+            for (handler in recipeClickHandlers) {
+                addRecipeClickHandler { RecipeClickDslImpl(it).handler() }
+            }
         }
     }
 

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

@@ -16,33 +16,49 @@ import xyz.xenondevs.invui.item.ItemProvider
 fun item(item: ItemDsl.() -> Unit): Item =
     ItemDslImpl().apply(item).build()
 
+@ItemDslMarker
+@ExperimentalDslApi
+sealed interface ClickDsl {
+    
+    val clickType: ClickType
+    val player: Player
+    val hotbarButton: Int
+    
+}
+
+@ItemDslMarker
 @ExperimentalDslApi
-class BundleSelect internal constructor(val player: Player, val bundleSlot: Int)
+sealed interface BundleSelectDsl {
+    
+    val player: Player
+    val bundleSlot: Int
+    
+}
 
 @ItemDslMarker
 @ExperimentalDslApi
 sealed interface ItemDsl {
 
     val itemProvider: ItemProviderDslProperty
 
-    fun onClick(handler: Click.() -> Unit)
+    fun onClick(handler: ClickDsl.() -> Unit)
 
-    fun onBundleSelect(handler: BundleSelect.() -> Unit)
+    fun onBundleSelect(handler: BundleSelectDsl.() -> Unit)
 
 }
 
 @ExperimentalDslApi
 internal class ItemDslImpl : ItemDsl {
 
     override val itemProvider = ItemProviderDslProperty()
-    private val clickHandlers = mutableListOf<Click.() -> Unit>()
-    private val bundleSelectHandlers = mutableListOf<BundleSelect.() -> Unit>()
+    private val clickHandlers = mutableListOf<ClickDsl.() -> Unit>()
+    private val bundleSelectHandlers = mutableListOf<BundleSelectDsl.() -> Unit>()
 
-    override fun onClick(handler: Click.() -> Unit) {
+    override fun onClick(handler: ClickDsl.() -> Unit) {
         clickHandlers += handler
     }
 
-    override fun onBundleSelect(handler: BundleSelect.() -> Unit) {
+    override fun onBundleSelect(handler: BundleSelectDsl.() -> Unit) {
         bundleSelectHandlers += handler
     }
 
@@ -51,11 +67,24 @@ internal class ItemDslImpl : ItemDsl {
 
 }
 
+@ExperimentalDslApi
+internal class ClickDslImpl(
+    override val clickType: ClickType,
+    override val player: Player,
+    override val hotbarButton: Int
+) : ClickDsl
+
+@ExperimentalDslApi
+internal class BundleSelectDslImpl(
+    override val player: Player,
+    override val bundleSlot: Int
+) : BundleSelectDsl
+
 @ExperimentalDslApi
 private class DslItemImpl(
     private val itemProvider: Provider<ItemProvider>,
-    private val clickHandlers: List<Click.() -> Unit>,
-    private val bundleSelectHandlers: List<BundleSelect.() -> Unit>
+    private val clickHandlers: List<ClickDsl.() -> Unit>,
+    private val bundleSelectHandlers: List<BundleSelectDsl.() -> Unit>
 ) : AbstractItem() {
 
     init {
@@ -65,12 +94,13 @@ private class DslItemImpl(
     override fun getItemProvider(viewer: Player) = itemProvider.get()
 
     override fun handleClick(clickType: ClickType, player: Player, click: Click) {
-        clickHandlers.forEach { it(click) }
+        val cd = ClickDslImpl(clickType, player, click.hotbarButton)
+        clickHandlers.forEach { it(cd) }
     }
 
     override fun handleBundleSelect(player: Player, bundleSlot: Int) {
-        val bs = BundleSelect(player, bundleSlot)
-        bundleSelectHandlers.forEach { it(bs) }
+        val bsd = BundleSelectDslImpl(player, bundleSlot)
+        bundleSelectHandlers.forEach { it(bsd) }
     }
 
 

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

@@ -3,6 +3,7 @@
 package xyz.xenondevs.invui.dsl
 
 import org.bukkit.entity.Player
+import org.bukkit.event.inventory.ClickType
 import org.bukkit.event.inventory.InventoryCloseEvent
 import xyz.xenondevs.invui.ClickEvent
 import xyz.xenondevs.invui.ExperimentalReactiveApi
@@ -23,8 +24,28 @@ fun window(viewer: Player, window: NormalSplitWindowDsl.() -> Unit): Window =
 fun mergedWindow(viewer: Player, window: NormalMergedWindowDsl.() -> Unit): Window =
     NormalMergedWindowDslImpl(viewer).apply(window).build()
 
+@WindowDslMarker
 @ExperimentalDslApi
-class Close internal constructor(val reason: InventoryCloseEvent.Reason)
+interface WindowOpenDsl
+
+@WindowDslMarker
+@ExperimentalDslApi
+interface WindowCloseDsl {
+    
+    val reason: InventoryCloseEvent.Reason
+    
+}
+
+@WindowDslMarker
+@ExperimentalDslApi
+interface WindowOutsideClickDsl {
+    
+    val player: Player
+    val clickType: ClickType
+    val hotbarButton: Int
+    var isCancelled: Boolean
+    
+}
 
 @ExperimentalDslApi
 @WindowDslMarker
@@ -34,11 +55,11 @@ sealed interface WindowDsl {
     val closeable: ProviderDslProperty<Boolean>
     val fallbackWindow: ProviderDslProperty<Window?>
 
-    fun onOpen(handler: () -> Unit)
+    fun onOpen(handler: WindowOpenDsl.() -> Unit)
 
-    fun onClose(handler: Close.() -> Unit)
+    fun onClose(handler: WindowCloseDsl.() -> Unit)
 
-    fun onOutsideClick(handler: ClickEvent.() -> Unit)
+    fun onOutsideClick(handler: WindowOutsideClickDsl.() -> Unit)
 
 }
 
@@ -71,19 +92,19 @@ internal abstract class AbstractWindowDsl<W : Window, B : Window.Builder<W, B>>(
     override val title = ComponentProviderDslProperty()
     override val closeable = ProviderDslProperty(true)
     override val fallbackWindow = ProviderDslProperty<Window?>(null)
-    private val openHandlers = mutableListOf<() -> Unit>()
-    private val closeHandlers = mutableListOf<Close.() -> Unit>()
-    private val outsideClickHandlers = mutableListOf<ClickEvent.() -> Unit>()
+    private val openHandlers = mutableListOf<WindowOpenDsl.() -> Unit>()
+    private val closeHandlers = mutableListOf<WindowCloseDsl.() -> Unit>()
+    private val outsideClickHandlers = mutableListOf<WindowOutsideClickDsl.() -> Unit>()
 
-    override fun onOpen(handler: () -> Unit) {
+    override fun onOpen(handler: WindowOpenDsl.() -> Unit) {
         openHandlers += handler
     }
 
-    override fun onClose(handler: Close.() -> Unit) {
+    override fun onClose(handler: WindowCloseDsl.() -> Unit) {
         closeHandlers += handler
     }
 
-    override fun onOutsideClick(handler: ClickEvent.() -> Unit) {
+    override fun onOutsideClick(handler: WindowOutsideClickDsl.() -> Unit) {
         outsideClickHandlers += handler
     }
 
@@ -95,9 +116,15 @@ internal abstract class AbstractWindowDsl<W : Window, B : Window.Builder<W, B>>(
             setTitle(title)
             setCloseable(closeable)
             setFallbackWindow(fallbackWindow)
-            openHandlers.forEach { addOpenHandler(it) }
-            closeHandlers.forEach { handler -> addCloseHandler { Close(it).handler() } }
-            outsideClickHandlers.forEach { addOutsideClickHandler(it) }
+            for (handler in openHandlers) {
+                addOpenHandler { WindowOpenDslImpl().handler() }
+            }
+            for (handler in closeHandlers) {
+                addCloseHandler { reason -> WindowCloseDslImpl(reason).handler() }
+            }
+            for (handler in outsideClickHandlers) {
+                addOutsideClickHandler { event -> WindowOutsideClickDslImpl(event).handler() }
+            }
         }
     }
 
@@ -165,4 +192,25 @@ internal class NormalMergedWindowDslImpl(viewer: Player) : AbstractWindowDsl<Win
         builder.setGui(gui.value)
     }
 
+}
+
+@ExperimentalDslApi
+internal class WindowOpenDslImpl : WindowOpenDsl
+
+@ExperimentalDslApi
+internal class WindowCloseDslImpl(override val reason: InventoryCloseEvent.Reason) : WindowCloseDsl
+
+@ExperimentalDslApi
+internal class WindowOutsideClickDslImpl(private val event: ClickEvent) : WindowOutsideClickDsl {
+    override val player: Player
+        get() = event.player
+    override val clickType: ClickType
+        get() = event.clickType
+    override val hotbarButton: Int
+        get() = event.hotbarButton
+    override var isCancelled: Boolean
+        get() = event.isCancelled
+        set(value) {
+            event.isCancelled = value
+        }
 }