From 11ad4372ff3a6cb59a1597cc21a22ebd697a7dab Mon Sep 17 00:00:00 2001 From: Aeltumn Date: Mon, 25 Nov 2024 23:10:04 +0100 Subject: [PATCH] Janky fix for resources --- buildSrc/src/main/kotlin/multiloader.loader.gradle.kts | 10 ++++++++++ fabric/build.gradle.kts | 2 +- fabric/src/main/resources/.gitignore | 5 +++++ neoforge/src/main/resources/.gitignore | 5 +++++ 4 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 fabric/src/main/resources/.gitignore create mode 100644 neoforge/src/main/resources/.gitignore diff --git a/buildSrc/src/main/kotlin/multiloader.loader.gradle.kts b/buildSrc/src/main/kotlin/multiloader.loader.gradle.kts index fbae902a..1d39de80 100644 --- a/buildSrc/src/main/kotlin/multiloader.loader.gradle.kts +++ b/buildSrc/src/main/kotlin/multiloader.loader.gradle.kts @@ -18,13 +18,23 @@ dependencies { } tasks { + // Janky task to just copy over the resources folder + val copyResourcesFromCommon by tasks.registering(Copy::class) { + from(project(":common").file("src/main/resources")) + into("src/main/resources") + include("**/*") + duplicatesStrategy = DuplicatesStrategy.INCLUDE + } + named("compileJava").configure { dependsOn(configurations.getByName("commonJava")) source(configurations.getByName("commonJava")) } named("processResources").configure { + dependsOn(copyResourcesFromCommon) dependsOn(configurations.getByName("commonResources")) from(configurations.getByName("commonResources")) + duplicatesStrategy = DuplicatesStrategy.INCLUDE } named("sourcesJar").configure { dependsOn(configurations.getByName("commonJava")) diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts index 1d46ce70..658e0ccc 100644 --- a/fabric/build.gradle.kts +++ b/fabric/build.gradle.kts @@ -47,4 +47,4 @@ tasks { exclude("**/modmenu/**.java") } } -} +} \ No newline at end of file diff --git a/fabric/src/main/resources/.gitignore b/fabric/src/main/resources/.gitignore new file mode 100644 index 00000000..967eeaab --- /dev/null +++ b/fabric/src/main/resources/.gitignore @@ -0,0 +1,5 @@ +*.cfg +*.accesswidener +assets +data +noxesium-common.mixins.json \ No newline at end of file diff --git a/neoforge/src/main/resources/.gitignore b/neoforge/src/main/resources/.gitignore new file mode 100644 index 00000000..967eeaab --- /dev/null +++ b/neoforge/src/main/resources/.gitignore @@ -0,0 +1,5 @@ +*.cfg +*.accesswidener +assets +data +noxesium-common.mixins.json \ No newline at end of file