diff --git a/src/main/java/de/bixilon/minosoft/assets/properties/version/PreFlattening.kt b/src/main/java/de/bixilon/minosoft/assets/properties/version/PreFlattening.kt index 063984596..084ae2f4d 100644 --- a/src/main/java/de/bixilon/minosoft/assets/properties/version/PreFlattening.kt +++ b/src/main/java/de/bixilon/minosoft/assets/properties/version/PreFlattening.kt @@ -14,6 +14,7 @@ package de.bixilon.minosoft.assets.properties.version 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.latch.AbstractLatch import de.bixilon.minosoft.assets.meta.MinosoftMeta @@ -30,12 +31,11 @@ object PreFlattening { val json: MutableJsonObject = synchronizedMapOf() - // val worker = UnconditionalWorker() + val worker = UnconditionalWorker() for ((type, data) in MinosoftMeta.root) { - // worker += { data.load(type, version) } - json[type] = data.load(profile, version) ?: continue + worker += add@{ json[type] = data.load(profile, version) ?: return@add } } - // worker.work(latch) + worker.work(latch) registries.load(version, json, latch) diff --git a/src/main/java/de/bixilon/minosoft/data/registries/registries/RegistriesLoader.kt b/src/main/java/de/bixilon/minosoft/data/registries/registries/RegistriesLoader.kt index d09c3e8a0..492935594 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/registries/RegistriesLoader.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/registries/RegistriesLoader.kt @@ -22,7 +22,7 @@ import de.bixilon.minosoft.protocol.versions.Version object RegistriesLoader { 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)