From 17ce723edf3f8e53c206db0c0d8838f041db5a04 Mon Sep 17 00:00:00 2001 From: Jonathing Date: Sun, 19 Oct 2025 19:41:21 -0400 Subject: [PATCH] Fix universal jar missing Forge version (#10699) --- build_forge.gradle | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/build_forge.gradle b/build_forge.gradle index 2dc5af5e7d..0da982aa9d 100644 --- a/build_forge.gradle +++ b/build_forge.gradle @@ -839,12 +839,19 @@ tasks.register('filterJarNewSRG', FilterNewJar).configure { blacklist = filterJarNew.blacklist } -tasks.named('universalJar').configure { +tasks.named('universalJar', Jar) { dependsOn downloadCrowdin from zipTree(downloadCrowdin.dest).matching { include 'assets/forge/lang/*.json' } + final Map replaceProperties = Map.of('forge_version', (String) version) + inputs.properties replaceProperties + + filesMatching(['META-INF/mods.toml']) { + expand replaceProperties + [project: project] + } + from(EXTRA_TXTS) duplicatesStrategy = DuplicatesStrategy.EXCLUDE exclude '.cache' @@ -985,15 +992,6 @@ tasks.register('genAllData') { dependsOn 'forge_data', 'forge_test_data' } -tasks.named('processResources', ProcessResources) { - final Map replaceProperties = Map.of('forge_version', (String) version) - inputs.properties replaceProperties - - filesMatching(['META-INF/mods.toml']) { - expand replaceProperties + [project: project] - } -} - if (project.hasProperty('UPDATE_MAPPINGS')) { extractRangeMap { sources.from sourceSets.test.java.srcDirs