curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-07 12:21:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix: weatherdirbox not serialising into the intended form

Browse Source
This commit is contained in:
minjaesong
2023-10-06 00:59:20 +09:00
parent 5345a330b0
commit 394ba47423
1 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/net/torvald/terrarum/serialise/Common.kt
View File

@@ -15,6 +15,7 @@ import net.torvald.terrarum.savegame.ByteArray64InputStream
import net.torvald.terrarum.savegame.ByteArray64Reader
import net.torvald.terrarum.utils.*
import net.torvald.terrarum.weather.BaseModularWeather
import net.torvald.terrarum.weather.WeatherDirBox
import net.torvald.terrarum.weather.WeatherMixer
import net.torvald.terrarum.weather.WeatherStateBox
import org.apache.commons.codec.digest.DigestUtils
@@ -228,6 +229,32 @@ object Common {
}
}
})
// WeatherDirBox
jsoner.setSerializer(WeatherDirBox::class.java, object : Json.Serializer<WeatherDirBox> {
override fun write(json: Json, obj: WeatherDirBox, knownType: Class<*>?) {
json.writeValue("${obj.x};${obj.pM2};${obj.pM1};${obj.p0};${obj.p1};${obj.p2};${obj.p3}")
}
override fun read(json: Json, jsonData: JsonValue, type: Class<*>?): WeatherDirBox {
try {
return jsonData.asString().split(';').map { it.toFloat() }.let {
WeatherDirBox(it[0], it[1], it[2], it[3], it[4], it[5], it[6])
}
}
// just for savegame compatibility
catch (_: IllegalStateException) {
return WeatherDirBox(
jsonData.getFloat("x"),
jsonData.getFloat("pM2"),
jsonData.getFloat("pM1"),
jsonData.getFloat("p0"),
jsonData.getFloat("p1"),
jsonData.getFloat("p2"),
jsonData.getFloat("p3")
)
}
}
})
// BaseModularWeather
jsoner.setSerializer(BaseModularWeather::class.java, object : Json.Serializer<BaseModularWeather> {
override fun write(json: Json, obj: BaseModularWeather, knownType: Class<*>?) {