Removed the Server Cache, because it was useless

byPixelTV · Jul 21, 2024 · f88ab9e · f88ab9e
1 parent 3c3215c
commit f88ab9e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 54 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/src/main/kotlin/de/bypixeltv/redivelocity/RediVelocity.kt b/src/main/kotlin/de/bypixeltv/redivelocity/RediVelocity.kt
@@ -25,7 +25,6 @@ class RediVelocity @Inject constructor(val proxy: ProxyServer, private val metri
     }
 
     private var redisController: RedisController? = null
-    private var serverCacheScheduler: ServerCacheScheduler? = null
     private val configLoader: ConfigLoader = ConfigLoader("plugins/redivelocity/config.yml").apply { load() }
     private val miniMessages = MiniMessage.miniMessage()
 
@@ -94,9 +93,6 @@ class RediVelocity @Inject constructor(val proxy: ProxyServer, private val metri
 
         // Register commands
         RediVelocityCommand(this, proxy, redisController!!, config)
-
-        // Load ServerCacheScheduler
-        serverCacheScheduler = ServerCacheScheduler(this, redisController!!, proxyId)
     }
 
     @Suppress("UNUSED")

diff --git a/src/main/kotlin/de/bypixeltv/redivelocity/ServerCacheScheduler.kt b/src/main/kotlin/de/bypixeltv/redivelocity/ServerCacheScheduler.kt
diff --git a/src/main/kotlin/de/bypixeltv/redivelocity/commands/RediVelocityCommand.kt b/src/main/kotlin/de/bypixeltv/redivelocity/commands/RediVelocityCommand.kt
@@ -230,32 +230,29 @@ class RediVelocityCommand(private val rediVelocity: RediVelocity, private val pr
                             }
                         }),
                     CommandAPICommand("servers")
-                        .withSubcommands(
-                            CommandAPICommand("registered")
-                                .withPermission("redivelocity.admin.proxy.servers.registered")
-                                .executes(CommandExecutor { sender, _ ->
-                                    GlobalScope.launch {
-                                        val proxyRegisteredServers = proxy.allServers
-                                        val futures = proxyRegisteredServers.map { server ->
-                                            async {
-                                                try {
-                                                    val result = server.ping().get()
-                                                    "$prefix <color:#0dbf00>●</color> <aqua>${server.serverInfo.name}</aqua> <dark_gray>(<grey>Address: <aqua>${server.serverInfo.address}</aqua>, Playercount: <aqua>${server.playersConnected.size}</aqua>, Version: <aqua>${result.version.protocol}, ${result.version.name}</aqua></grey>)</dark_gray>"
-                                                } catch (e: Exception) {
-                                                    "$prefix <color:#f00000>●</color> <aqua>${server.serverInfo.name}</aqua> <dark_gray>(<grey>Address: <aqua>${server.serverInfo.address}</aqua></grey>)</dark_gray>"
-                                                }
-                                            }
-                                        }
-                                        val proxyRegisteredServersPrettyNames = futures.awaitAll()
-                                        val proxyRegisteredServersPrettyString = proxyRegisteredServersPrettyNames.joinToString(separator = "<br>")
-                                        if (proxyRegisteredServers.isNotEmpty()) {
-                                            sender.sendMessage(miniMessage.deserialize("$prefix <gray>Currently registered servers:<br>$proxyRegisteredServersPrettyString</gray>"))
-                                        } else {
-                                            sender.sendMessage(miniMessage.deserialize("$prefix <gray>There are currently no registered servers.</gray>"))
+                        .withPermission("redivelocity.admin.proxy.servers")
+                        .executes(CommandExecutor { sender, _ ->
+                            GlobalScope.launch {
+                                val proxyRegisteredServers = proxy.allServers
+                                val futures = proxyRegisteredServers.map { server ->
+                                    async {
+                                        try {
+                                            val result = server.ping().get()
+                                            "$prefix <color:#0dbf00>●</color> <aqua>${server.serverInfo.name}</aqua> <dark_gray>(<grey>Address: <aqua>${server.serverInfo.address}</aqua>, Playercount: <aqua>${server.playersConnected.size}</aqua>, Version: <aqua>${result.version.protocol}, ${result.version.name}</aqua></grey>)</dark_gray>"
+                                        } catch (e: Exception) {
+                                            "$prefix <color:#f00000>●</color> <aqua>${server.serverInfo.name}</aqua> <dark_gray>(<grey>Address: <aqua>${server.serverInfo.address}</aqua></grey>)</dark_gray>"
                                         }
                                     }
-                                })
-                        )
+                                }
+                                val proxyRegisteredServersPrettyNames = futures.awaitAll()
+                                val proxyRegisteredServersPrettyString = proxyRegisteredServersPrettyNames.joinToString(separator = "<br>")
+                                if (proxyRegisteredServers.isNotEmpty()) {
+                                    sender.sendMessage(miniMessage.deserialize("$prefix <gray>Currently registered servers:<br>$proxyRegisteredServersPrettyString</gray>"))
+                                } else {
+                                    sender.sendMessage(miniMessage.deserialize("$prefix <gray>There are currently no registered servers.</gray>"))
+                                }
+                            }
+                        })
                 ),
             CommandAPICommand("blacklist")
                 .withSubcommands(