DBot/KStarbound
DBot/KStarbound
3
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Game loading now no longer blocks universe thread and it can perform other work

Browse Source
This commit is contained in:
DBotThePony 2024-05-22 18:59:57 +07:00
parent 2f782d7825
commit 0b3aac6189
Signed by: DBot
GPG Key ID: DCC23B5715498507
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt
View File

@ -13,8 +13,10 @@ import kotlinx.coroutines.Runnable
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.asCoroutineDispatcher
import kotlinx.coroutines.async
import kotlinx.coroutines.delay
import kotlinx.coroutines.future.asCompletableFuture
import kotlinx.coroutines.future.await
import kotlinx.coroutines.launch
import org.apache.logging.log4j.LogManager
import org.classdump.luna.compiler.CompilerChunkLoader
import org.classdump.luna.compiler.CompilerSettings
@ -344,7 +346,6 @@ object Starbound : BlockableEventLoop("Universe Thread"), Scheduler, ISBFileLoca
registerTypeAdapterFactory(JsonReference.Companion)
registerTypeAdapter(ColorReplacements.Companion)
registerTypeAdapterFactory(BlueprintLearnList.Companion)
registerTypeAdapter(RGBAColorTypeAdapter)
@ -619,7 +620,7 @@ object Starbound : BlockableEventLoop("Universe Thread"), Scheduler, ISBFileLoca
return files
}
private fun doInitialize() {
private suspend fun doInitialize() {
if (!initializing && !initialized) {
initializing = true
} else {
@ -665,21 +666,29 @@ object Starbound : BlockableEventLoop("Universe Thread"), Scheduler, ISBFileLoca
loaded = toLoad - tasks.size
loadingProgress = (total - tasks.size) / total
loadingProgressText = "Loading JSON assets, $loaded / $toLoad"
LockSupport.parkNanos(5_000_000L)
delay(10L)
}
Registries.finishLoad()
RecipeRegistry.finishLoad()
ItemRegistry.finishLoad()
Registries.validate()
initializing = false
initialized = true
// Suggest VM to reclaim memory after game has been loaded
System.gc()
}
private var initializationFuture: CompletableFuture<*>? = null
fun initializeGame(): CompletableFuture<*> {
return submit { doInitialize() }
return supplyAsync {
if (initializationFuture == null) {
initializationFuture = scope.launch { doInitialize() }.asCompletableFuture()
}
return@supplyAsync initializationFuture!!
}.thenCompose { it }
}
private var fontPath: File? = null