fix: Don't pass world in CopyToInstances, we can get it from the enti…

…ty in decodeComponentsTo
MineInAbyss · Oct 28, 2024 · 33e9b48 · 33e9b48
1 parent 364b694
commit 33e9b48
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 20 deletions.
diff --git a/...mmonMain/kotlin/com/mineinabyss/geary/prefabs/configuration/components/CopyToInstances.kt b/...mmonMain/kotlin/com/mineinabyss/geary/prefabs/configuration/components/CopyToInstances.kt
@@ -2,11 +2,9 @@ package com.mineinabyss.geary.prefabs.configuration.components
 
 import com.mineinabyss.geary.datatypes.Component
 import com.mineinabyss.geary.datatypes.Entity
-import com.mineinabyss.geary.modules.Geary
 import com.mineinabyss.geary.serialization.SerializableComponents
 import com.mineinabyss.geary.serialization.serializers.SerializedComponents
 import com.mineinabyss.geary.serialization.setAllPersisting
-import kotlinx.serialization.Contextual
 import kotlinx.serialization.Polymorphic
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -23,31 +21,20 @@ import kotlinx.serialization.Serializable
 data class CopyToInstances(
     private val temporary: SerializedComponents? = null,
     private val persisting: SerializedComponents? = null,
-    private val world: @Contextual Geary,
 ) {
     @Serializable
     private data class DeepCopy(
         val temporary: List<@Polymorphic Component>?,
-        val persisting: List<@Polymorphic Component>?
+        val persisting: List<@Polymorphic Component>?,
     )
 
-    val formats get() = world.getAddon(SerializableComponents).formats
+    fun decodeComponentsTo(entity: Entity) {
+        val binaryFormat = entity.world.getAddon(SerializableComponents).formats.binaryFormat
 
-    // This is the safest and cleanest way to deep-copy, even if a little performance intense.
-    private val serializedComponents by lazy {
-        formats.binaryFormat.encodeToByteArray(
-            DeepCopy.serializer(),
-            DeepCopy(temporary, persisting)
-        )
-    }
+        // This is the safest and cleanest way to deep-copy, even if a little performance intense.
+        val encoded = binaryFormat.encodeToByteArray(DeepCopy.serializer(), DeepCopy(temporary, persisting))
+        val (instance, persist) = binaryFormat.decodeFromByteArray(DeepCopy.serializer(), encoded)
 
-    private fun getDeepCopied() = formats.binaryFormat.decodeFromByteArray(
-        DeepCopy.serializer(), serializedComponents
-    )
-
-    fun decodeComponentsTo(entity: Entity) {
-        val (instance, persist) = getDeepCopied()
-        //order of addition specifies that persisting components should override all
         if (instance != null) {
             entity.setAll(instance, override = false)
         }

diff --git a/addons/geary-prefabs/src/jvmTest/kotlin/com/mineinabyss/geary/prefabs/CopyToInstancesTest.kt b/addons/geary-prefabs/src/jvmTest/kotlin/com/mineinabyss/geary/prefabs/CopyToInstancesTest.kt
@@ -33,7 +33,6 @@ class CopyToInstancesTest : GearyTest() {
                 CopyToInstances(
                     temporary = listOf(42),
                     persisting = listOf("Hello world"),
-                    world = world,
                 )
             )
             addRelation<NoInherit, CopyToInstances>()