build: updates to CF publishing

Author: desht

fabric/build.gradle

@@ -69,26 +69,6 @@ components.java {
 	}
 }
 
-if (ENV.CURSEFORGE_KEY) {
-	curseforge {
-		apiKey = ENV.CURSEFORGE_KEY
-		project {
-			id = project.curseforge_id_fabric
-			releaseType = project.curseforge_type
-			addGameVersion "Fabric"
-			addGameVersion "1.19.2"
-			mainArtifact(remapJar.archivePath)
-			relations {
-				requiredDependency 'architectury-api'
-				requiredDependency 'fabric-api'
-				requiredDependency 'ftb-library-fabric'
-			}
-			changelog = getGitChangelog
-			changelogType = 'markdown'
-		}
-	}
-}
-
 publishing {
 	publications {
 		mavenForge(MavenPublication) {
@@ -121,4 +101,24 @@ publishing {
 	}
 }
 
+if (ENV.CURSEFORGE_KEY) {
+	curseforge {
+		apiKey = ENV.CURSEFORGE_KEY
+		project {
+			id = project.curseforge_id_fabric
+			releaseType = ftbPublishing.relType
+			addGameVersion "Fabric"
+			addGameVersion rootProject.minecraft_version
+			mainArtifact(remapJar.archiveFile)
+			relations {
+				requiredDependency 'architectury-api'
+				requiredDependency 'fabric-api'
+				requiredDependency 'ftb-library-fabric'
+			}
+			changelog = ENV.CHANGELOG  // expected to exist if ENV.CURSEFORGE does
+			changelogType = 'markdown'
+		}
+	}
+}
+
 rootProject.tasks.getByName("curseforgePublish").dependsOn tasks.getByName("curseforge")

forge/build.gradle

@@ -39,7 +39,7 @@ processResources {
 				"forgeversion": project.forge_version,
 				"forgeshortversion": project.forge_version.split("\\.")[0],
 				"mcversion": project.minecraft_version,
-				"libraryversion": project.ftb_library_version
+				"libraryversion": project.ftb_library_version.replaceAll("-SNAPSHOT", "")
 	}
 }
 
@@ -79,25 +79,6 @@ components.java {
 	}
 }
 
-if (ENV.CURSEFORGE_KEY) {
-	curseforge {
-		apiKey = ENV.CURSEFORGE_KEY
-		project {
-			id = project.curseforge_id_forge
-			releaseType = project.curseforge_type
-			addGameVersion "Forge"
-			addGameVersion "1.19.2"
-			mainArtifact(remapJar.archivePath)
-			relations {
-				requiredDependency 'architectury-api'
-				requiredDependency 'ftb-library-forge'
-			}
-			changelog = getGitChangelog
-			changelogType = 'markdown'
-		}
-	}
-}
-
 publishing {
 	publications {
 		mavenForge(MavenPublication) {
@@ -130,4 +111,23 @@ publishing {
 	}
 }
 
+if (ENV.CURSEFORGE_KEY) {
+	curseforge {
+		apiKey = ENV.CURSEFORGE_KEY
+		project {
+			id = project.curseforge_id_forge
+			releaseType = ftbPublishing.relType
+			addGameVersion "Forge"
+			addGameVersion rootProject.minecraft_version
+			mainArtifact(remapJar.archiveFile)
+			relations {
+				requiredDependency 'architectury-api'
+				requiredDependency 'ftb-library-forge'
+			}
+			changelog = ENV.CHANGELOG  // expected to exist if ENV.CURSEFORGE does
+			changelogType = 'markdown'
+		}
+	}
+}
+
 rootProject.tasks.getByName("curseforgePublish").dependsOn tasks.getByName("curseforge")

gradle.properties

@@ -13,4 +13,3 @@ ftb_library_version=2001.1.1-build.219-SNAPSHOT
 forge_version=47.0.1
 curseforge_id_forge=404468
 curseforge_id_fabric=438497
-curseforge_type=alpha

settings.gradle

@@ -8,4 +8,4 @@ pluginManagement {
 
 include "common", "fabric", "forge"
 
-rootProject.name = 'FTB-Teams-1.20'
+rootProject.name = 'FTB-Teams-1.20.1'