From 0cfb65b0c9ce7e132b0e9cce8d1a2cba2970b197 Mon Sep 17 00:00:00 2001 From: Moritz Zwerger Date: Sat, 25 Nov 2023 15:37:52 +0100 Subject: [PATCH] minosoft meeta: correctly throw error when (down)loading fails See GH-20 --- .../minosoft/assets/properties/version/PreFlattening.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 e6f0e7a15..8b52d0bdc 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 @@ -31,12 +31,15 @@ object PreFlattening { val json: MutableJsonObject = synchronizedMapOf() - val worker = UnconditionalWorker() // TODO: kutil 1.24 add error handler + var error: Throwable? = null + val worker = UnconditionalWorker(errorHandler = { if (error == null) error = it else it.printStackTrace() }) for ((type, data) in MinosoftMeta.root) { worker += add@{ json[type] = data.load(profile, version) ?: return@add } } worker.work(latch) + error?.let { throw it } + registries.load(version, json, latch) return registries