diff --git a/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/module/core.gradle.kts b/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/module/core.gradle.kts index 4562792..e53fd69 100644 --- a/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/module/core.gradle.kts +++ b/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/module/core.gradle.kts @@ -14,6 +14,7 @@ evaluationDependsOn(":core") sourceSets { getByName("testmod") { compileClasspath += project(":core").sourceSets["testmod"].output + runtimeClasspath += project(":core").sourceSets["testmod"].output } } diff --git a/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/module/extensions.local.gradle.kts b/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/module/extensions.local.gradle.kts index 751e15c..09a5d2a 100644 --- a/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/module/extensions.local.gradle.kts +++ b/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/module/extensions.local.gradle.kts @@ -19,6 +19,7 @@ evaluationDependsOn(":${platform.mapModuleName("extensions")}") sourceSets { getByName("main") { compileClasspath += project(":extensions").sourceSets["main"].output + runtimeClasspath += project(":extensions").sourceSets["main"].output } getByName("testmod") { compileClasspath += project(":extensions").sourceSets["main"].output diff --git a/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/platform/fabric.gradle.kts b/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/platform/fabric.gradle.kts index 8f4de3d..ce2f0d8 100644 --- a/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/platform/fabric.gradle.kts +++ b/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/platform/fabric.gradle.kts @@ -18,16 +18,9 @@ plugins.apply(libs.plugins.loom.get().pluginId) val xplatProject = project.ext["xplat_project"] as Project sourceSets { - getByName("main") { - compileClasspath += xplatProject.sourceSets["main"].output - } getByName("testmod") { - compileClasspath += xplatProject.sourceSets["testmod"].output - runtimeClasspath += xplatProject.sourceSets["testmod"].output - // Loom seems to only like it when I do this, annoying but reasonable for it to do the bare minimum within the 'mods' block. runtimeClasspath += sourceSets["main"].output - runtimeClasspath += xplatProject.sourceSets["main"].output } } diff --git a/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/platform/loader.gradle.kts b/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/platform/loader.gradle.kts index 3fbbca7..d0f1941 100644 --- a/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/platform/loader.gradle.kts +++ b/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/platform/loader.gradle.kts @@ -24,6 +24,7 @@ evaluationDependsOn(xplatProjectName) sourceSets { getByName("main") { compileClasspath += xplatProject.sourceSets["main"].output + runtimeClasspath += xplatProject.sourceSets["main"].output } getByName("testmod") { compileClasspath += xplatProject.sourceSets["testmod"].output diff --git a/core/neoforge/build.gradle.kts b/core/neoforge/build.gradle.kts index 8c04de7..4ad4225 100644 --- a/core/neoforge/build.gradle.kts +++ b/core/neoforge/build.gradle.kts @@ -84,7 +84,7 @@ fun NamedDomainObjectContainer.registerTasks(moduleProperties: Propert configureEach { tasksBefore.add(xplatProject.tasks.named("compileTestmodJava")) - tasksBefore.add(xplatProject.tasks.named("compileTestmodJava")) + tasksBefore.add(xplatProject.tasks.named("processTestmodResources")) tasksBefore.add(neoforgeProject.tasks.named("compileTestmodJava")) tasksBefore.add(neoforgeProject.tasks.named("processTestmodResources")) }