feat: enhance DialogListTypeBuilder to support dynamic dialog addition and improve dialog management

Author: twisti-dev

surf-api-bukkit/surf-api-bukkit-api/api/surf-api-bukkit-api.api

@@ -1274,10 +1274,9 @@ public final class dev/slne/surf/surfapi/bukkit/api/dialog/builder/DialogTypeBui
 	public final fun confirmation (Lio/papermc/paper/registry/data/dialog/ActionButton;Lio/papermc/paper/registry/data/dialog/ActionButton;)V
 	public final fun confirmation (Lkotlin/jvm/functions/Function1;)V
 	public static synthetic fun confirmation$default (Ldev/slne/surf/surfapi/bukkit/api/dialog/builder/DialogTypeBuilder;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
-	public final fun dialogList (Lio/papermc/paper/registry/set/RegistrySet;Lkotlin/jvm/functions/Function1;)V
+	public final fun dialogList (Lkotlin/jvm/functions/Function1;)V
 	public final fun dialogList ([Lio/papermc/paper/dialog/Dialog;Lkotlin/jvm/functions/Function1;)V
 	public final fun dialogList ([Lio/papermc/paper/registry/TypedKey;Lkotlin/jvm/functions/Function1;)V
-	public static synthetic fun dialogList$default (Ldev/slne/surf/surfapi/bukkit/api/dialog/builder/DialogTypeBuilder;Lio/papermc/paper/registry/set/RegistrySet;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 	public static synthetic fun dialogList$default (Ldev/slne/surf/surfapi/bukkit/api/dialog/builder/DialogTypeBuilder;[Lio/papermc/paper/dialog/Dialog;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 	public static synthetic fun dialogList$default (Ldev/slne/surf/surfapi/bukkit/api/dialog/builder/DialogTypeBuilder;[Lio/papermc/paper/registry/TypedKey;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 	public final fun multiAction (Ljava/util/List;Lkotlin/jvm/functions/Function1;)V
@@ -1304,9 +1303,14 @@ public final class dev/slne/surf/surfapi/bukkit/api/dialog/builder/DialogTypeBui
 }
 
 public final class dev/slne/surf/surfapi/bukkit/api/dialog/builder/DialogTypeBuilder$DialogListTypeBuilder {
-	public fun <init> (Lio/papermc/paper/registry/set/RegistrySet;)V
+	public fun <init> ()V
+	public final fun addAll (Ljava/lang/Iterable;)V
+	public final fun addAll ([Lio/papermc/paper/dialog/Dialog;)V
 	public final fun buttonWidth (I)V
 	public final fun columns (I)V
+	public final fun dialog (Lio/papermc/paper/dialog/Dialog;)V
+	public final fun dialog (Lio/papermc/paper/registry/TypedKey;)V
+	public final fun dialog ([Lio/papermc/paper/registry/TypedKey;)V
 	public final fun exitAction (Lio/papermc/paper/registry/data/dialog/ActionButton;)V
 	public final fun exitAction (Lkotlin/jvm/functions/Function1;)V
 	public final fun getButtonWidth ()Ljava/lang/Integer;

surf-api-bukkit/surf-api-bukkit-api/src/main/kotlin/dev/slne/surf/surfapi/bukkit/api/dialog/builder/DialogTypeBuilder.kt

@@ -3,7 +3,9 @@
 package dev.slne.surf.surfapi.bukkit.api.dialog.builder
 
 import dev.slne.surf.surfapi.core.api.util.mutableObjectListOf
+import dev.slne.surf.surfapi.core.api.util.mutableObjectSetOf
 import io.papermc.paper.dialog.Dialog
+import io.papermc.paper.registry.RegistryAccess
 import io.papermc.paper.registry.RegistryKey
 import io.papermc.paper.registry.TypedKey
 import io.papermc.paper.registry.data.dialog.ActionButton
@@ -27,16 +29,22 @@ class DialogTypeBuilder {
         type = DialogType.notice(ActionButton(block))
     }
 
-    fun dialogList(dialogs: RegistrySet<Dialog>, block: DialogListTypeBuilder.() -> Unit = {}) {
-        type = DialogListTypeBuilder(dialogs).apply(block).build()
+    fun dialogList(vararg keys: TypedKey<Dialog>, block: DialogListTypeBuilder.() -> Unit = {}) {
+        dialogList {
+            dialog(*keys)
+            block()
+        }
     }
 
-    fun dialogList(vararg key: TypedKey<Dialog>, block: DialogListTypeBuilder.() -> Unit = {}) {
-        dialogList(RegistrySet.keySet(RegistryKey.DIALOG, *key), block)
+    fun dialogList(vararg dialogs: Dialog, block: DialogListTypeBuilder.() -> Unit = {}) {
+        dialogList {
+            addAll(*dialogs)
+            block()
+        }
     }
 
-    fun dialogList(vararg dialogs: Dialog, block: DialogListTypeBuilder.() -> Unit = {}) {
-        dialogList(RegistrySet.valueSet(RegistryKey.DIALOG, dialogs.toList()), block)
+    fun dialogList(block: DialogListTypeBuilder.() -> Unit) {
+        type = DialogListTypeBuilder().apply(block).build()
     }
 
     fun confirmation(block: DialogConfirmationTypeBuilder.() -> Unit = {}) {
@@ -61,7 +69,10 @@ class DialogTypeBuilder {
         }.build()
     }
 
-    fun multiAction(vararg actions: ActionButton, block: DialogMultiActionTypeBuilder.() -> Unit = {}) {
+    fun multiAction(
+        vararg actions: ActionButton,
+        block: DialogMultiActionTypeBuilder.() -> Unit = {},
+    ) {
         multiAction(actions.toList(), block)
     }
 
@@ -75,10 +86,11 @@ class DialogTypeBuilder {
         return type
     }
 
-    class DialogListTypeBuilder(private val dialogs: RegistrySet<Dialog>) {
+    class DialogListTypeBuilder {
         var exitAction: ActionButton? = null
         var columns: @Range(from = 1, to = Int.MAX_VALUE.toLong()) Int? = null
         var buttonWidth: @Range(from = 1, to = 1024) Int? = null
+        private val dialogs = mutableObjectSetOf<Dialog>()
 
         fun exitAction(exitAction: ActionButton) {
             this.exitAction = exitAction
@@ -96,8 +108,32 @@ class DialogTypeBuilder {
             this.buttonWidth = buttonWidth
         }
 
+        fun dialog(dialog: Dialog) {
+            dialogs.add(dialog)
+        }
+
+        fun addAll(vararg dialogs: Dialog) {
+            this.dialogs.addAll(dialogs)
+        }
+
+        fun addAll(dialogs: Iterable<Dialog>) {
+            this.dialogs.addAll(dialogs)
+        }
+
+        fun dialog(key: TypedKey<Dialog>) {
+            dialogs.add(
+                RegistryAccess.registryAccess().getRegistry(RegistryKey.DIALOG).getOrThrow(key)
+            )
+        }
+
+        fun dialog(vararg keys: TypedKey<Dialog>) {
+            dialogs.addAll(
+                keys.map { RegistryAccess.registryAccess().getRegistry(RegistryKey.DIALOG).getOrThrow(it) }
+            )
+        }
+
         internal fun build(): DialogType {
-            val builder = DialogType.dialogList(dialogs)
+            val builder = DialogType.dialogList(RegistrySet.valueSet(RegistryKey.DIALOG, dialogs))
             with(builder) {
                 exitAction?.let { exitAction(it) }
                 columns?.let { columns(it) }