fix resources

This commit is contained in:
Jared 2021-10-25 22:57:33 +02:00
parent db2c4f114f
commit dfd8bc4057
No known key found for this signature in database
GPG Key ID: DB3BA3B9088A1BDF
2 changed files with 6 additions and 3 deletions

View File

@ -33,6 +33,7 @@ loom {
processResources { processResources {
from project(":Common").sourceSets.main.resources
inputs.property "version", project.version inputs.property "version", project.version
filesMatching("fabric.mod.json") { filesMatching("fabric.mod.json") {
@ -40,8 +41,6 @@ processResources {
} }
} }
sourceSets.main.resources.srcDir '../Common/src/main/resources'
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
source(project(":Common").sourceSets.main.allSource) source(project(":Common").sourceSets.main.allSource)
} }

View File

@ -65,7 +65,6 @@ minecraft {
} }
sourceSets.main.resources.srcDir 'src/generated/resources' sourceSets.main.resources.srcDir 'src/generated/resources'
sourceSets.main.resources.srcDir '../Common/src/main/resources'
dependencies { dependencies {
minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
@ -76,6 +75,11 @@ tasks.withType(JavaCompile) {
source(project(":Common").sourceSets.main.allSource) source(project(":Common").sourceSets.main.allSource)
} }
processResources {
from project(":Common").sourceSets.main.resources
}
jar.finalizedBy('reobfJar') jar.finalizedBy('reobfJar')
publishing { publishing {