feat(sdk): make IField enum-ready

Author: xeruf

plugin2025/src/main/kotlin/sc/plugin2025/GameState.kt

@@ -4,6 +4,7 @@ import com.thoughtworks.xstream.annotations.XStreamAlias
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute
 import com.thoughtworks.xstream.annotations.XStreamImplicit
 import sc.api.plugins.*
+import sc.framework.clone
 import sc.framework.plugins.maxByNoEqual
 import sc.plugin2025.GameRuleLogic.calculateCarrots
 import sc.plugin2025.GameRuleLogic.calculateMoveableFields

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

@@ -1,7 +1,9 @@
 package sc.api.plugins
 
-import sc.framework.PublicCloneable
-
-interface IField<FIELD: IField<FIELD>>: PublicCloneable<FIELD> {
+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/api/plugins/RectangularBoard.kt

@@ -1,7 +1,6 @@
 package sc.api.plugins
 
 import com.thoughtworks.xstream.annotations.XStreamImplicit
-import sc.framework.PublicCloneable
 
 /** Eine zweidimensionale Anordnung von Feldern, eine Liste von Zeilen. */
 typealias TwoDBoard<FIELD> = Array<Array<FIELD>>
@@ -16,11 +15,7 @@ typealias MutableTwoDBoard<FIELD> = Array<Array<FIELD>>
  */
 open class RectangularBoard<FIELD: IField<FIELD>>(
         @XStreamImplicit protected open val gameField: TwoDBoard<FIELD>
-): FieldMap<FIELD>(), IBoard, Collection<FIELD> {
-    
-    constructor(other: RectangularBoard<FIELD>): this(other.gameField.clone())
-    
-    override fun clone() = RectangularBoard(this)
+): FieldMap<FIELD>(), Collection<FIELD> {
 
     override val size: Int
         get() = gameField.size * columnCount
@@ -113,13 +108,4 @@ open class RectangularBoard<FIELD: IField<FIELD>>(
             other is RectangularBoard<*> && gameField.contentDeepEquals(other.gameField)
 
     override fun hashCode(): Int = gameField.contentDeepHashCode()
-}
-
-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: PublicCloneable<T>> List<T>.clone() =
-        List(size) { this[it].clone() }
-
-inline fun <reified T: PublicCloneable<T>> List<List<T>>.deepCopy() =
-        List(size) { row -> List(this[row].size) { column -> this[row][column].clone() } }
+}

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

@@ -5,4 +5,13 @@ import java.io.Serializable
 interface PublicCloneable<T: Cloneable>: Cloneable, Serializable {
     /** Eine tiefe Kopie des Objekts. */
     public override fun clone(): T
-}
+}
+
+inline fun <reified T: PublicCloneable<T>> List<T>.clone() =
+    List(size) { this[it].clone() }
+
+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: PublicCloneable<T>> Array<Array<T>>.deepCopy() =
+    Array(size) { row -> Array(this[row].size) { column -> this[row][column].clone() } }

sdk/src/test/kotlin/sc/api/RectangularBoardTest.kt

@@ -0,0 +1,32 @@
+package sc.api
+
+import io.kotest.core.spec.style.FunSpec
+import io.kotest.matchers.shouldBe
+import sc.api.plugins.IField
+import sc.api.plugins.RectangularBoard
+
+enum class Field: IField<Field> {
+    EMPTY,
+    ONE,
+    TWO;
+    
+    override val isEmpty: Boolean
+        get() = this == EMPTY
+    
+    override fun copy(): Field = this
+}
+
+class RectangularBoardTest: FunSpec({
+    test("deep copy") {
+        val board = RectangularBoard(arrayOf(arrayOf(Field.EMPTY, Field.ONE, Field.TWO)))
+        board.fieldsEmpty() shouldBe false
+        //val clone = board.clone()
+        //clone.shouldBe(board)
+        //clone.shouldNotBeSameInstanceAs(board)
+        board[1, 0] = Field.EMPTY
+        //clone.shouldNotBe(board)
+        board[2, 0] = Field.EMPTY
+        board.fieldsEmpty() shouldBe true
+        //clone.fieldsEmpty() shouldBe false
+    }
+})