Update forge, and fix "duplicate content roots" warnings from IntelliJ.
This commit is contained in:
parent
4d9cb45478
commit
95af7d7cb8
|
@ -27,16 +27,6 @@ subprojects {
|
|||
mixinConfig("snowygui-mixins.json")
|
||||
refmapName = "snowygui-common-refmap.json"
|
||||
}
|
||||
this.sourceSets {
|
||||
main {
|
||||
resources {
|
||||
val commonRes = project(":common").sourceSets.main.get().resources
|
||||
if (!this.srcDirs.containsAll(commonRes.srcDirs)) {
|
||||
srcDir(commonRes.srcDirs)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
dependencies {
|
||||
shadowC(kotlin("stdlib-jdk8"))
|
||||
"minecraft"("com.mojang:minecraft:${rootProject.property("minecraft")}")
|
||||
|
@ -87,6 +77,11 @@ allprojects {
|
|||
if (!archiveFileName.get().contains("common")) destinationDirectory.set(file("$rootDir/remappedJars"))
|
||||
}
|
||||
withType(ProcessResources::class) {
|
||||
with(project(":common").sourceSets.main.get().resources.srcDirs) {
|
||||
if (!sourceSets.main.get().resources.srcDirs.containsAll(this)) {
|
||||
from(this)
|
||||
}
|
||||
}
|
||||
val modVersionPair: Pair<String, String> = "mod_version" to (rootProject.version as String)
|
||||
filesMatching(listOf("*.json", "*.toml")) {
|
||||
expand(mutableMapOf(modVersionPair))
|
||||
|
|
|
@ -8,7 +8,7 @@ org.gradle.unsafe.configuration-cache=on
|
|||
org.gradle.vfs.watch=true
|
||||
|
||||
minecraft=1.16.5
|
||||
forge_version=36.0.15
|
||||
forge_version=36.1.4
|
||||
fabric_loader_version=0.10.0+build.208
|
||||
fabric_resource_loader_version=0.4.1+0d4d7e343a
|
||||
modmenu_version=1.16.6
|
Loading…
Reference in New Issue