AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-14 01:48:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

load pre flattening registry async

Browse Source
This commit is contained in:
Moritz Zwerger 2023-10-07 20:52:51 +02:00
parent 17fb146850
commit 67681afe77
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/de/bixilon/minosoft/assets/properties/version/PreFlattening.kt
View File

@ -14,6 +14,7 @@
package de.bixilon.minosoft.assets.properties.version package de.bixilon.minosoft.assets.properties.version
import de.bixilon.kutil.collections.CollectionUtil.synchronizedMapOf import de.bixilon.kutil.collections.CollectionUtil.synchronizedMapOf
import de.bixilon.kutil.concurrent.worker.unconditional.UnconditionalWorker
import de.bixilon.kutil.json.MutableJsonObject import de.bixilon.kutil.json.MutableJsonObject
import de.bixilon.kutil.latch.AbstractLatch import de.bixilon.kutil.latch.AbstractLatch
import de.bixilon.minosoft.assets.meta.MinosoftMeta import de.bixilon.minosoft.assets.meta.MinosoftMeta
@ -30,12 +31,11 @@ object PreFlattening {
val json: MutableJsonObject = synchronizedMapOf() val json: MutableJsonObject = synchronizedMapOf()
// val worker = UnconditionalWorker() val worker = UnconditionalWorker()
for ((type, data) in MinosoftMeta.root) { for ((type, data) in MinosoftMeta.root) {
// worker += { data.load(type, version) } worker += add@{ json[type] = data.load(profile, version) ?: return@add }
json[type] = data.load(profile, version) ?: continue
} }
// worker.work(latch) worker.work(latch)
registries.load(version, json, latch) registries.load(version, json, latch)

2
src/main/java/de/bixilon/minosoft/data/registries/registries/RegistriesLoader.kt
View File

@ -22,7 +22,7 @@ import de.bixilon.minosoft.protocol.versions.Version
object RegistriesLoader { object RegistriesLoader {
fun load(profile: ResourcesProfile, version: Version, latch: AbstractLatch): Registries { fun load(profile: ResourcesProfile, version: Version, latch: AbstractLatch): Registries {
val registries = if (!version.flattened) PreFlattening.loadRegistry(profile, version, latch) else PixLyzerUtil.loadRegistry(version, profile, latch) val registries = if (!version.flattened) PreFlattening.loadRegistry(profile, version, latch) else PixLyzerUtil.loadRegistry(version, profile, latch) // TODO: prioritize pixlyzer and if it fails load meta
registries.setDefaultParents(version) registries.setDefaultParents(version)