moved things a lot just so that splash screen shows up WHILE things load

This commit is contained in:
Minjae Song
2018-12-25 01:38:23 +09:00
parent 3546213f34
commit 46284be77d
29 changed files with 434 additions and 400 deletions

View File

@@ -1,5 +1,6 @@
package net.torvald.terrarum.modulebasegame.console
import net.torvald.terrarum.AppLoader
import net.torvald.terrarum.utils.JsonWriter
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.console.ConsoleCommand
@@ -20,7 +21,7 @@ internal object ExportAV : ConsoleCommand {
JsonWriter.writeToFile(
player.actorValue,
Terrarum.defaultDir + "/Exports/" + args[1] + ".json")
AppLoader.defaultDir + "/Exports/" + args[1] + ".json")
Echo("ExportAV: exported to " + args[1] + ".json")
}

View File

@@ -1,6 +1,7 @@
package net.torvald.terrarum.modulebasegame.console
import net.torvald.colourutil.Col4096
import net.torvald.terrarum.AppLoader
import net.torvald.terrarum.utils.RasterWriter
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.blockproperties.Block
@@ -78,7 +79,7 @@ internal object ExportMap : ConsoleCommand {
mapDataPointer += 3
}
val dir = Terrarum.defaultDir + "/Exports/"
val dir = AppLoader.defaultDir + "/Exports/"
val dirAsFile = File(dir)
if (!dirAsFile.exists()) {
dirAsFile.mkdir()

View File

@@ -2,6 +2,7 @@ package net.torvald.terrarum.modulebasegame.console
import net.torvald.terrarum.Terrarum
import com.google.gson.Gson
import net.torvald.terrarum.AppLoader
import net.torvald.terrarum.console.ConsoleCommand
import net.torvald.terrarum.console.Echo
import net.torvald.terrarum.modulebasegame.Ingame
@@ -23,7 +24,7 @@ internal object GsonTest : ConsoleCommand {
val bufferedWriter: BufferedWriter
val writer: FileWriter
try {
writer = FileWriter(Terrarum.defaultDir + "/Exports/" + args[1] + ".json")
writer = FileWriter(AppLoader.defaultDir + "/Exports/" + args[1] + ".json")
bufferedWriter = BufferedWriter(writer)
bufferedWriter.write(jsonString)