From dfd8bc40576ff864fd8aeb0d32486e61b3660035 Mon Sep 17 00:00:00 2001 From: Jared Date: Mon, 25 Oct 2021 22:57:33 +0200 Subject: [PATCH] fix resources --- Fabric/build.gradle | 3 +-- Forge/build.gradle | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Fabric/build.gradle b/Fabric/build.gradle index 6d00e8e..383182b 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -33,6 +33,7 @@ loom { processResources { + from project(":Common").sourceSets.main.resources inputs.property "version", project.version filesMatching("fabric.mod.json") { @@ -40,8 +41,6 @@ processResources { } } -sourceSets.main.resources.srcDir '../Common/src/main/resources' - tasks.withType(JavaCompile) { source(project(":Common").sourceSets.main.allSource) } diff --git a/Forge/build.gradle b/Forge/build.gradle index 0da8dc6..a281853 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -65,7 +65,6 @@ minecraft { } sourceSets.main.resources.srcDir 'src/generated/resources' -sourceSets.main.resources.srcDir '../Common/src/main/resources' dependencies { minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" @@ -76,6 +75,11 @@ tasks.withType(JavaCompile) { source(project(":Common").sourceSets.main.allSource) } +processResources { + from project(":Common").sourceSets.main.resources +} + + jar.finalizedBy('reobfJar') publishing {