tevd update; seemingly working savefile export

src/net/torvald/terrarum/modulebasegame/console/Save.kt

@@ -0,0 +1,79 @@
+package net.torvald.terrarum.modulebasegame.console
+
+import com.badlogic.gdx.Gdx
+import net.torvald.terrarum.AppLoader
+import net.torvald.terrarum.CommonResourcePool
+import net.torvald.terrarum.ReferencingRanges
+import net.torvald.terrarum.Terrarum
+import net.torvald.terrarum.console.ConsoleCommand
+import net.torvald.terrarum.console.Echo
+import net.torvald.terrarum.gameactors.Actor
+import net.torvald.terrarum.gameactors.BlockMarkerActor
+import net.torvald.terrarum.modulebasegame.TerrarumIngame
+import net.torvald.terrarum.modulecomputers.virtualcomputer.tvd.DiskEntry
+import net.torvald.terrarum.modulecomputers.virtualcomputer.tvd.DiskEntryContent
+import net.torvald.terrarum.modulecomputers.virtualcomputer.tvd.EntryFile
+import net.torvald.terrarum.modulecomputers.virtualcomputer.tvd.VDUtil
+import net.torvald.terrarum.serialise.WriteActor
+import net.torvald.terrarum.serialise.WriteMeta
+import net.torvald.terrarum.serialise.WriteWorld
+import java.io.File
+import java.io.IOException
+
+/**
+ * Created by minjaesong on 2021-08-29.
+ */
+object Save : ConsoleCommand {
+
+    private fun acceptable(actor: Actor): Boolean {
+        return actor.referenceID !in ReferencingRanges.ACTORS_WIRES &&
+               actor.referenceID !in ReferencingRanges.ACTORS_WIRES_HELPER &&
+               actor != (CommonResourcePool.get("blockmarking_actor") as BlockMarkerActor)
+    }
+
+    override fun execute(args: Array<String>) {
+        if (args.size == 2) {
+            try {
+                val ingame = Terrarum.ingame!! as TerrarumIngame
+                val savename = args[1].trim()
+                val creation_t = VDUtil.currentUnixtime
+                val time_t = VDUtil.currentUnixtime
+
+                val disk = VDUtil.createNewDisk(1L shl 60, savename, Charsets.UTF_8)
+
+                val metaContent = EntryFile(WriteMeta(ingame).encodeToByteArray64())
+                val meta = DiskEntry(32768, 0, "savegame.json".toByteArray(), creation_t, time_t, metaContent)
+                VDUtil.addFile(disk, 0, meta, false)
+
+                val worldContent = EntryFile(WriteWorld(ingame).encodeToByteArray64())
+                val world = DiskEntry(ingame.world.worldIndex, 0, "world${ingame.world.worldIndex}.json".toByteArray(), creation_t, time_t, worldContent)
+                VDUtil.addFile(disk, 0, world, false)
+
+                listOf(ingame.actorContainerActive, ingame.actorContainerInactive).forEach { actors ->
+                    actors.forEach {
+                        if (acceptable(it)) {
+                            val actorContent = EntryFile(WriteActor.encodeToByteArray64(it))
+                            val actor = DiskEntry(it.referenceID, 0, "actor${it.referenceID}.json".toByteArray(), creation_t, time_t, actorContent)
+                            VDUtil.addFile(disk, 0, actor, false)
+                        }
+                    }
+                }
+
+                disk.capacity = 0
+                VDUtil.dumpToRealMachine(disk, File(AppLoader.defaultDir + "/Exports/${args[1]}"))
+            }
+            catch (e: IOException) {
+                Echo("Save: IOException raised.")
+                e.printStackTrace()
+            }
+        }
+        else {
+            printUsage()
+        }
+    }
+
+    override fun printUsage() {
+        Echo("Usage: save <filename>")
+    }
+
+}

src/net/torvald/terrarum/serialise/WriteActor.kt

@@ -13,12 +13,12 @@ import java.math.BigInteger
  */
 object WriteActor {
 
-    operator fun invoke(actor: IngamePlayer): String {
+    operator fun invoke(actor: Actor): String {
         val s = Common.jsoner.toJson(actor, actor.javaClass)
         return """{"class":"${actor.javaClass.canonicalName}",${s.substring(1)}"""
     }
 
-    fun encodeToByteArray64(actor: IngamePlayer): ByteArray64 {
+    fun encodeToByteArray64(actor: Actor): ByteArray64 {
         val ba = ByteArray64()
         this.invoke(actor).toByteArray().forEach { ba.add(it) }
         return ba

src/net/torvald/terrarum/serialise/WriteMeta.kt

@@ -20,7 +20,7 @@ open class WriteMeta(val ingame: TerrarumIngame) {
         val world = ingame.world
         
         val json = """{
-"genver": 4,
+"genver": ${Common.GENVER},
 "savename": "${world.worldName}",
 "terrseed": ${world.generatorSeed},
 "randseed0": ${RoguelikeRandomiser.RNG.state0},

src/net/torvald/terrarum/serialise/WriteWorld.kt

@@ -18,7 +18,7 @@ open class WriteWorld(val ingame: TerrarumIngame) {
     }
 
     fun encodeToByteArray64(): ByteArray64 {
-        val world = ingame.world
+        /*val world = ingame.world
         world.genver = Common.GENVER
         world.comp = Common.COMP_GZIP
 
@@ -38,6 +38,10 @@ open class WriteWorld(val ingame: TerrarumIngame) {
         Common.jsoner.toJson(world, wr)
         wr.flush(); wr.close()
 
+        return ba*/
+
+        val ba = ByteArray64()
+        this.invoke().toByteArray().forEach { ba.add(it) }
         return ba
     }