Fixed up some stuff (Got busy so finish it later)

This commit is contained in:
TomTheFurry
2022-04-04 17:48:37 +08:00
parent 139c5869c9
commit 38102ac17f
3 changed files with 47 additions and 22 deletions
+24 -11
View File
@@ -35,6 +35,15 @@ 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(mcVersion))
}
loadProperties()
@@ -44,14 +53,6 @@ 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"
@@ -60,7 +61,7 @@ subprojects { p ->
silentMojangMappingsLicense()
if (p != project(":core")) {
accessWidenerPath.set(project(":common").file("src/main/resources/${acsessWidenerVersion}.lod.accesswidener"))
accessWidenerPath.set(project(":common").file("src/main/resources/${rootProject.acsessWidenerVersion}.lod.accesswidener"))
}
}
@@ -193,9 +194,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/${acsessWidenerVersion}.lod.accesswidener")
from project(":common").file("src/main/resources/${rootProject.acsessWidenerVersion}.lod.accesswidener")
into(file(p.file("build/resources/main")))
rename "${acsessWidenerVersion}.lod.accesswidener", "lod.accesswidener"
rename "${rootProject.acsessWidenerVersion}.lod.accesswidener", "lod.accesswidener"
}
@@ -231,6 +232,18 @@ allprojects { p ->
runClient.enabled = false
runServer.enabled = false
}
// 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]."
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"
}
}
}