From 428bdef531736eeb54a543a0324246494a4088f1 Mon Sep 17 00:00:00 2001 From: Wagyourtail Date: Tue, 13 Aug 2024 14:11:24 -0500 Subject: [PATCH] no longer suspend needed --- .../internal/mapping/aw/AccessWidenerApplier.kt | 2 +- .../minecraft/patch/access/AccessConvertImpl.kt | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/mapping/kotlin/xyz/wagyourtail/unimined/internal/mapping/aw/AccessWidenerApplier.kt b/src/mapping/kotlin/xyz/wagyourtail/unimined/internal/mapping/aw/AccessWidenerApplier.kt index 2b34a6c2..e3d3c34e 100644 --- a/src/mapping/kotlin/xyz/wagyourtail/unimined/internal/mapping/aw/AccessWidenerApplier.kt +++ b/src/mapping/kotlin/xyz/wagyourtail/unimined/internal/mapping/aw/AccessWidenerApplier.kt @@ -156,7 +156,7 @@ object AccessWidenerApplier { return false } - suspend fun mergeAws( + fun mergeAws( inputs: List, output: Path, targetNamespace: Namespace, diff --git a/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/access/AccessConvertImpl.kt b/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/access/AccessConvertImpl.kt index f9e00762..aaf17a83 100644 --- a/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/access/AccessConvertImpl.kt +++ b/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/access/AccessConvertImpl.kt @@ -105,14 +105,12 @@ class AccessConvertImpl(val project: Project, val provider: MinecraftProvider) : } private fun mergeAws(output: File, namespace: Namespace, inputs: List): File { - return runBlocking { - AccessWidenerApplier.mergeAws( - inputs.map { it.toPath() }, - output.toPath(), - namespace, - provider.mappings - ).toFile() - } + AccessWidenerApplier.mergeAws( + inputs.map { it.toPath() }, + output.toPath(), + namespace, + provider.mappings + ).toFile() } } \ No newline at end of file