chore: improvements to the panel api

TheFruxz · Nov 19, 2023 · 09f2af5 · 09f2af5
1 parent 0d9c1c7
commit 09f2af5
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 10 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -14,7 +14,6 @@ group = "dev.fruxz"
 repositories {
 
     mavenCentral()
-    mavenLocal()
 
     maven("https://jitpack.io") {
         name = "JitPack"

diff --git a/src/main/kotlin/dev/fruxz/sparkle/framework/ux/panel/MutablePanel.kt b/src/main/kotlin/dev/fruxz/sparkle/framework/ux/panel/MutablePanel.kt
@@ -10,6 +10,7 @@ import dev.fruxz.sparkle.framework.ux.inventory.item.itemLike
 import kotlinx.coroutines.Deferred
 import net.kyori.adventure.text.Component
 import net.kyori.adventure.text.ComponentLike
+import org.bukkit.event.inventory.InventoryClickEvent
 import org.bukkit.inventory.ItemStack
 import java.util.*
 import kotlin.coroutines.CoroutineContext
@@ -37,24 +38,38 @@ data class MutablePanel(
 
     public override val clickActions = MutableListMap<Int, ClickAction>()
 
+    // set
+
     operator fun set(slot: Int, item: ItemLike) =
         content.set(slot, item)
 
     operator fun set(slot: Int, itemStack: ItemStack) =
         this.set(slot = slot, item = itemStack.itemLike)
 
-    operator fun set(slot: Int, item: Deferred<ItemLike>) =
+    // set deferred
+
+    fun deferred(slot: Int, item: Deferred<ItemLike>) =
         lazyContent.set(slot, item)
 
-    operator fun set(slot: Int, builder: suspend () -> ItemLike) =
+    fun deferred(slot: Int, builder: suspend () -> ItemLike) =
         lazyContent.set(slot, asAsync { builder() })
 
-    // actions
+    operator fun set(slot: Int, item: Deferred<ItemLike>) =
+        deferred(slot, item)
+
+    operator fun set(slot: Int, builder: suspend () -> ItemLike) =
+        deferred(slot, asAsync { builder() })
+
+    // click actions
 
     @SparkleDSL
     fun onClick(slot: Int, action: ClickAction) =
         clickActions.addEntry(slot, action)
 
+    @SparkleDSL
+    fun onClick(slot: Int, process: suspend (InventoryClickEvent) -> Unit) =
+        onClick(slot, ClickAction(process))
+
     @SparkleDSL
     operator fun set(slot: Int, action: ClickAction) =
         onClick(slot, action)

diff --git a/src/main/kotlin/dev/fruxz/sparkle/framework/ux/panel/Panel.kt b/src/main/kotlin/dev/fruxz/sparkle/framework/ux/panel/Panel.kt
@@ -95,4 +95,4 @@ open class Panel(
         updateContext = updateContext,
     )
 
-}
+}
diff --git a/src/main/kotlin/dev/fruxz/sparkle/framework/ux/panel/PanelDSL.kt b/src/main/kotlin/dev/fruxz/sparkle/framework/ux/panel/PanelDSL.kt
@@ -0,0 +1,4 @@
+package dev.fruxz.sparkle.framework.ux.panel
+
+fun buildPanel(process: MutablePanel.() -> Unit) : Panel =
+    MutablePanel().apply(process).toPanel()
diff --git a/src/main/kotlin/dev/fruxz/sparkle/server/LocalSparklePlugin.kt b/src/main/kotlin/dev/fruxz/sparkle/server/LocalSparklePlugin.kt
@@ -14,9 +14,8 @@ import dev.fruxz.sparkle.framework.system.pluginsFolder
 import dev.fruxz.sparkle.framework.util.json.serializer.*
 import dev.fruxz.sparkle.framework.ux.inventory.item.Item
 import dev.fruxz.sparkle.framework.ux.inventory.item.item
-import dev.fruxz.sparkle.framework.ux.panel.MutablePanel
-import dev.fruxz.sparkle.framework.ux.panel.Panel
 import dev.fruxz.sparkle.framework.ux.panel.PanelListener
+import dev.fruxz.sparkle.framework.ux.panel.buildPanel
 import dev.fruxz.sparkle.server.command.SparkleCommand
 import dev.fruxz.sparkle.server.component.demo.DemoListener
 import dev.fruxz.sparkle.server.component.events.DamageListener
@@ -58,15 +57,19 @@ class LocalSparklePlugin : SparklePlugin({
     onEnable {
         println("Hey! Sparkle ${this.pluginMeta.version} is online! Running Kotlin $kotlinVersion")
 
-        val panel = MutablePanel().apply {
+        val panel = buildPanel {
             label = "Test-Panel".asStyledComponent
 
             content += 4 to Material.STONE_BUTTON.item
 
-            onClick(4, Panel.ClickAction { e ->
+            onClick(4) { e ->
                 repeat(2_000) { 1.0 / 2 }
                 e.player.sendMessage("Clicked!")
-            })
+            }
+
+            deferred(2) {
+              Material.ACACIA_BUTTON.item
+            }
 
             this[2] = {
                 delay(15.seconds)
-Original file line number
+Diff line change
@@ Expand Up / @@ -95,4 +95,4 @@ open class Panel( @@
             updateContext = updateContext,
         )
-    }
+    }