feat: enable non-reserved slots in prepared games

- remove client roles
- revamp game preparation
- centralize responsibility for players in PlayerSlot

Author: xeruf

sdk/src/server-api/sc/api/plugins/host/IPlayerListener.java

@@ -3,5 +3,5 @@
 import sc.protocol.room.RoomMessage;
 
 public interface IPlayerListener {
-  void onPlayerEvent(RoomMessage request);
+  void onPlayerEvent(RoomMessage message);
 }

sdk/src/server-api/sc/framework/HelperMethods.java

@@ -0,0 +1,30 @@
+package sc.framework
+
+import java.text.DateFormat
+import java.text.SimpleDateFormat
+import java.util.Date
+
+object HelperMethods {
+    private val dateTimeFormat: DateFormat = SimpleDateFormat("yyyy-MM-dd_HH-mm-ss")
+    /**
+     * Returns the current date and time as string formatted as yyyy.MM.dd
+     * HH_mm_ss.
+     *
+     * @return current date and time
+     */
+    private val currentDateTime: String
+        get() = dateTimeFormat.format(Date())
+    
+    /**
+     * Returns a new generated filename for a replay file.
+     *
+     * @param gameId  UUID of the plugin
+     * @param names descriptor of player slot
+     *
+     * @return name of replay
+     */
+    @JvmStatic
+    fun getReplayFilename(gameId: String, names: List<String>): String =
+            "./replays/replay_${gameId}_${currentDateTime}_" +
+            "${names.joinToString("_") { it.replace(' ', '_') }}.xml"
+}

sdk/src/server-api/sc/framework/HelperMethods.kt

@@ -26,7 +26,6 @@ abstract class AbstractGame<P : Player>(override val pluginUUID: String) : IGame
     var isPaused = false
 
     fun afterPause() {
-        logger.info("Sending MoveRequest to player $activePlayer")
         notifyOnNewState(currentState, false)
         notifyActivePlayer()
     }
@@ -161,7 +160,8 @@ abstract class AbstractGame<P : Player>(override val pluginUUID: String) : IGame
             player.hardTimeout = true
             onPlayerLeft(player, ScoreCause.HARD_TIMEOUT)
         }
-
+    
+        logger.info("Sending MoveRequest to player $activePlayer")
         player.requestMove()
     }
 

sdk/src/server-api/sc/framework/plugins/AbstractGame.kt

@@ -1,12 +1,9 @@
-package sc.server.network;
+package sc.networking.clients;
 
 import sc.protocol.ProtocolPacket;
 
 /** Client interface to send packages to the server. */
 public interface IClient {
-  /** Add role to the client. */
-  void addRole(IClientRole role);
-
   /** Send a package. */
   void send(ProtocolPacket packet);
 }

server/src/sc/server/network/IClient.java renamed to sdk/src/server-api/sc/networking/clients/IClient.java

@@ -20,7 +20,7 @@
 import java.net.SocketException;
 import java.nio.charset.StandardCharsets;
 
-public abstract class XStreamClient {
+public abstract class XStreamClient implements IClient {
   private static Logger logger = LoggerFactory.getLogger(XStreamClient.class);
 
   public static INetworkInterface createTcpNetwork(String host, int port) throws IOException {
@@ -103,7 +103,7 @@ public void receiveThread() {
         if (object instanceof ProtocolPacket) {
           ProtocolPacket response = (ProtocolPacket) object;
 
-          logger.debug("{}: Received {} via {}", shortString(), response, networkInterface);
+          logger.debug("Received {} via {}", response, networkInterface);
           if (logger.isTraceEnabled())
             logger.trace("Dumping {}:\n{}", response, xStream.toXML(response));
 
@@ -154,12 +154,12 @@ public void receiveThread() {
   }
 
   public void sendCustomData(String data) throws IOException {
-    logger.debug("{}: Sending custom data: {}", shortString(), data);
+    logger.debug("Sending custom data: {}", data);
     sendCustomData(data.getBytes(StandardCharsets.UTF_8));
   }
 
   public void sendCustomData(byte[] data) throws IOException {
-    logger.info("{}: Sending custom data (size={})", shortString(), data.length);
+    logger.info("Sending custom data (size={})", data.length);
     networkInterface.getOutputStream().write(data);
     networkInterface.getOutputStream().flush();
   }
@@ -171,7 +171,7 @@ public void send(ProtocolPacket packet) {
   protected synchronized void sendObject(Object packet) {
     if (!isReady())
       throw new IllegalStateException(
-          String.format("Trying to write packet on %s which wasn't started: %s", shortString(), packet));
+          String.format("Trying to write packet %s on non-started client {}", packet, this));
 
     if (isClosed()) {
       logger.warn("Writing on a closed Stream -> dropped the packet (tried to send package of type {}) Thread: {}",
@@ -180,7 +180,7 @@ protected synchronized void sendObject(Object packet) {
       return;
     }
 
-    logger.debug("{}: Sending {} via {} from {}", shortString(), packet, networkInterface, this);
+    logger.debug("Sending {} via {} from {}", packet, networkInterface, this);
     if (logger.isTraceEnabled())
       logger.trace("Dumping {}:\n{}", packet, xStream.toXML(packet));
 
@@ -200,11 +200,11 @@ protected final void handleDisconnect(DisconnectCause cause) {
 
   protected final void handleDisconnect(DisconnectCause cause, Throwable exception) {
     if (exception != null) {
-      logger.warn("{} disconnected (Cause: {}, Exception: {})", shortString(), cause, exception);
+      logger.warn("{} disconnected (Cause: {}, Exception: {})", this, cause, exception);
       if (logger.isDebugEnabled())
         exception.printStackTrace();
     } else {
-      logger.info("{} disconnected (Cause: {})", shortString(), cause);
+      logger.info("{} disconnected (Cause: {})", this, cause);
     }
 
     this.disconnectCause = cause;