refactor: remove unused TabEntryRemoveRedisEvent, clean up tablist service and listener logic, and improve Redis event handling

Author: TheBjoRedCraft

surf-tab-velocity/src/main/kotlin/dev/slne/surf/tab/velocity/config/TablistConfig.kt

@@ -5,6 +5,5 @@ import org.spongepowered.configurate.objectmapping.ConfigSerializable
 @ConfigSerializable
 data class TablistConfig(
     val header: String = "<br><#6EA6D9>                        CASTCRAFTER                        <br><#6EA6D9>COMMUNITY SERVER<br><br><#59CCF2><date><gray> - <#59CCF2><time> <gray><> <#59CCF2><players_online><gray> / <#59CCF2><players_max><br><br>",
-    val footer: String = "<br><#59CCF2>Du befindest dich auf <#f9c353><server><br><#6EA6D9>ᴄᴀѕᴛᴄʀᴀꜰᴛᴇʀ.ᴅᴇ<br>",
-    val nameFormat: String = "<luckperms_prefix><player_name><luckperms_suffix>",
+    val footer: String = "<br><#59CCF2>Du befindest dich auf <#f9c353><server><br><#6EA6D9>ᴄᴀѕᴛᴄʀᴀꜰᴛᴇʀ.ᴅᴇ<br>"
 )

surf-tab-velocity/src/main/kotlin/dev/slne/surf/tab/velocity/listener/ConnectionListener.kt

@@ -8,18 +8,13 @@ import com.velocitypowered.api.event.player.ServerPostConnectEvent
 import com.velocitypowered.api.proxy.Player
 import dev.slne.surf.tab.velocity.plugin
 import dev.slne.surf.tab.velocity.redis.event.TabEntryAddRedisEvent
-import dev.slne.surf.tab.velocity.redis.event.TabEntryRemoveRedisEvent
 import dev.slne.surf.tab.velocity.redisApi
 import dev.slne.surf.tab.velocity.service.tablistService
 import java.util.concurrent.TimeUnit
 
 class ConnectionListener {
     @Subscribe
     fun onPostConnect(event: ServerPostConnectEvent) {
-        event.previousServer?.let {
-            redisApi.publishEvent(TabEntryRemoveRedisEvent(event.player.uniqueId))
-        }
-
         plugin.proxy.scheduler.buildTask(plugin, Runnable {
             handleJoin(event.player)
         }).delay(750, TimeUnit.MILLISECONDS).schedule()
@@ -43,21 +38,11 @@ class ConnectionListener {
     fun onDisconnect(event: DisconnectEvent) {
         val player = event.player
 
-        redisApi.publishEvent(
-            TabEntryRemoveRedisEvent(
-                player.uniqueId
-            )
-        )
+
     }
 
     @Subscribe
     fun onKick(event: KickedFromServerEvent) {
         val player = event.player
-
-        redisApi.publishEvent(
-            TabEntryRemoveRedisEvent(
-                player.uniqueId
-            )
-        )
     }
 }

surf-tab-velocity/src/main/kotlin/dev/slne/surf/tab/velocity/redis/TabRedisEventListener.kt

@@ -1,32 +1,46 @@
 package dev.slne.surf.tab.velocity.redis
 
 import com.github.shynixn.mccoroutine.velocity.launch
+import com.velocitypowered.api.proxy.player.TabListEntry
 import dev.slne.surf.redis.event.OnRedisEvent
+import dev.slne.surf.surfapi.core.api.util.mutableObject2ObjectMapOf
 import dev.slne.surf.tab.api.redis.TabHideRedisEvent
 import dev.slne.surf.tab.api.redis.TabShowRedisEvent
 import dev.slne.surf.tab.velocity.plugin
 import dev.slne.surf.tab.velocity.redis.event.TabEntryAddRedisEvent
 import dev.slne.surf.tab.velocity.redis.event.TabEntryRemoveRedisEvent
 import dev.slne.surf.tab.velocity.redis.event.TabEntryUpdateRedisEvent
 import dev.slne.surf.tab.velocity.service.tablistService
-import dev.slne.surf.tab.velocity.util.toVelocity
+import java.util.*
 import kotlin.jvm.optionals.getOrNull
 
 object TabRedisEventListener {
+    private val hiddenEntries = mutableObject2ObjectMapOf<UUID, List<TabListEntry>>()
+
     @OnRedisEvent
     fun onTabHide(event: TabHideRedisEvent) {
         val player = plugin.proxy.getPlayer(event.player).getOrNull() ?: return
+
+        if (!player.tabList.containsEntry(event.toHide)) {
+            return
+        }
+
+        val entry = player.tabList.getEntry(event.toHide).getOrNull() ?: return
+        hiddenEntries[event.player] = (hiddenEntries[event.player] ?: mutableListOf()) + entry
+
         player.tabList.removeEntry(event.toHide)
     }
 
     @OnRedisEvent
     fun onTabShow(event: TabShowRedisEvent) {
         val player = plugin.proxy.getPlayer(event.player).getOrNull() ?: return
-        val server = player.currentServer.getOrNull()?.server ?: return
-        val entry =
-            tablistService.entries[server]?.find { it.profile.uuid == event.toShow } ?: return
+        val entry = hiddenEntries[event.player]?.find { it.profile.id == event.toShow } ?: return
+
+        hiddenEntries[event.player] =
+            hiddenEntries[event.player]?.filterNot { it.profile.id == event.toShow }
+                ?: mutableListOf()
 
-        player.tabList.addEntry(entry.toVelocity(player.tabList))// TODO: Not working with multiproxy support
+        player.tabList.addEntry(entry)
     }
 
     @OnRedisEvent

surf-tab-velocity/src/main/kotlin/dev/slne/surf/tab/velocity/service/TablistService.kt

@@ -1,10 +1,7 @@
 package dev.slne.surf.tab.velocity.service
 
 import com.velocitypowered.api.proxy.Player
-import com.velocitypowered.api.proxy.server.RegisteredServer
 import dev.slne.clan.api.surfClanApi
-import dev.slne.surf.surfapi.core.api.util.mutableObject2ObjectMapOf
-import dev.slne.surf.tab.api.entry.TabEntry
 import dev.slne.surf.tab.velocity.hook.LuckPermsHook
 import dev.slne.surf.tab.velocity.plugin
 import dev.slne.surf.tab.velocity.tablistConfig
@@ -16,8 +13,6 @@ import kotlin.jvm.optionals.getOrNull
 val tablistService = VelocityTablistService()
 
 class VelocityTablistService {
-    val entries = mutableObject2ObjectMapOf<RegisteredServer, List<TabEntry>>()
-
     fun sendAdditions(player: Player) {
         player.sendPlayerListHeaderAndFooter(
             tablistConfig.header.formatWithAdventure(player),