Forgix workaround

This commit is contained in:
Ran-Mewo
2026-04-17 00:14:28 +10:00
parent fab6d187ca
commit e68b112020
6 changed files with 17 additions and 14 deletions
+6 -5
View File
@@ -434,6 +434,7 @@ if (isNotCommonProject) {
issues : rootProject.mod_issues, issues : rootProject.mod_issues,
discord : rootProject.mod_discord, discord : rootProject.mod_discord,
minecraft_version : rootProject.minecraft_version, minecraft_version : rootProject.minecraft_version,
accessWidenerVersion : rootProject.accessWidenerVersion,
compatible_minecraft_versions: rootProject.compatible_minecraft_versions, compatible_minecraft_versions: rootProject.compatible_minecraft_versions,
compatible_forgemc_versions : compatible_forgemc_versions, compatible_forgemc_versions : compatible_forgemc_versions,
java_version : rootProject.java_version, java_version : rootProject.java_version,
@@ -464,11 +465,11 @@ if (isNotCommonProject) {
// ==================== Resource Copy Tasks ==================== // ==================== Resource Copy Tasks ====================
task copyCommonLoaderResources(type: Copy) { // task copyCommonLoaderResources(type: Copy) {
from project(":common").file("src/main/resources/${rootProject.accessWidenerVersion}.distanthorizons.accesswidener") // from project(":common").file("src/main/resources/${rootProject.accessWidenerVersion}.distanthorizons.accesswidener")
into(file(project.file("build/resources/main"))) // into(file(project.file("build/resources/main")))
rename "${rootProject.accessWidenerVersion}.distanthorizons.accesswidener", "distanthorizons.accesswidener" // rename "${rootProject.accessWidenerVersion}.distanthorizons.accesswidener", "distanthorizons.accesswidener"
} // }
task copyCoreResources(type: Copy) { task copyCoreResources(type: Copy) {
from fileTree(project(":core").file("src/main/resources")) from fileTree(project(":core").file("src/main/resources"))
+2 -2
View File
@@ -76,12 +76,12 @@ task deleteResources(type: Delete) {
processResources { processResources {
dependsOn(copyCoreResources) dependsOn(copyCoreResources)
dependsOn(copyCommonLoaderResources) // dependsOn(copyCommonLoaderResources)
} }
tasks.named('runClient') { tasks.named('runClient') {
dependsOn(copyCoreResources) dependsOn(copyCoreResources)
dependsOn(copyCommonLoaderResources) // dependsOn(copyCommonLoaderResources)
finalizedBy(deleteResources) finalizedBy(deleteResources)
} }
+1 -1
View File
@@ -19,7 +19,7 @@
"license": "LGPL-3", "license": "LGPL-3",
"icon": "assets/distanthorizons/icon.png", "icon": "assets/distanthorizons/icon.png",
"accessWidener": "distanthorizons.accesswidener", "accessWidener": "${accessWidenerVersion}.distanthorizons.accesswidener",
"environment": "*", "environment": "*",
"entrypoints": { "entrypoints": {
+1 -1
View File
@@ -39,7 +39,7 @@ task deleteResources(type: Delete) {
tasks.register('copyAllResources') { tasks.register('copyAllResources') {
dependsOn(copyCoreResources) dependsOn(copyCoreResources)
dependsOn(copyCommonLoaderResources) // dependsOn(copyCommonLoaderResources)
} }
processResources { processResources {
+5 -3
View File
@@ -1,10 +1,12 @@
{ {
"pack": { "pack": {
"pack_format": 7, "pack_format": 64,
"supported_formats": { "supported_formats": {
"min_inclusive": 16, "min_inclusive": 64,
"max_inclusive": 90000 "max_inclusive": 90000
}, },
"description": "Distant Horizons" "description": "Distant Horizons",
"min_format": 64,
"max_format": 90000
} }
} }
+2 -2
View File
@@ -29,12 +29,12 @@ task deleteResources(type: Delete) {
processResources { processResources {
dependsOn(copyCoreResources) dependsOn(copyCoreResources)
dependsOn(copyCommonLoaderResources) // dependsOn(copyCommonLoaderResources)
} }
tasks.named('runClient') { tasks.named('runClient') {
dependsOn(copyCoreResources) dependsOn(copyCoreResources)
dependsOn(copyCommonLoaderResources) // dependsOn(copyCommonLoaderResources)
finalizedBy(deleteResources) finalizedBy(deleteResources)
} }