feat(plugin): some utility checks

Author: xeruf

plugin/src/main/kotlin/sc/plugin2023/Board.kt

@@ -86,13 +86,7 @@ class Board(fields: TwoDBoard<Field> = generateFields()): RectangularBoard<Field
     fun getOrEmpty(key: Coordinates?) = key?.let { getOrNull(it) } ?: Field()
 
     override val entries: Set<Map.Entry<Coordinates, Field>>
-        get() = filterFields { field, coordinates ->
-            // TODO really? an anonymous object?
-            object: Map.Entry<Coordinates, Field> {
-                override val key = coordinates
-                override val value = field
-            }
-        }.toSet()
+        get() = filterFields { field, coordinates -> FieldPosition(coordinates, field) }.toSet()
 
     override fun clone(): Board = Board(this)
 

plugin/src/main/kotlin/sc/plugin2023/GameState.kt

@@ -57,14 +57,17 @@ data class GameState @JvmOverloads constructor(
     val currentPieces
         get() = board.filterValues { it.penguin == currentTeam }
 
-    override fun getPossibleMoves(): List<Move> {
-        val pieces = currentPieces
-        return if(pieces.size < PluginConstants.PENGUINS) {
-            board.filterValues { it.fish == 1 }.map { Move(null, it.key) }
-        } else {
-            pieces.flatMap { (pos, _) -> board.possibleMovesFrom(pos) }
-        }
-    }
+    val penguinsPlaced
+        get() = currentPieces.size == PluginConstants.PENGUINS
+    
+    override fun getPossibleMoves(): List<Move> =
+            if(penguinsPlaced) {
+                currentPieces.flatMap { (pos, _) -> board.possibleMovesFrom(pos) }
+            } else {
+                board.filterValues { it.fish == 1 }.map { Move(null, it.key) }
+            }
+    
+    fun canPlacePenguin(pos: Coordinates) = !penguinsPlaced && board[pos].fish == 1
 
     fun immovable(team: Team? = null) =
             board.getPenguins()

sdk/src/main/server-api/sc/api/plugins/Coordinates.kt

@@ -15,24 +15,22 @@ data class Coordinates(
     override fun toString(): String = "[$x|$y]"
 
     /** Addiere den [Vector] auf die [Coordinates] auf. */
-    operator fun plus(vector: Vector): Coordinates {
-        return Coordinates(x + vector.dx, y + vector.dy)
-    }
+    operator fun plus(vector: Vector): Coordinates =
+            Coordinates(x + vector.dx, y + vector.dy)
     /** Berechne die Distanz zweier Koordinaten, als [Vector] */
-    operator fun minus(other: Coordinates): Vector {
-        return Vector(x - other.x, y - other.y)
-    }
+    operator fun minus(other: Coordinates): Vector =
+            Vector(x - other.x, y - other.y)
     /** Ziehe die Distanz (als [Vector]) von der Koordinate ab. */
-    operator fun minus(other: Vector): Coordinates {
-        return Coordinates(x - other.dx, y - other.dy)
-    }
+    operator fun minus(other: Vector): Coordinates =
+            Coordinates(x - other.dx, y - other.dy)
     /** Wandelt die [Coordinates] in einen entsprechenden [Vector]. */
     operator fun unaryPlus(): Vector = Vector(x, y)
 
     /** Gibt ein Set der vier benachbarten Felder dieser Koordinaten zurück. */
     val neighbors: Collection<Coordinates>
         get() = Vector.cardinals.map { this + it }
 
+    // TODO separate interfaces Positioned and HexPositioned?
     val hexNeighbors: Collection<Coordinates>
         get() = Vector.DoubledHex.directions.map { this + it }
 

sdk/src/main/server-api/sc/api/plugins/RectangularBoard.kt

@@ -1,8 +1,6 @@
 package sc.api.plugins
 
-import com.thoughtworks.xstream.annotations.XStreamConverter
 import com.thoughtworks.xstream.annotations.XStreamImplicit
-import com.thoughtworks.xstream.converters.collections.CollectionConverter
 import sc.framework.PublicCloneable
 
 typealias TwoDBoard<FIELD> = List<MutableList<FIELD>>
@@ -72,14 +70,15 @@ open class RectangularBoard<FIELD: IField<FIELD>>(
     override val entries: Set<Map.Entry<Coordinates, FIELD>>
         get() = gameField.flatMapIndexed { y, row ->
             row.mapIndexed { x, field ->
-                // TODO really? an anonymous object?
-                object: Map.Entry<Coordinates, FIELD> {
-                    override val key = Coordinates(x, y)
-                    override val value = field
-                }
+                FieldPosition(Coordinates(x, y), field)
             }
         }.toSet()
 
+    inner class FieldPosition(
+            override val key: Coordinates,
+            override val value: FIELD
+    ): Map.Entry<Coordinates, FIELD>
+    
     override val size: Int
         get() = gameField.sumOf { it.size }
 

server/src/test/java/sc/server/network/ClientXmlReadTest.java

@@ -48,6 +48,7 @@ public void clientSendPacketTest() throws IOException {
 
     client.start();
     client.send(new ExamplePacket());
+    stringInterface.close();
     String data = stringInterface.readData();
     assertEquals("<protocol>\n  <example/>", data);
   }