feat(player): implement joining by roomid

Author: xeruf

player/src/main/sc/player2021/Starter.java

@@ -17,7 +17,7 @@
 public class Starter extends AbstractClient {
   private static final Logger logger = LoggerFactory.getLogger(Starter.class);
 
-  public Starter(String host, int port, String reservation) {
+  public Starter(String host, int port, String reservation, String roomId) {
     // client starten
     super(host, port);
 
@@ -26,10 +26,12 @@ public Starter(String host, int port, String reservation) {
     setHandler(logic);
 
     // einem Spiel beitreten
-    if (reservation == null || reservation.isEmpty()) {
-      joinAnyGame();
-    } else {
+    if (reservation != null) {
       joinPreparedGame(reservation);
+    } else if (roomId != null) {
+      joinGameRoom(roomId);
+    } else {
+      joinAnyGame();
     }
   }
 
@@ -41,6 +43,7 @@ public static void main(String[] args) {
     CmdLineParser.Option hostOption = parser.addStringOption('h', "host");
     CmdLineParser.Option portOption = parser.addIntegerOption('p', "port");
     CmdLineParser.Option reservationOption = parser.addStringOption('r', "reservation");
+    CmdLineParser.Option roomOption = parser.addStringOption("room");
 
     try {
       // parameter auslesen
@@ -54,11 +57,12 @@ public static void main(String[] args) {
     // parameter laden
     String host = (String) parser.getOptionValue(hostOption, "localhost");
     int port = (Integer) parser.getOptionValue(portOption, SharedConfiguration.DEFAULT_PORT);
-    String reservation = (String) parser.getOptionValue(reservationOption, "");
+    String reservation = (String) parser.getOptionValue(reservationOption);
+    String room = (String) parser.getOptionValue(roomOption);
 
     // einen neuen client erzeugen
     try {
-      new Starter(host, port, reservation);
+      new Starter(host, port, reservation, room);
     } catch (Exception e) {
       logger.error("Beim Starten den Clients ist ein Fehler aufgetreten:", e);
       e.printStackTrace();
@@ -69,11 +73,12 @@ public static void main(String[] args) {
   private static void showHelp(String errorMsg) {
     String jarName = new File(Starter.class.getProtectionDomain().getCodeSource().getLocation().getFile()).getName();
     System.out.println("\n" + errorMsg);
-    System.out.println("\nBitte das Programm mit folgenden Parametern (optional) aufrufen: \n"
+    System.out.println("\nFolgende Parameter sind erlaubt: \n"
             + "java -jar " + jarName + " [{-h,--host} hostname]\n"
             + "                               [{-p,--port} port]\n"
-            + "                               [{-r,--reservation} reservierung]");
-    System.out.println("\nBeispiel: \n"
+            + "                               [{-r,--reservation} reservierung]\n"
+            + "                               [--room raumnummer]\n");
+    System.out.println("Beispiel: \n"
             + "java -jar " + jarName + " --host 127.0.0.1 --port 10500 --reservation 1234\n");
   }
 

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

@@ -97,6 +97,16 @@ abstract class AbstractClient(
         client.joinGame(GamePlugin.PLUGIN_ID)
     }
 
+    fun joinPreparedGame(reservation: String) {
+        start()
+        client.joinGameWithReservation(reservation)
+    }
+    
+    fun joinGameRoom(roomId: String) {
+        start()
+        client.joinGameRoom(roomId)
+    }
+    
     override fun onGameLeft(roomId: String) {
         logger.info("$this: Got game left in room $roomId")
         client.stop()
@@ -107,9 +117,4 @@ abstract class AbstractClient(
         isGameOver = true
         handler?.gameEnded(data, team, error)
     }
-    
-    fun joinPreparedGame(reservation: String) {
-        start()
-        client.joinGameWithReservation(reservation)
-    }
 }