Merge pull request #99 from SLNE-Development/feat/surf-core

refactor: update dependencies, improve player lookup logic, and simpl…

Author: twisti-dev

.idea/kotlinc.xml

@@ -4,11 +4,11 @@ buildscript {
         maven("https://repo.slne.dev/repository/maven-public/") { name = "maven-public" }
     }
     dependencies {
-        classpath("dev.slne.surf:surf-api-gradle-plugin:1.21.10+")
+        classpath("dev.slne.surf:surf-api-gradle-plugin:1.21.11+")
     }
 }
 
 allprojects {
     group = "dev.slne.surf.chat"
-    version = findProperty("version")!!
+    version = findProperty("version") as String
 }

build.gradle.kts

@@ -1,4 +1,4 @@
 kotlin.code.style=official
 kotlin.stdlib.default.dependency=false
 org.gradle.parallel=true
-version=1.21.10-4.0.5-SNAPSHOT
+version=1.21.10-4.0.6-SNAPSHOT

gradle.properties

@@ -5,7 +5,6 @@ import dev.slne.surf.chat.api.entity.User
 import dev.slne.surf.chat.api.entry.HistoryEntry
 import dev.slne.surf.chat.api.entry.HistoryFilter
 import dev.slne.surf.chat.api.message.MessageType
-import dev.slne.surf.chat.api.server.ChatServer
 import dev.slne.surf.surfapi.core.api.util.requiredService
 import it.unimi.dsi.fastutil.objects.ObjectSet
 import net.kyori.adventure.chat.SignedMessage
@@ -35,7 +34,7 @@ interface SurfChatApi {
         sender: User,
         receiver: User? = null,
         sentAt: Long = System.currentTimeMillis(),
-        server: ChatServer = ChatServer.default(),
+        server: String = "unspecified",
         channel: Channel? = null,
         signedMessage: SignedMessage? = null,
         messageUuid: UUID = UUID.randomUUID()

surf-chat-api/src/main/kotlin/dev/slne/surf/chat/api/SurfChatApi.kt

@@ -1,7 +1,6 @@
 package dev.slne.surf.chat.api.entry
 
 import dev.slne.surf.chat.api.message.MessageType
-import dev.slne.surf.chat.api.server.ChatServer
 import java.util.*
 
 /**
@@ -26,7 +25,7 @@ data class HistoryFilter(
     val messageType: MessageType?,
     val range: Long?,
     val messageLike: String?,
-    val server: ChatServer?,
+    val server: String?,
     val channel: String?,
     val deletedBy: String?,
     val type: MessageType?,

surf-chat-api/src/main/kotlin/dev/slne/surf/chat/api/entry/HistoryFilter.kt

@@ -3,7 +3,6 @@ package dev.slne.surf.chat.api.message
 import dev.slne.surf.chat.api.channel.Channel
 import dev.slne.surf.chat.api.entity.User
 import dev.slne.surf.chat.api.serializer.SerializableSignature
-import dev.slne.surf.chat.api.server.ChatServer
 import dev.slne.surf.surfapi.core.api.messages.adventure.plain
 import dev.slne.surf.surfapi.core.api.serializer.adventure.component.SerializableComponent
 import kotlinx.serialization.Contextual
@@ -73,7 +72,7 @@ data class MessageData(
      * The `server` property is particularly useful when messages or communication need to be
      * associated with specific servers in a multi-server environment.
      */
-    val server: ChatServer,
+    val server: String,
 
     /**
      * Represents the associated chat channel for a message.

surf-chat-api/src/main/kotlin/dev/slne/surf/chat/api/message/MessageData.kt

@@ -31,6 +31,8 @@ surfPaperPluginApi {
     foliaSupported(true)
     generateLibraryLoader(false)
 
+    withCorePaper()
+
     serverDependencies {
         registerSoft("MiniPlaceholders")
     }

surf-chat-api/src/main/kotlin/dev/slne/surf/chat/api/server/ChatGroup.kt

@@ -3,21 +3,13 @@ package dev.slne.surf.chat.bukkit
 import dev.slne.surf.chat.bukkit.listener.AsyncChatListener
 import dev.slne.surf.chat.bukkit.listener.ConnectListener
 import dev.slne.surf.chat.bukkit.listener.DisconnectListener
-import dev.slne.surf.chat.bukkit.listener.ServerResponseListener
 import dev.slne.surf.surfapi.bukkit.api.event.register
-import org.bukkit.Bukkit
 
 object BukkitListenerManager {
     fun registerBukkitListeners() {
         AsyncChatListener().register()
         DisconnectListener().register()
         ConnectListener().register()
-
-        Bukkit.getMessenger().registerOutgoingPluginChannel(plugin, "surf-chat:server_request")
-        Bukkit.getMessenger().registerIncomingPluginChannel(
-            plugin, "surf-chat:server_response",
-            ServerResponseListener()
-        );
     }
 
     fun registerPacketListeners() {