Add death messages

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group 'com.dominikkorsa.discordintegration'
-version '1.5'
+version '1.6'
 
 repositories {
     mavenCentral()

src/main/kotlin/com/dominikkorsa/discordintegration/Client.kt

@@ -134,4 +134,8 @@ class Client(private val plugin: DiscordIntegration) {
     suspend fun disconnect() {
         gateway?.logout()?.awaitFirstOrNull()
     }
+
+    suspend fun sendDeathInfo(deathMessage: String) {
+        sendMessage { it.setContent(deathMessage) }
+    }
 }

src/main/kotlin/com/dominikkorsa/discordintegration/ConfigManager.kt

@@ -20,4 +20,6 @@ class ConfigManager(private val plugin: DiscordIntegration) {
     val minecraftTooltipMessage get() = getString("messages.minecraft.tooltip")
     val discordJoinMessage get() = getString("messages.discord.join")
     val discordQuitMessage get() = getString("messages.discord.quit")
+    val discordDeathMessage get() = getString("messages.discord.death")
+    val discordDeathFallbackMessage get() = getString("messages.discord.death-fallback")
 }

src/main/kotlin/com/dominikkorsa/discordintegration/DiscordIntegration.kt

@@ -1,5 +1,8 @@
 package com.dominikkorsa.discordintegration
 
+import com.dominikkorsa.discordintegration.listener.ChatListener
+import com.dominikkorsa.discordintegration.listener.DeathListener
+import com.dominikkorsa.discordintegration.listener.PlayerCountListener
 import com.github.shynixn.mccoroutine.launchAsync
 import com.github.shynixn.mccoroutine.registerSuspendingEvents
 import discord4j.core.`object`.entity.Message
@@ -10,11 +13,9 @@ import kotlinx.coroutines.runBlocking
 import net.md_5.bungee.api.chat.ComponentBuilder
 import net.md_5.bungee.api.chat.HoverEvent
 import net.md_5.bungee.api.chat.TextComponent
-import net.md_5.bungee.api.chat.hover.content.Content
 import org.bukkit.Bukkit
+import org.bukkit.event.Listener
 import org.bukkit.plugin.java.JavaPlugin
-import java.time.LocalDateTime
-import java.time.format.DateTimeFormatter
 
 class DiscordIntegration: JavaPlugin() {
     lateinit var client: Client
@@ -27,14 +28,9 @@ class DiscordIntegration: JavaPlugin() {
         client = Client(this)
         this.launchAsync {
             client.main()
-            server.pluginManager.registerSuspendingEvents(
-                PlayerCountListener(this@DiscordIntegration),
-                this@DiscordIntegration
-            )
-            server.pluginManager.registerSuspendingEvents(
-                ChatListener(this@DiscordIntegration),
-                this@DiscordIntegration
-            )
+            registerSuspendingEvents(PlayerCountListener(this@DiscordIntegration))
+            registerSuspendingEvents(ChatListener(this@DiscordIntegration))
+            registerSuspendingEvents(DeathListener(this@DiscordIntegration))
             this@DiscordIntegration.launchAsync {
                 client.initListeners()
             }
@@ -86,4 +82,8 @@ class DiscordIntegration: JavaPlugin() {
         )
         server.spigot().broadcast(messageComponent)
     }
+
+    private fun registerSuspendingEvents(listener: Listener) {
+        server.pluginManager.registerSuspendingEvents(listener, this)
+    }
 }

src/main/kotlin/com/dominikkorsa/discordintegration/ChatListener.kt → src/main/kotlin/com/dominikkorsa/discordintegration/listener/ChatListener.kt

@@ -1,6 +1,8 @@
-package com.dominikkorsa.discordintegration
+package com.dominikkorsa.discordintegration.listener
 
+import com.dominikkorsa.discordintegration.AvatarService
 import com.dominikkorsa.discordintegration.AvatarService.*
+import com.dominikkorsa.discordintegration.DiscordIntegration
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
 import org.bukkit.event.player.AsyncPlayerChatEvent

src/main/kotlin/com/dominikkorsa/discordintegration/listener/DeathListener.kt

@@ -0,0 +1,22 @@
+package com.dominikkorsa.discordintegration.listener
+
+import com.dominikkorsa.discordintegration.DiscordIntegration
+import kotlinx.coroutines.delay
+import org.bukkit.event.EventHandler
+import org.bukkit.event.Listener
+import org.bukkit.event.entity.PlayerDeathEvent
+import org.bukkit.event.player.PlayerJoinEvent
+import org.bukkit.event.player.PlayerQuitEvent
+
+class DeathListener(private val plugin: DiscordIntegration) : Listener {
+    @EventHandler
+    suspend fun onDeath(event: PlayerDeathEvent) {
+        var deathMessage = event.deathMessage?.let {
+            plugin.configManager.discordDeathMessage
+                .replace("%death-message%", it)
+        } ?: plugin.configManager.discordDeathFallbackMessage
+        deathMessage = deathMessage
+            .replace("%player%", event.entity.displayName)
+        plugin.client.sendDeathInfo(deathMessage)
+    }
+}

src/main/kotlin/com/dominikkorsa/discordintegration/PlayerCountListener.kt → src/main/kotlin/com/dominikkorsa/discordintegration/listener/PlayerCountListener.kt

@@ -1,5 +1,6 @@
-package com.dominikkorsa.discordintegration
+package com.dominikkorsa.discordintegration.listener
 
+import com.dominikkorsa.discordintegration.DiscordIntegration
 import kotlinx.coroutines.delay
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener

src/main/resources/config.yml

@@ -13,6 +13,8 @@ messages:
   discord:
     join: '**%player% joined the server**'
     quit: '**%player% left the server**'
+    death: '**%death-message%**'
+    death-fallback: '**%player% died**'
   minecraft:
     message: '§2%nickname% §7in #%channel-name%§7 » §r%content%'
     tooltip: |

src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: DiscordIntegration
-version: 1.5
+version: 1.6
 author: Dominik Korsa
 main: com.dominikkorsa.discordintegration.DiscordIntegration
 api-version: 1.16