feat: replace ToastBukkitBuilder with ToastBuilder for consistency across APIs

Author: TheBjoRedCraft

surf-api-bukkit/surf-api-bukkit-api/src/main/kotlin/dev/slne/surf/surfapi/bukkit/api/SurfBukkitApi.kt

@@ -4,9 +4,9 @@ import dev.slne.surf.surfapi.bukkit.api.scoreboard.ObsoleteScoreboardApi
 import dev.slne.surf.surfapi.bukkit.api.scoreboard.SurfScoreboardBuilder
 import dev.slne.surf.surfapi.bukkit.api.time.SkipOperations.SkipOperation
 import dev.slne.surf.surfapi.bukkit.api.time.TimeSkipResult
-import dev.slne.surf.surfapi.bukkit.api.toast.ToastBukkitBuilder
 import dev.slne.surf.surfapi.core.api.SurfCoreApi
 import dev.slne.surf.surfapi.core.api.toast.Toast
+import dev.slne.surf.surfapi.core.api.toast.ToastBuilder
 import dev.slne.surf.surfapi.core.api.toast.ToastStyle
 import net.kyori.adventure.text.Component
 import net.megavex.scoreboardlibrary.api.ScoreboardLibrary
@@ -114,9 +114,9 @@ interface SurfBukkitApi : SurfCoreApi {
      * @param builder A lambda function that configures the ToastBuilder.
      * @return The created Toast instance.
      *
-     * @see ToastBukkitBuilder
+     * @see ToastBuilder
      */
-    fun createToast(builder: ToastBukkitBuilder.() -> Unit): Toast
+    fun createToast(builder: ToastBuilder.() -> Unit): Toast
 
     /**
      * Creates a Toast with the specified icon, display text, and style.

surf-api-bukkit/surf-api-bukkit-api/src/main/kotlin/dev/slne/surf/surfapi/bukkit/api/toast/ToastBukkitDsl.kt

@@ -7,8 +7,8 @@ import com.github.shynixn.mccoroutine.folia.entityDispatcher
 import com.github.shynixn.mccoroutine.folia.regionDispatcher
 import dev.slne.surf.surfapi.bukkit.api.SurfBukkitApi
 import dev.slne.surf.surfapi.bukkit.api.surfBukkitApi
-import dev.slne.surf.surfapi.bukkit.api.toast.ToastBukkitBuilder
 import dev.slne.surf.surfapi.core.api.toast.Toast
+import dev.slne.surf.surfapi.core.api.toast.ToastBuilder
 import dev.slne.surf.surfapi.core.api.util.getCallerClass
 import dev.slne.surf.surfapi.core.api.util.mutableLong2ObjectMapOf
 import dev.slne.surf.surfapi.core.api.util.mutableObjectListOf
@@ -275,7 +275,7 @@ suspend fun World.getBlockAtAsync(pos: BlockPosition): Block {
 }
 
 fun Player.sendToast(toast: Toast) = toast.send(this.uniqueId)
-fun Player.sendToast(block: ToastBukkitBuilder.() -> Unit) =
+fun Player.sendToast(block: ToastBuilder.() -> Unit) =
     surfBukkitApi.createToast(block).send(this.uniqueId)
 
 fun Toast.send(player: Player) = send(player.uniqueId)

surf-api-bukkit/surf-api-bukkit-api/src/main/kotlin/dev/slne/surf/surfapi/bukkit/api/util/bukkit-util.kt

@@ -3,11 +3,11 @@ package dev.slne.surf.surfapi.bukkit.test.command.subcommands
 import dev.jorel.commandapi.CommandAPICommand
 import dev.jorel.commandapi.kotlindsl.playerExecutor
 import dev.slne.surf.surfapi.bukkit.api.surfBukkitApi
-import dev.slne.surf.surfapi.bukkit.api.toast.toast
 import dev.slne.surf.surfapi.bukkit.api.util.send
 import dev.slne.surf.surfapi.bukkit.api.util.sendToast
 import dev.slne.surf.surfapi.core.api.messages.adventure.buildText
 import dev.slne.surf.surfapi.core.api.toast.ToastStyle
+import dev.slne.surf.surfapi.core.api.toast.toast
 import org.bukkit.Material
 
 class ToastTest(name: String) : CommandAPICommand(name) {

surf-api-bukkit/surf-api-bukkit-plugin-test/src/main/kotlin/dev/slne/surf/surfapi/bukkit/test/command/subcommands/ToastTest.kt

@@ -6,13 +6,13 @@ import dev.slne.surf.surfapi.bukkit.api.SurfBukkitApi
 import dev.slne.surf.surfapi.bukkit.api.scoreboard.ObsoleteScoreboardApi
 import dev.slne.surf.surfapi.bukkit.api.time.SkipOperations.SkipOperation
 import dev.slne.surf.surfapi.bukkit.api.time.TimeSkipResult
-import dev.slne.surf.surfapi.bukkit.api.toast.ToastBukkitBuilder
 import dev.slne.surf.surfapi.bukkit.server.hook.SurfBukkitHookManager
 import dev.slne.surf.surfapi.bukkit.server.impl.scoreboard.SurfScoreboardBuilderImpl
 import dev.slne.surf.surfapi.bukkit.server.plugin
 import dev.slne.surf.surfapi.bukkit.server.time.TimeHandler
 import dev.slne.surf.surfapi.core.api.SurfCoreApi
 import dev.slne.surf.surfapi.core.api.toast.Toast
+import dev.slne.surf.surfapi.core.api.toast.ToastBuilder
 import dev.slne.surf.surfapi.core.api.toast.ToastStyle
 import dev.slne.surf.surfapi.core.api.util.checkInstantiationByServiceLoader
 import dev.slne.surf.surfapi.core.api.util.mutableObject2ObjectMapOf
@@ -111,8 +111,8 @@ class SurfBukkitApiImpl : SurfCoreApiImpl(), SurfBukkitApi {
         }.mapValuesTo(mutableObject2ObjectMapOf(worlds.size)) { (_, def) -> def.await() }
     }
 
-    override fun createToast(builder: ToastBukkitBuilder.() -> Unit): Toast =
-        ToastBukkitBuilder().apply(builder).build()
+    override fun createToast(builder: ToastBuilder.() -> Unit): Toast =
+        ToastBuilder().apply(builder).build()
 
     override fun createToast(icon: Material, text: Component, style: ToastStyle): Toast = ToastImpl(
         SpigotConversionUtil.fromBukkitItemMaterial(icon),

surf-api-bukkit/surf-api-bukkit-server/src/main/kotlin/dev/slne/surf/surfapi/bukkit/server/impl/SurfBukkitApiImpl.kt

@@ -1,19 +1,16 @@
-package dev.slne.surf.surfapi.velocity.api.toast
+package dev.slne.surf.surfapi.core.api.toast
 
 import com.github.retrooper.packetevents.protocol.item.type.ItemType
 import com.github.retrooper.packetevents.protocol.item.type.ItemTypes
 import dev.slne.surf.surfapi.core.api.messages.builder.SurfComponentBuilder
-import dev.slne.surf.surfapi.core.api.toast.Toast
-import dev.slne.surf.surfapi.core.api.toast.ToastService
-import dev.slne.surf.surfapi.core.api.toast.ToastStyle
 
-class ToastVelocityBuilder {
+class ToastBuilder {
     private var icon: ItemType = ItemTypes.STONE
     private var text: SurfComponentBuilder.() -> Unit = {}
     private var style: ToastStyle = ToastStyle.TASK
 
-    fun icon(iconType: ItemType) {
-        this.icon = iconType
+    fun icon(itemType: ItemType) {
+        this.icon = itemType
     }
 
     fun text(block: SurfComponentBuilder.() -> Unit) {
@@ -31,7 +28,7 @@ class ToastVelocityBuilder {
     )
 }
 
-fun toast(block: ToastVelocityBuilder.() -> Unit): Toast {
-    return ToastVelocityBuilder().apply(block).build()
+fun toast(block: ToastBuilder.() -> Unit): Toast {
+    return ToastBuilder().apply(block).build()
 }
 

…i/velocity/api/toast/ToastVelocityDsl.kt …/surf/surfapi/core/api/toast/ToastDsl.ktsurf-api-velocity/surf-api-velocity-api/src/main/kotlin/dev/slne/surf/surfapi/velocity/api/toast/ToastVelocityDsl.kt renamed to surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/toast/ToastDsl.kt surf-api-velocity/surf-api-velocity-api/src/main/kotlin/dev/slne/surf/surfapi/velocity/api/toast/ToastVelocityDsl.kt renamed to surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/toast/ToastDsl.kt

@@ -4,9 +4,9 @@ import com.github.retrooper.packetevents.protocol.item.type.ItemType
 import com.velocitypowered.api.proxy.Player
 import dev.slne.surf.surfapi.core.api.SurfCoreApi
 import dev.slne.surf.surfapi.core.api.toast.Toast
+import dev.slne.surf.surfapi.core.api.toast.ToastBuilder
 import dev.slne.surf.surfapi.core.api.toast.ToastStyle
 import dev.slne.surf.surfapi.core.api.util.requiredService
-import dev.slne.surf.surfapi.velocity.api.toast.ToastVelocityBuilder
 import net.kyori.adventure.text.Component
 import java.util.concurrent.ExecutorService
 
@@ -19,9 +19,9 @@ interface SurfVelocityApi : SurfCoreApi {
      * @param builder A lambda function that configures the ToastBuilder.
      * @return The created Toast instance.
      *
-     * @see ToastVelocityBuilder
+     * @see ToastBuilder
      */
-    fun createToast(builder: ToastVelocityBuilder.() -> Unit): Toast
+    fun createToast(builder: ToastBuilder.() -> Unit): Toast
 
     /**
      * Creates a Toast with the specified icon, display text, and style.

surf-api-velocity/surf-api-velocity-api/src/main/kotlin/dev/slne/surf/surfapi/velocity/api/SurfVelocityApi.kt

@@ -2,11 +2,11 @@ package dev.slne.surf.surfapi.velocity.api.util
 
 import com.velocitypowered.api.proxy.Player
 import dev.slne.surf.surfapi.core.api.toast.Toast
+import dev.slne.surf.surfapi.core.api.toast.ToastBuilder
 import dev.slne.surf.surfapi.velocity.api.surfVelocityApi
-import dev.slne.surf.surfapi.velocity.api.toast.ToastVelocityBuilder
 
 fun Player.sendToast(toast: Toast) = toast.send(this.uniqueId)
-fun Player.sendToast(block: ToastVelocityBuilder.() -> Unit) =
+fun Player.sendToast(block: ToastBuilder.() -> Unit) =
     surfVelocityApi.createToast(block).send(this.uniqueId)
 
 fun Toast.send(player: Player) = this.send(player.uniqueId)