From 67176fa56671713eca5b3790edf86bd2ea5d0db6 Mon Sep 17 00:00:00 2001 From: JFronny Date: Tue, 18 Jul 2023 16:56:12 +0200 Subject: [PATCH] Try to fix dev launch --- jfmod/src/main/kotlin/jfmod.module.gradle.kts | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/jfmod/src/main/kotlin/jfmod.module.gradle.kts b/jfmod/src/main/kotlin/jfmod.module.gradle.kts index 6cfd779..5ea32e6 100644 --- a/jfmod/src/main/kotlin/jfmod.module.gradle.kts +++ b/jfmod/src/main/kotlin/jfmod.module.gradle.kts @@ -11,7 +11,7 @@ plugins { val args = extensions.create("jfModule") val isRoot = project == rootProject -val rootArgs get() = rootProject.extensions.getByName("jfMod"); +val rootArgs get() = rootProject.extensions.getByName("jfMod") insertEarlyAfterEvaluate { args.check(project) @@ -33,18 +33,22 @@ insertEarlyAfterEvaluate { } } +fun Project.pAfterEvaluate(action: (Project) -> Unit) = afterEvaluate { action(this) } + afterEvaluate { - rootProject.allprojects.forEach { sub -> - if (sub != this && rootArgs.isMod(sub)) { - loom { - mods { - register(sub.name) { - sourceSet(sub.sourceSets.main.get()) - sourceSet(sub.sourceSets.client.get()) - } - if (!sourceSets.testmod.get().resources.isEmpty) { - register("${sub.name}-testmod") { - sourceSet(sub.sourceSets.testmod.get()) + rootProject.allprojects.forEach { + it.pAfterEvaluate { sub -> + if (sub != this && rootArgs.isMod(sub)) { + loom { + mods { + register(sub.name) { + sourceSet(sub.sourceSets.main.get()) + sourceSet(sub.sourceSets.client.get()) + } + if (!sourceSets.testmod.get().resources.isEmpty) { + register("${sub.name}-testmod") { + sourceSet(sub.sourceSets.testmod.get()) + } } } }