Merge branch '1.21.4' into 1.21.1

Author: Alexander01998

build.gradle

@@ -172,14 +172,14 @@ def getGhVersion() {
 	return version.substring(0, version.indexOf("-MC"))
 }
 
-def getChangelogLink(String platform, String from) {
+def getChangelogLink(String platform, String from, String minecraftVersion, String archivesBaseName) {
 	def versionSlug = getGhVersion().substring(1).replace(".", "-")
 	def shortURL = "https://www.wurstclient.net/updates/wurst-${versionSlug}/"
 	def query = []
 	if (platform != "GitHub")
-		query.add("mc=${project.minecraft_version}")
+		query.add("mc=${minecraftVersion}")
 	query.add("utm_source=${platform}")
-	query.add("utm_medium=" + project.archives_base_name.replace("-", "+"))
+	query.add("utm_medium=" + archivesBaseName.replace("-", "+"))
 	def fullURL = shortURL + (query.isEmpty() ? "" : "?" + query.join("&"))
 	def encodedURL = java.net.URLEncoder.encode(fullURL, "UTF-8")
 	return "[${shortURL}](https://go.wimods.net/from/${from}?to=${encodedURL})"
@@ -189,23 +189,25 @@ def getChangelogImage(String from) {
 	return "![](https://img.wimods.net/${from})"
 }
 
-def getChangelog(String platform, String from) {
+def getChangelog(String platform, String from, String minecraftVersion, String modLoader, String archivesBaseName) {
 	def prefix = platform == "GitHub" ? "" : "A changelog can be found at: "
-	def imgQuery = platform == "GitHub" ? "" : "?mc_version=${project.minecraft_version}&mod_loader=${project.mod_loader}"
-	return prefix + getChangelogLink(platform, from) + getChangelogImage(from + imgQuery)
+	def imgQuery = platform == "GitHub" ? "" : "?mc_version=${minecraftVersion}&mod_loader=${modLoader}"
+	return prefix + getChangelogLink(platform, from, minecraftVersion, archivesBaseName) + getChangelogImage(from + imgQuery)
 }
 
 import org.kohsuke.github.GHReleaseBuilder
 import org.kohsuke.github.GitHub
 
 task github(dependsOn: build) {
+	def repoIdProvider = providers.gradleProperty("mcx_repo_id")
+	
 	onlyIf {
 		ENV.GITHUB_TOKEN
 	}
 
 	doLast {
 		def github = GitHub.connectUsingOAuth(ENV.GITHUB_TOKEN as String)
-		def repoId = project.mcx_repo_id
+		def repoId = repoIdProvider.get()
 		def repository = github.getRepository(repoId)
 		def ghVersion = getGhVersion()
 
@@ -227,13 +229,18 @@ import org.kohsuke.github.GHMilestoneState
 import java.time.Instant
 
 task closeMilestone {
+	def repoIdProvider = providers.gradleProperty("gh_repo_id")
+	def minecraftVersionProvider = providers.gradleProperty("minecraft_version")
+	def modLoaderProvider = providers.gradleProperty("mod_loader")
+	def archivesBaseNameProvider = providers.gradleProperty("archives_base_name")
+	
 	onlyIf {
 		ENV.GITHUB_TOKEN
 	}
 
 	doLast {
 		def github = GitHub.connectUsingOAuth(ENV.GITHUB_TOKEN as String)
-		def repoId = project.gh_repo_id
+		def repoId = repoIdProvider.get()
 		def repository = github.getRepository(repoId)
 		def ghVersion = getGhVersion()
 
@@ -245,7 +252,8 @@ task closeMilestone {
 
 		if (milestone.getState() != GHMilestoneState.CLOSED) {
 			milestone.setDueOn(Date.from(Instant.now()))
-			milestone.setDescription(getChangelog("GitHub", "github.com/${repoId}/milestone/${ghVersion}"))
+			milestone.setDescription(getChangelog("GitHub", "github.com/${repoId}/milestone/${ghVersion}", 
+				minecraftVersionProvider.get(), modLoaderProvider.get(), archivesBaseNameProvider.get()))
 			milestone.close()
 		}
 	}