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

Add asset path stack push/pop when loading globals

Browse Source
This commit is contained in:
DBotThePony 2023-09-29 22:47:44 +07:00
parent 087c4616b6
commit e96d668f26
Signed by: DBot
GPG Key ID: DCC23B5715498507
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/kotlin/ru/dbotthepony/kstarbound/GlobalDefaults.kt
View File

@ -3,6 +3,7 @@ package ru.dbotthepony.kstarbound
import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.LogManager
import ru.dbotthepony.kstarbound.defs.MovementParameters import ru.dbotthepony.kstarbound.defs.MovementParameters
import ru.dbotthepony.kstarbound.defs.player.PlayerMovementParameters import ru.dbotthepony.kstarbound.defs.player.PlayerMovementParameters
import ru.dbotthepony.kstarbound.util.AssetPathStack
import java.util.concurrent.ForkJoinPool import java.util.concurrent.ForkJoinPool
import java.util.concurrent.ForkJoinTask import java.util.concurrent.ForkJoinTask
import kotlin.reflect.KMutableProperty0 import kotlin.reflect.KMutableProperty0
@ -40,10 +41,12 @@ object GlobalDefaults {
return EmptyTask return EmptyTask
} else { } else {
return executor.submit { return executor.submit {
AssetPathStack("/") {
accept.set(Starbound.gson.fromJson(file.jsonReader(), T::class.java)) accept.set(Starbound.gson.fromJson(file.jsonReader(), T::class.java))
} }
} }
} }
}
fun load(log: ILoadingLog, executor: ForkJoinPool): List<ForkJoinTask<*>> { fun load(log: ILoadingLog, executor: ForkJoinPool): List<ForkJoinTask<*>> {
val tasks = ArrayList<ForkJoinTask<*>>() val tasks = ArrayList<ForkJoinTask<*>>()