From ff3f8fe7e3444e1f25bfe25f8737be9ea9582046 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sun, 21 Jan 2024 00:32:48 +0900 Subject: [PATCH] fix: biomegen may fail due to uninitialised whatever --- .../modulebasegame/worldgenerator/Biomegen.kt | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/net/torvald/terrarum/modulebasegame/worldgenerator/Biomegen.kt b/src/net/torvald/terrarum/modulebasegame/worldgenerator/Biomegen.kt index 467c7959f..c91c76a85 100644 --- a/src/net/torvald/terrarum/modulebasegame/worldgenerator/Biomegen.kt +++ b/src/net/torvald/terrarum/modulebasegame/worldgenerator/Biomegen.kt @@ -23,17 +23,10 @@ class Biomegen(world: GameWorld, isFinal: Boolean, seed: Long, params: Any, val private val YHEIGHT_DIVISOR = 2.0 / 7.0 - private lateinit var THISWORLD_SAND: ItemID - private lateinit var THISWORLD_SANDSTONE: ItemID - - - override fun getDone(loadscreen: LoadScreenBase?) { - loadscreen?.let { - it.stageValue += 1 - it.progress.set(0L) - } - + private val THISWORLD_SAND: ItemID + private val THISWORLD_SANDSTONE: ItemID + init { val SAND_RND = (seed shake "SANDYCOLOURS").ushr(7).xor(seed and 255L).and(255L).toInt() val SAND_BASE = when (SAND_RND) { 255 -> 5 // green @@ -44,8 +37,16 @@ class Biomegen(world: GameWorld, isFinal: Boolean, seed: Long, params: Any, val } THISWORLD_SAND = "basegame:" + (Block.SAND.substringAfter(':').toInt() + SAND_BASE) THISWORLD_SANDSTONE = "basegame:" + (Block.SANDSTONE.substringAfter(':').toInt() + SAND_BASE) + } + + override fun getDone(loadscreen: LoadScreenBase?) { + loadscreen?.let { + it.stageValue += 1 + it.progress.set(0L) + } + // loadscreen.progress.set((loadscreen.progress.get() + 0x1_000000_000000L) and 0x7FFF_000000_000000L) Worldgen.threadExecutor.renew()