Merge pull request #102 from SLNE-Development/feat/1.21.11-clean

Keviro · web-flow · commit c3c83bfcad3f · 2026-01-27T18:28:14.000+01:00
PERFORMANCE &amp; CONFIG CLEANUP
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
 kotlin.code.style=official
 kotlin.stdlib.default.dependency=false
 org.gradle.parallel=true
-version=1.21.11-4.1.1-SNAPSHOT
+version=1.21.11-4.1.3-SNAPSHOT
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,9 @@
 [versions]
 playerholder-api = "2.11.6"
 miniplaceholder-api = "3.0.1"
+luckperms-api = "5.4"
 
 [libraries]
 playerholder-api = { module = "me.clip:placeholderapi", version.ref = "playerholder-api" }
-miniplaceholder-api = { module = "io.github.miniplaceholders:miniplaceholders-api", version.ref = "miniplaceholder-api" }
+miniplaceholder-api = { module = "io.github.miniplaceholders:miniplaceholders-api", version.ref = "miniplaceholder-api" }
+luckperms-api = { module = "net.luckperms:api", version.ref = "luckperms-api" }
diff --git a/surf-chat-bukkit/build.gradle.kts b/surf-chat-bukkit/build.gradle.kts
@@ -1,3 +1,4 @@
+import dev.slne.surf.surfapi.gradle.util.registerRequired
 import dev.slne.surf.surfapi.gradle.util.registerSoft
 
 plugins {
@@ -13,6 +14,7 @@ dependencies {
 
     compileOnly(libs.playerholder.api)
     compileOnly(libs.miniplaceholder.api)
+    compileOnly(libs.luckperms.api)
 
     runtimeOnly(project(":surf-chat-fallback"))
     implementation("de.maxbossing:kotlin-discord-webhook:1") {
@@ -37,6 +39,7 @@ surfPaperPluginApi {
     serverDependencies {
         registerSoft("MiniPlaceholders")
         registerSoft("surf-settings-paper")
+        registerRequired("LuckPerms")
     }
 
     authors.add("red")
diff --git a/surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/BukkitMain.kt b/surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/BukkitMain.kt
@@ -4,7 +4,6 @@ import com.github.shynixn.mccoroutine.folia.SuspendingJavaPlugin
 import com.github.shynixn.mccoroutine.folia.launch
 import dev.slne.surf.chat.api.processor.chatProcessorRegistry
 import dev.slne.surf.chat.bukkit.config.AiModerationConfig
-import dev.slne.surf.chat.bukkit.config.DiscordConfigProvider
 import dev.slne.surf.chat.bukkit.config.SurfChatConfigProvider
 import dev.slne.surf.chat.bukkit.listener.AsyncChatListener
 import dev.slne.surf.chat.bukkit.listener.ConnectListener
@@ -50,8 +49,7 @@ class BukkitMain : SuspendingJavaPlugin() {
 
     override fun onEnable() {
         BukkitCommandManager.registerCommands()
-
-
+        
         AsyncChatListener().register()
         DisconnectListener().register()
         ConnectListener.register()
@@ -81,7 +79,6 @@ class BukkitMain : SuspendingJavaPlugin() {
     }
 
     val surfChatConfig = SurfChatConfigProvider()
-    val discordConfig = DiscordConfigProvider()
     val connectionMessageConfig get() = surfChatConfig.config.connectionMessageConfig
     val chatMotdConfig get() = surfChatConfig.config.chatMotdConfig
     val autoDisablingConfig get() = surfChatConfig.config.autoDisablingConfig
diff --git a/surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/command/surfchat/SurfChatLookupHelpCommand.kt b/surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/command/surfchat/SurfChatLookupHelpCommand.kt
@@ -5,7 +5,6 @@ import dev.jorel.commandapi.kotlindsl.playerExecutor
 import dev.jorel.commandapi.kotlindsl.subcommand
 import dev.slne.surf.chat.api.message.MessageType
 import dev.slne.surf.chat.bukkit.permission.PermissionRegistry
-import dev.slne.surf.chat.bukkit.util.appendSpace
 import dev.slne.surf.surfapi.core.api.font.toSmallCaps
 import dev.slne.surf.surfapi.core.api.messages.CommonComponents
 import dev.slne.surf.surfapi.core.api.messages.adventure.buildText
@@ -31,7 +30,11 @@ fun CommandAPICommand.surfChatLookupHelpCommand() = subcommand("lookuphelp") {
                         appendSpace()
                         variableValue(help.content)
                         appendNewline()
-                        appendSpace(5)
+                        appendSpace()
+                        appendSpace()
+                        appendSpace()
+                        appendSpace()
+                        appendSpace()
                         spacer("z.B.")
                         appendSpace()
                         spacer(help.example)
diff --git a/surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/command/surfchat/SurfChatReloadCommand.kt b/surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/command/surfchat/SurfChatReloadCommand.kt
@@ -3,6 +3,7 @@ package dev.slne.surf.chat.bukkit.command.surfchat
 import dev.jorel.commandapi.CommandAPICommand
 import dev.jorel.commandapi.kotlindsl.anyExecutor
 import dev.jorel.commandapi.kotlindsl.subcommand
+import dev.slne.surf.chat.bukkit.config.AiModerationConfig
 import dev.slne.surf.chat.bukkit.permission.PermissionRegistry
 import dev.slne.surf.chat.bukkit.plugin
 import dev.slne.surf.chat.bukkit.util.coloredComponent
@@ -14,7 +15,7 @@ fun CommandAPICommand.surfChatReloadCommand() = subcommand("reload") {
     anyExecutor { executor, _ ->
         val ms = measureTimeMillis {
             plugin.surfChatConfig.reload()
-            plugin.discordConfig.reload()
+            AiModerationConfig.reload()
         }
 
         executor.sendText {
diff --git a/surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/config/DiscordConfigProvider.kt b/surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/config/DiscordConfigProvider.kt
diff --git a/surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/config/configs/ChatServerConfig.kt b/surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/config/configs/ChatServerConfig.kt
diff --git a/surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/config/configs/DiscordConfig.kt b/surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/config/configs/DiscordConfig.kt
diff --git a/surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/config/configs/SurfChatConfig.kt b/surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/config/configs/SurfChatConfig.kt
@@ -1,13 +1,17 @@
 package dev.slne.surf.chat.bukkit.config.configs
 
 import org.spongepowered.configurate.objectmapping.ConfigSerializable
+import org.spongepowered.configurate.objectmapping.meta.Setting
 
 @ConfigSerializable
 data class SurfChatConfig(
-    val autoDisablingConfig: AutoDisablingConfig = AutoDisablingConfig(),
-    val chatMotdConfig: ChatMotdConfig = ChatMotdConfig(),
+    val itemPlaceholder: Boolean = true,
     val connectionMessageConfig: ConnectionMessageConfig = ConnectionMessageConfig(),
     val spamConfig: SpamConfig = SpamConfig(),
+    @Setting("autoDisabling")
+    val autoDisablingConfig: AutoDisablingConfig = AutoDisablingConfig(),
+    @Setting("joinMotd")
+    val chatMotdConfig: ChatMotdConfig = ChatMotdConfig(),
 
     val allowedDomains: List<String> = mutableListOf(
         "castcrafter.de",
diff --git a/surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/hook/LuckPermsHook.kt b/surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/hook/LuckPermsHook.kt
@@ -0,0 +1,13 @@
+package dev.slne.surf.chat.bukkit.hook
+
+import net.luckperms.api.LuckPermsProvider
+import org.bukkit.entity.Player
+
+object LuckPermsHook {
+    private val luckPerms by lazy {
+        LuckPermsProvider.get()
+    }
+
+    fun getPrefix(player: Player) =
+        luckPerms.userManager.getUser(player.uniqueId)?.cachedData?.metaData?.prefix ?: ""
+}
diff --git a/surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/listener/ConnectListener.kt b/surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/listener/ConnectListener.kt
@@ -2,6 +2,7 @@ package dev.slne.surf.chat.bukkit.listener
 
 import com.github.shynixn.mccoroutine.folia.launch
 import dev.slne.surf.chat.bukkit.hook.MiniPlaceholdersHook
+import dev.slne.surf.chat.bukkit.message.MessageFormatter
 import dev.slne.surf.chat.bukkit.plugin
 import dev.slne.surf.chat.core.service.userService
 import dev.slne.surf.surfapi.core.api.messages.adventure.sendText
@@ -13,6 +14,8 @@ import org.bukkit.event.player.PlayerJoinEvent
 object ConnectListener : Listener {
     @EventHandler
     fun onJoin(event: PlayerJoinEvent) {
+        MessageFormatter.dirty = true
+
         plugin.launch(Dispatchers.IO) {
             val user = userService.loadUserOrCreateByUuid(event.player.uniqueId, event.player.name)
 
diff --git a/surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/listener/DisconnectListener.kt b/surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/listener/DisconnectListener.kt
@@ -2,6 +2,7 @@ package dev.slne.surf.chat.bukkit.listener
 
 import com.github.shynixn.mccoroutine.folia.launch
 import dev.slne.surf.chat.bukkit.hook.MiniPlaceholdersHook
+import dev.slne.surf.chat.bukkit.message.MessageFormatter
 import dev.slne.surf.chat.bukkit.plugin
 import dev.slne.surf.chat.bukkit.util.user
 import dev.slne.surf.chat.core.service.userService
@@ -12,6 +13,8 @@ import org.bukkit.event.player.PlayerQuitEvent
 class DisconnectListener : Listener {
     @EventHandler
     fun onDisconnect(event: PlayerQuitEvent) {
+        MessageFormatter.dirty = true
+
         val user = event.player.user() ?: return
 
         if (plugin.connectionMessageConfig.enabled) {
diff --git a/surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/message/MessageFormatter.kt b/surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/message/MessageFormatter.kt
@@ -1,3 +1,5 @@
+@file:Suppress("RETURN_IN_FUNCTION_WITH_EXPRESSION_BODY_WARNING")
+
 package dev.slne.surf.chat.bukkit.message
 
 import com.github.benmanes.caffeine.cache.Caffeine
@@ -6,6 +8,7 @@ import dev.slne.surf.chat.api.entity.User
 import dev.slne.surf.chat.api.message.MessageData
 import dev.slne.surf.chat.bukkit.hook.SettingsHook
 import dev.slne.surf.chat.bukkit.permission.PermissionRegistry
+import dev.slne.surf.chat.bukkit.plugin
 import dev.slne.surf.chat.bukkit.util.*
 import dev.slne.surf.surfapi.core.api.messages.Colors
 import dev.slne.surf.surfapi.core.api.messages.adventure.*
@@ -127,6 +130,10 @@ class MessageFormatter {
 
 
     private fun formatItemTag(rawMessage: Component, player: Player): Component {
+        if (!plugin.surfChatConfig.config.itemPlaceholder) {
+            return rawMessage
+        }
+
         var message = rawMessage
         val item = player.inventory.itemInMainHand
 
@@ -158,45 +165,71 @@ class MessageFormatter {
         return message
     }
 
-    private fun highlightPlayers(rawMessage: Component, viewer: User): Component {
-        var message = rawMessage
+    private fun ensureMentionCache() {
+        if (!dirty) return
 
-        val name = viewer.name
-        val pattern = nameRegexCache.get(name)
+        val players = Bukkit.getOnlinePlayers()
+        dirty = false
 
-        if (!pattern.containsMatchIn(message.plain())) {
-            return message
+        if (players.isEmpty()) {
+            cachedRegex = null
+            cachedPlayerMap = emptyMap()
+            return
         }
 
-        message = message.replaceText(
+        cachedPlayerMap = players.associateBy { it.name.lowercase() }
+
+        val pattern = players.joinToString("|") {
+            Regex.escape(it.name)
+        }
+
+        cachedRegex = Regex("\\b@?($pattern)\\b", RegexOption.IGNORE_CASE)
+    }
+
+
+    private fun highlightPlayers(rawMessage: Component, viewer: User): Component {
+        ensureMentionCache()
+
+        val regex = cachedRegex ?: return rawMessage
+        val playerMap = cachedPlayerMap
+
+        val plain = rawMessage.plain()
+        if (!regex.containsMatchIn(plain)) return rawMessage
+
+        var viewerMentioned = false
+
+        val message = rawMessage.replaceText(
             TextReplacementConfig.builder()
-                .match(pattern.pattern)
-                .replacement { matchResult ->
-                    val matchedText = matchResult.content()
-                    val displayName = if (matchedText.startsWith("@")) {
-                        matchedText
-                    } else {
-                        "@$matchedText"
+                .match(regex.toPattern())
+                .replacement { match ->
+                    val raw = match.build().plain()
+                    val clean = raw.removePrefix("@").lowercase()
+                    val player = playerMap[clean] ?: return@replacement match
+
+                    if (player.uniqueId == viewer.uuid) {
+                        viewerMentioned = true
                     }
 
                     buildText {
-                        text(displayName)
+                        text("@${player.name}")
                         color(Colors.VARIABLE_VALUE)
                         decorate(TextDecoration.BOLD)
+                        clickSuggestsCommand("/msg ${player.name} ")
                     }
                 }
                 .build()
         )
 
-        if (SettingsHook.hasChatPingsEnabled(viewer.uuid)) {
+        if (viewerMentioned && SettingsHook.hasChatPingsEnabled(viewer.uuid)) {
             Bukkit.getPlayer(viewer.uuid)?.playSound(true) {
-                type(Sound.BLOCK_NOTE_BLOCK_HARP)
+                type(Sound.ENTITY_CHICKEN_EGG)
             }
         }
 
         return message
     }
 
+
     private fun updateLinks(rawMessage: Component): Component {
         var message = rawMessage
         val text = rawMessage.plain()
@@ -220,4 +253,16 @@ class MessageFormatter {
 
         return message
     }
+
+    companion object {
+        @Volatile
+        var cachedRegex: Regex? = null
+
+        @Volatile
+        var cachedPlayerMap: Map<String, Player> = emptyMap()
+
+        @Volatile
+        var dirty = true
+
+    }
 }
diff --git a/surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/util/components.kt b/surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/util/components.kt
@@ -3,7 +3,7 @@ package dev.slne.surf.chat.bukkit.util
 import com.github.shynixn.mccoroutine.folia.launch
 import dev.slne.surf.chat.api.entity.User
 import dev.slne.surf.chat.api.message.MessageData
-import dev.slne.surf.chat.bukkit.hook.MiniPlaceholdersHook
+import dev.slne.surf.chat.bukkit.hook.LuckPermsHook
 import dev.slne.surf.chat.bukkit.permission.PermissionRegistry
 import dev.slne.surf.chat.bukkit.plugin
 import dev.slne.surf.chat.core.service.historyService
@@ -13,6 +13,7 @@ import dev.slne.surf.surfapi.core.api.messages.adventure.sendText
 import dev.slne.surf.surfapi.core.api.messages.builder.SurfComponentBuilder
 import net.kyori.adventure.text.event.ClickEvent
 import net.kyori.adventure.text.format.TextDecoration
+import net.kyori.adventure.text.minimessage.MiniMessage
 import org.bukkit.Bukkit
 import org.bukkit.entity.Player
 import java.time.Instant
@@ -58,9 +59,7 @@ fun SurfComponentBuilder.appendDelete(messageData: MessageData) = append(buildTe
 })
 
 fun SurfComponentBuilder.appendName(player: Player) = append {
-    append(
-        MiniPlaceholdersHook.parse(player, "<luckperms_prefix><player_name>")
-    )
+    append(MiniMessage.miniMessage().deserialize(LuckPermsHook.getPrefix(player) + player.name))
 }
 
 fun SurfComponentBuilder.appendTeleport(name: String, viewer: User) = append {
diff --git a/surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/util/util.kt b/surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/util/util.kt
