Merge branch 'version/1.20.1' into version/1.19.2

# Conflicts: # gradle.properties
Erdragh · Feb 8, 2025 · fbbb0da · fbbb0da
2 parents c6ce038 + c4d7365
commit fbbb0da
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.5.4
+Fix wrong jar being published for Forge
+
 # 1.5.3
 - Unlink users on leave
 - Update Dependencies

diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts
@@ -80,7 +80,7 @@ publishMods {
     curseforge("curseForge") {
         from(curseforgePublish)
         modLoaders.add(project.name)
-        file.set(tasks.jar.get().archiveFile)
+        file.set(tasks.named<Jar>("reobfJar").get().archiveFile)
         additionalFiles.plus(tasks.sourcesJar.get().archiveFile)
         displayName = "$modName $version ${titles[project.name]} $minecraftVersion"
         this.version = "$version-mc$minecraftVersion-${project.name}"
@@ -90,7 +90,7 @@ publishMods {
     modrinth("modrinthForge") {
         from(modrinthPublish)
         modLoaders.add(project.name)
-        file.set(tasks.jar.get().archiveFile)
+        file.set(tasks.named<Jar>("reobfJar").get().archiveFile)
         additionalFiles.plus(tasks.sourcesJar.get().archiveFile)
         displayName = "$modName $version ${titles[project.name]} $minecraftVersion"
         this.version = "$version-mc$minecraftVersion-${project.name}"

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 kotlin.code.style=official
 org.gradle.jvmargs=-Xmx3G -XX:ThreadStackSize=4096 -XX:CompilerThreadStackSize=4096
 
-version=1.5.3
+version=1.5.4
 group=dev.erdragh.astralbot
 modName=AstralBot
 modId=astralbot