refactor(client): update LobbyClientListener interface

Author: xeruf

plugin/src/client/sc/plugin2021/AbstractClient.kt

@@ -2,8 +2,8 @@ package sc.plugin2021
 
 import org.slf4j.LoggerFactory
 import sc.api.plugins.IGameState
-import sc.framework.plugins.Player
 import sc.framework.plugins.protocol.MoveRequest
+import sc.networking.clients.AbstractLobbyClientListener
 import sc.networking.clients.IControllableGame
 import sc.networking.clients.ILobbyClientListener
 import sc.networking.clients.LobbyClient
@@ -22,7 +22,7 @@ import kotlin.system.exitProcess
 abstract class AbstractClient(
         host: String,
         port: Int
-): ILobbyClientListener {
+): AbstractLobbyClientListener() {
     companion object {
         private val logger = LoggerFactory.getLogger(AbstractClient::class.java)
     }
@@ -105,11 +105,6 @@ abstract class AbstractClient(
         client.joinRoomRequest(GamePlugin.PLUGIN_UUID)
     }
 
-    override fun onGameJoined(roomId: String) {}
-    override fun onGamePrepared(response: GamePreparedResponse) {}
-    override fun onGamePaused(roomId: String, nextPlayer: Player) {}
-    override fun onGameObserved(roomId: String) {}
-    
     override fun onGameLeft(roomId: String) {
         logger.info("$this: Got game left in room $roomId")
         client.stop()

sdk/src/server-api/sc/networking/clients/AbstractLobbyClientListener.kt

@@ -9,12 +9,13 @@ import sc.shared.GameResult
 
 abstract class AbstractLobbyClientListener: ILobbyClientListener {
     override fun onNewState(roomId: String, state: IGameState) {}
+    override fun onGameOver(roomId: String, data: GameResult) {}
+    override fun onGamePaused(roomId: String, nextPlayer: Player) {}
     override fun onRoomMessage(roomId: String, data: ProtocolMessage) {}
     override fun onError(roomId: String?, error: ProtocolErrorMessage) {}
+    
     override fun onGamePrepared(response: GamePreparedResponse) {}
     override fun onGameLeft(roomId: String) {}
     override fun onGameJoined(roomId: String) {}
-    override fun onGameOver(roomId: String, data: GameResult) {}
-    override fun onGamePaused(roomId: String, nextPlayer: Player) {}
     override fun onGameObserved(roomId: String) {}
 }

sdk/src/server-api/sc/networking/clients/ILobbyClientListener.kt

@@ -11,12 +11,13 @@ import sc.shared.GameResult
 /** Receives updates within a GameRoom on the client-side. */
 interface ILobbyClientListener {
     fun onNewState(roomId: String, state: IGameState)
+    fun onGameOver(roomId: String, data: GameResult)
+    fun onGamePaused(roomId: String, nextPlayer: Player)
     fun onRoomMessage(roomId: String, data: ProtocolMessage)
     fun onError(roomId: String?, error: ProtocolErrorMessage)
+    
     fun onGamePrepared(response: GamePreparedResponse)
     fun onGameLeft(roomId: String)
     fun onGameJoined(roomId: String)
-    fun onGameOver(roomId: String, data: GameResult)
-    fun onGamePaused(roomId: String, nextPlayer: Player)
     fun onGameObserved(roomId: String)
 }