feat: revamp cloning abstraction for more flexibility

Author: xeruf

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

@@ -3,6 +3,7 @@ package sc.plugin2023
 import com.thoughtworks.xstream.annotations.XStreamAlias
 import sc.api.plugins.*
 import sc.api.plugins.Coordinates
+import sc.framework.deepCopy
 import kotlin.random.Random
 import sc.plugin2023.util.PenguinConstants as Constants
 
@@ -13,7 +14,8 @@ import sc.plugin2023.util.PenguinConstants as Constants
  * @author soed
  */
 @XStreamAlias(value = "board")
-class Board(override val gameField: MutableTwoDBoard<Field> = generateFields()): RectangularBoard<Field>(gameField) {
+class Board(override val gameField: MutableTwoDBoard<Field> = generateFields()):
+    RectangularBoard<Field>(gameField), IBoard {
 
     constructor(board: Board): this(board.gameField.deepCopy())
 
@@ -62,7 +64,7 @@ class Board(override val gameField: MutableTwoDBoard<Field> = generateFields()):
 
     fun getOrEmpty(key: Coordinates?) = key?.let { getOrNull(it) } ?: Field()
 
-    override val entries: Set<Map.Entry<Coordinates, Field>>
+    override val entries: Set<Positioned<Field>>
         get() = filterFields { f, coordinates -> Positioned(coordinates, f) }.toSet()
 
     override fun clone(): Board = Board(this)
@@ -91,7 +93,7 @@ class Board(override val gameField: MutableTwoDBoard<Field> = generateFields()):
                 }
             }.let {
                 it + it.reversedArray().map { list ->
-                    Array(Constants.BOARD_SIZE) { index -> list[Constants.BOARD_SIZE - index - 1].clone() }
+                    Array(Constants.BOARD_SIZE) { index -> list[Constants.BOARD_SIZE - index - 1].deepCopy() }
                 }
             }
         }

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

@@ -15,7 +15,7 @@ data class Field(val fish: Int = 0, val penguin: Team? = null) : IField<Field>,
     val isOccupied: Boolean
         get() = penguin != null
 
-    override fun clone(): Field = Field(fish, penguin)
+    override fun clone(): Field = copy()
 
     override fun toString(): String = penguin?.letter?.toString() ?: fish.toString()
 }

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

@@ -4,8 +4,8 @@ import com.thoughtworks.xstream.annotations.*
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import sc.api.plugins.*
+import sc.framework.clone
 import sc.plugin2024.util.BoardConverter
-import kotlin.math.abs
 import kotlin.reflect.KClass
 
 /**

plugin2026/src/main/kotlin/sc/plugin2026/Board.kt

@@ -7,7 +7,7 @@ import sc.api.plugins.ITeam
 import sc.api.plugins.MutableTwoDBoard
 import sc.api.plugins.RectangularBoard
 import sc.api.plugins.Team
-import sc.api.plugins.deepCopy
+import sc.framework.deepCopy
 import sc.plugin2026.util.*
 import kotlin.random.Random
 

plugin2026/src/main/kotlin/sc/plugin2026/FieldState.kt

@@ -2,8 +2,9 @@ package sc.plugin2026
 
 import sc.api.plugins.IField
 import sc.api.plugins.Team
+import sc.framework.DeepCloneable
 
-enum class FieldState(val size: Int): IField<FieldState> {
+enum class FieldState(val size: Int): IField<FieldState>, DeepCloneable<FieldState> {
     ONE_S(1),
     ONE_M(2),
     ONE_L(3),
@@ -13,7 +14,7 @@ enum class FieldState(val size: Int): IField<FieldState> {
     OBSTRUCTED(0),
     EMPTY(0);
 
-    override fun copy(): FieldState = this
+    override fun deepCopy(): FieldState = this
 
     override val isEmpty: Boolean
         get() = this == EMPTY

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

@@ -2,8 +2,4 @@ package sc.api.plugins
 
 interface IField<FIELD: IField<FIELD>> {
     val isEmpty: Boolean
-    fun copy(): FIELD
 }
-
-inline fun <reified T: IField<T>> Array<Array<T>>.deepCopy(): Array<Array<T>> =
-    Array(size) { row -> Array(this[row].size) { column -> this[row][column].copy() } }

sdk/src/main/server-api/sc/framework/PublicCloneable.kt

@@ -2,16 +2,22 @@ package sc.framework
 
 import java.io.Serializable
 
-interface PublicCloneable<T: Cloneable>: Cloneable, Serializable {
+interface PublicCloneable<T: Cloneable>: Cloneable, DeepCloneable<T> {
     /** Eine tiefe Kopie des Objekts. */
     public override fun clone(): T
+    override fun deepCopy(): T = clone()
 }
 
-inline fun <reified T: PublicCloneable<T>> List<T>.clone() =
-    List(size) { this[it].clone() }
+interface DeepCloneable<T>: Serializable {
+    /** Eine tiefe Kopie des Objekts. */
+    fun deepCopy(): T
+}
+
+inline fun <reified T: DeepCloneable<T>> List<T>.clone() =
+    List(size) { this[it].deepCopy() }
 
-inline fun <reified T: PublicCloneable<T>> List<List<T>>.deepCopy() =
-    List(size) { row -> List(this[row].size) { column -> this[row][column].clone() } }
+inline fun <reified T: DeepCloneable<T>> List<List<T>>.deepCopy() =
+    List(size) { row -> List(this[row].size) { column -> this[row][column].deepCopy() } }
 
-inline fun <reified T: PublicCloneable<T>> Array<Array<T>>.deepCopy() =
-    Array(size) { row -> Array(this[row].size) { column -> this[row][column].clone() } }
+inline fun <reified T: DeepCloneable<T>> Array<Array<T>>.deepCopy() =
+    Array(size) { row -> Array(this[row].size) { column -> this[row][column].deepCopy() } }