Might have fixed gradle (ill check it tommorow if it didnt)

This commit is contained in:
coolGi2007
2022-04-04 10:36:57 +00:00
parent a0bd2ba4a1
commit 2e54f2166d
+16 -18
View File
@@ -35,15 +35,6 @@ def loadProperties() {
}
writeBuildGradlePredefine()
// Stuff for access wideners
def mcVersionToAcsessWidenerVersion = [
"1_16_5": "1_16",
"1.17.1": "1_17",
"1.18.1": "1_18",
"1.18.2": "1_18",
]
// Use this as sometimes multiple versions use the same access wideners
rootProject.ext.set("acsessWidenerVersion", mcVersionToAcsessWidenerVersion.get(minecraft_version.replace(".", "_")))
}
loadProperties()
@@ -53,6 +44,14 @@ architectury {
minecraft = rootProject.minecraft_version
}
// Stuff for access wideners
def mcVersionToAcsessWidenerVersion = [
"1_16_5": "1_16",
"1_17_1": "1_17",
"1_18_1": "1_18",
"1_18_2": "1_18"
] // Use this as sometimes multiple versions use the same access wideners
def acsessWidenerVersion = mcVersionToAcsessWidenerVersion.get(minecraft_version.replace(".", "_"))
subprojects { p ->
apply plugin: "dev.architectury.loom"
@@ -61,7 +60,7 @@ subprojects { p ->
silentMojangMappingsLicense()
if (p != project(":core")) {
accessWidenerPath.set(project(":common").file("src/main/resources/${rootProject.acsessWidenerVersion}.lod.accesswidener"))
accessWidenerPath.set(project(":common").file("src/main/resources/${acsessWidenerVersion}.lod.accesswidener"))
}
}
@@ -194,9 +193,9 @@ allprojects { p ->
// This method copies the access wideners from the common project to the fabric project. And it was generated by Github Copilot
task copyAccessWidener(type: Copy) {
from project(":common").file("src/main/resources/${rootProject.acsessWidenerVersion}.lod.accesswidener")
from project(":common").file("src/main/resources/${acsessWidenerVersion}.lod.accesswidener")
into(file(p.file("build/resources/main")))
rename "${rootProject.acsessWidenerVersion}.lod.accesswidener", "lod.accesswidener"
rename "${acsessWidenerVersion}.lod.accesswidener", "lod.accesswidener"
}
@@ -233,15 +232,14 @@ allprojects { p ->
runServer.enabled = false
}
// this is necessary for running the fabric build
// this is necessary for running the fabric build
if (p == project(":common")) {
println "Copying [common/src/main/resources/${rootProject.acsessWidenerVersion}.lod.accesswidner] to [fabric/build/resources/main]."
println "Copying [common/src/main/resources/${acsessWidenerVersion}.lod.accesswidner] to [fabric/build/resources/main]."
copy {
from project(":common").file("src/main/resources/${rootProject.acsessWidenerVersion}.lod.accesswidener")
into "$rootProject.rootDir/fabric/build/resources/main"
rename "${rootProject.acsessWidenerVersion}.lod.accesswidener", "lod.accesswidener"
from project(":common").file("src/main/resources/${acsessWidenerVersion}.lod.accesswidener")
into project(":fabric").file("build/resources/main")
rename "${acsessWidenerVersion}.lod.accesswidener", "lod.accesswidener"
}
}
}