From b6c98d3bde45dfde6851159c59d179d1850776e8 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 16 Nov 2024 21:25:50 -0600 Subject: [PATCH] Append mod loader to merged jars --- build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index bd7301de9..011a159e2 100644 --- a/build.gradle +++ b/build.gradle @@ -66,8 +66,11 @@ writeBuildGradlePredefine(rootProject.mcVers, rootProject.mcIndex) rootProject.versionStr = rootProject.mod_version + "-" + rootProject.minecraft_version // + "-" + new Date().format("yyyy_MM_dd_HH_mm") // Forgix settings (used for merging jars) forgix { + + String loaderHyphenSeparatedList = ((String)gradle.builds_for).replaceAll(",", "-"); + group = "com.seibel.distanthorizons" - mergedJarName = "DistantHorizons-${rootProject.versionStr}.jar" + mergedJarName = "DistantHorizons-${rootProject.versionStr}-${loaderHyphenSeparatedList}.jar" if (findProject(":forge")) forge {