Merge branch 'version/1.21' into feat/add-pageable-message-builder

Author: TheBjoRedCraft

gradle.properties

@@ -9,5 +9,5 @@ javaVersion=21
 mcVersion=1.21.4
 
 group=dev.slne.surf
-version=1.21.4-2.13.5-SNAPSHOT
+version=1.21.4-2.14.1-SNAPSHOT
 relocationPrefix=dev.slne.surf.surfapi.libs

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

@@ -3667,6 +3667,7 @@ public abstract interface annotation class dev/slne/surf/surfapi/core/api/messag
 public final class dev/slne/surf/surfapi/core/api/messages/adventure/Audience_extensionKt {
 	public static final fun openBook (Lnet/kyori/adventure/audience/Audience;Lkotlin/jvm/functions/Function1;)V
 	public static final fun playSound (Lnet/kyori/adventure/audience/Audience;Lkotlin/jvm/functions/Function1;)V
+	public static final fun playSound (Lnet/kyori/adventure/audience/Audience;ZLkotlin/jvm/functions/Function1;)V
 	public static final fun sendText (Lnet/kyori/adventure/audience/Audience;Lkotlin/jvm/functions/Function1;)V
 	public static final fun showBossBar (Lnet/kyori/adventure/audience/Audience;Lkotlin/jvm/functions/Function1;)V
 	public static final fun showTitle (Lnet/kyori/adventure/audience/Audience;Lkotlin/jvm/functions/Function1;)V

surf-api-core/surf-api-core-api/api/surf-api-core-api.api

@@ -2423,6 +2423,7 @@ public abstract interface annotation class dev/slne/surf/surfapi/core/api/messag
 public final class dev/slne/surf/surfapi/core/api/messages/adventure/Audience_extensionKt {
 	public static final fun openBook (Lnet/kyori/adventure/audience/Audience;Lkotlin/jvm/functions/Function1;)V
 	public static final fun playSound (Lnet/kyori/adventure/audience/Audience;Lkotlin/jvm/functions/Function1;)V
+	public static final fun playSound (Lnet/kyori/adventure/audience/Audience;ZLkotlin/jvm/functions/Function1;)V
 	public static final fun sendText (Lnet/kyori/adventure/audience/Audience;Lkotlin/jvm/functions/Function1;)V
 	public static final fun showBossBar (Lnet/kyori/adventure/audience/Audience;Lkotlin/jvm/functions/Function1;)V
 	public static final fun showTitle (Lnet/kyori/adventure/audience/Audience;Lkotlin/jvm/functions/Function1;)V

surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/messages/adventure/audience-extension.kt

@@ -4,6 +4,7 @@ import dev.slne.surf.surfapi.core.api.messages.builder.SurfComponentBuilder
 import net.kyori.adventure.audience.Audience
 import net.kyori.adventure.inventory.Book
 import net.kyori.adventure.sound.Sound
+import net.kyori.adventure.sound.Sound.Emitter
 
 inline fun Audience.sendText(block: SurfComponentBuilder.() -> Unit) {
     sendMessage(SurfComponentBuilder(block))
@@ -21,6 +22,15 @@ inline fun Audience.playSound(block: @SoundDsl Sound.Builder.() -> Unit) {
     playSound(Sound(block))
 }
 
+inline fun Audience.playSound(useSelfEmitter: Boolean, block: @SoundDsl Sound.Builder.() -> Unit) {
+    if (useSelfEmitter) {
+        playSound(Sound(block), Emitter.self())
+        return
+    }
+
+    playSound(Sound(block))
+}
+
 inline fun Audience.showTitle(block: @TitleDsl TitleBuilder.() -> Unit) {
     showTitle(Title(block))
 }

surf-api-gradle-plugin/src/main/kotlin/dev/slne/surf/surfapi/gradle/generators/pluginfiles/VelocityPluginFile.kt

@@ -64,7 +64,7 @@ class VelocityPluginFile(project: Project) : CommonPluginFile() {
     @Optional
     var pluginDependencies: NamedDomainObjectContainer<Dependency> =
         project.container(Dependency::class.java).apply {
-            register("surf-velocity-api") {
+            register("surf-api-velocity") {
                 optional = false
             }
         }

surf-api-velocity/surf-api-velocity-api/api/surf-api-velocity-api.api

@@ -2624,6 +2624,7 @@ public abstract interface annotation class dev/slne/surf/surfapi/core/api/messag
 public final class dev/slne/surf/surfapi/core/api/messages/adventure/Audience_extensionKt {
 	public static final fun openBook (Lnet/kyori/adventure/audience/Audience;Lkotlin/jvm/functions/Function1;)V
 	public static final fun playSound (Lnet/kyori/adventure/audience/Audience;Lkotlin/jvm/functions/Function1;)V
+	public static final fun playSound (Lnet/kyori/adventure/audience/Audience;ZLkotlin/jvm/functions/Function1;)V
 	public static final fun sendText (Lnet/kyori/adventure/audience/Audience;Lkotlin/jvm/functions/Function1;)V
 	public static final fun showBossBar (Lnet/kyori/adventure/audience/Audience;Lkotlin/jvm/functions/Function1;)V
 	public static final fun showTitle (Lnet/kyori/adventure/audience/Audience;Lkotlin/jvm/functions/Function1;)V