feat: Updated Discord WebHooks implementation to Components v2

Author: 4drian3d

gradle.properties

@@ -1,3 +1,3 @@
 group = io.github._4drian3d
-version = 3.2.3
+version = 3.2.4-SNAPSHOT
 description = A simple Velocity plugin to catch the client version

gradle/libs.versions.toml

@@ -22,7 +22,7 @@ bstats = { module = "org.bstats:bstats-velocity", version.ref = "bstats" }
 configurate-kotlin = { module = "org.spongepowered:configurate-extra-kotlin", version.ref = "configurate" }
 miniplaceholders-api = { group = "io.github.miniplaceholders", name = "miniplaceholders-api", version.ref = "miniplaceholders" }
 miniplaceholders-kotlin = { group = "io.github.miniplaceholders", name = "miniplaceholders-kotlin-ext", version.ref = "miniplaceholders" }
-jdwebhooks = { group = "io.github.4drian3d", name = "jdwebhooks", version = "1.1.0" }
+jdwebhooks = { group = "io.github.4drian3d", name = "jdwebhooks", version = "2.0.0" }
 
 [plugins]
 

src/main/kotlin/io/github/_4drian3d/clientcatcher/ClientCatcher.kt

@@ -16,7 +16,7 @@ import io.github._4drian3d.clientcatcher.configuration.Messages
 import io.github._4drian3d.clientcatcher.configuration.load
 import io.github._4drian3d.clientcatcher.listener.BrandListener
 import io.github._4drian3d.clientcatcher.listener.ModListener
-import io.github._4drian3d.jdwebhooks.WebHookClient
+import io.github._4drian3d.jdwebhooks.webhook.WebHookClient
 import net.kyori.adventure.text.logger.slf4j.ComponentLogger
 import org.bstats.velocity.Metrics
 import java.nio.file.Path
@@ -64,7 +64,7 @@ class ClientCatcher @Inject constructor(
         }
     }
 
-    fun loadConfig() = CompletableFuture.supplyAsync {
+    fun loadConfig(): CompletableFuture<Boolean> = CompletableFuture.supplyAsync {
         configuration = load(path)
         messages = load(path)
         if ((configuration.webHook.client.enabled || configuration.webHook.mods.enabled) && webHookClient == null) {

src/main/kotlin/io/github/_4drian3d/clientcatcher/Extensions.kt

@@ -5,8 +5,9 @@ import com.velocitypowered.api.proxy.ConsoleCommandSource
 import com.velocitypowered.api.proxy.ProxyServer
 import io.github._4drian3d.clientcatcher.configuration.Configuration
 import io.github._4drian3d.clientcatcher.webhook.Replacer
-import io.github._4drian3d.jdwebhooks.Embed
-import io.github._4drian3d.jdwebhooks.WebHook
+import io.github._4drian3d.jdwebhooks.component.Component
+import io.github._4drian3d.jdwebhooks.component.SeparatorComponent.Spacing
+import io.github._4drian3d.jdwebhooks.webhook.WebHookExecution
 import io.github.miniplaceholders.api.MiniPlaceholders
 import net.kyori.adventure.text.logger.slf4j.ComponentLogger
 import net.kyori.adventure.text.minimessage.MiniMessage
@@ -75,21 +76,26 @@ fun sendWebHook(plugin: ClientCatcher, replacer: Replacer, config: Configuration
     val client = plugin.webHookClient
     if (client != null && config.enabled) {
         CompletableFuture.supplyAsync {
-            val builder = WebHook.builder()
-                .content(replacer.replace(config.content))
+            val builder = WebHookExecution.builder()
                 .username(replacer.replace(config.username))
                 .avatarURL(config.avatarURL)
             val embedConfig = config.embed
-            builder.embed(
-                Embed.builder()
-                    .fields(embedConfig.fields.map {
-                        Embed.Field(it.inline, replacer.replace(it.name), replacer.replace(it.value))
-                    })
-                    .title(replacer.replace(embedConfig.title))
-                    .description(replacer.replace(embedConfig.description))
-                    .build()
-            )
-            builder.build()
-        }.thenCompose { client.sendWebHook(it) }
+            builder.component(Component.textDisplay(replacer.replace(config.content)))
+            val containerBuilder = Component.container()
+                .components(
+                    Component.textDisplay("## " + replacer.replace(embedConfig.title)),
+                    Component.textDisplay(replacer.replace(embedConfig.description))
+                )
+                .component(Component.separator().divider(true).spacing(Spacing.SMALL).build())
+            embedConfig.fields.map {
+                containerBuilder
+                    .component(
+                        Component.textDisplay("### " + replacer.replace(it.name))
+                    )
+                    .component(Component.textDisplay(replacer.replace(it.value)))
+            }
+
+            builder.components(containerBuilder.build()).build()
+        }.thenCompose { client.executeWebHook(it) }
     }
 }

src/main/kotlin/io/github/_4drian3d/clientcatcher/configuration/Configuration.kt

@@ -133,7 +133,7 @@ class Configuration {
             var enabled = false
             var content = "Content"
             var username = "ClientCatcher"
-            var avatarURL = "https://cdn.modrinth.com/data/Dhqd1a7j/0a4240c54efdcabcd18e7ff47aaffdb79a7c92fd.png"
+            var avatarURL = "https://cdn.modrinth.com/data/Dhqd1a7j/ac20497103cb4b3cce6bf85e553bca4e4e7a2209.webp"
             var embed = Embed()
 
             @ConfigSerializable
@@ -146,7 +146,6 @@ class Configuration {
 
                 @ConfigSerializable
                 class Field {
-                    var inline = false
                     var name = "Name"
                     var value = "<player>"
                 }