Merge branch '1.20.2' into 1.20.1

.github/workflows/release.yml

@@ -20,7 +20,6 @@ jobs:
       MAVEN_USERNAME: ${{secrets.MAVEN_USERNAME}}
       MAVEN_PASSWORD: ${{secrets.MAVEN_PASSWORD}}
       GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-      CURSEFORGE_TOKEN: ${{secrets.CURSEFORGE_TOKEN}}
       MODRINTH_TOKEN: ${{secrets.MODRINTH_TOKEN}}
     steps:
       - name: Checking Out the Repository
@@ -46,5 +45,5 @@ jobs:
           key: ${{ runner.os }}-gradle-#{{ hashFiles('**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      - name: Publish to CurseForge and Modrinth
+      - name: Publish to Modrinth
         run: ./gradlew publishMod -PreleaseType=stable -PuseThirdPartyMods=false

build.gradle.kts

@@ -1,6 +1,3 @@
-import com.matthewprenger.cursegradle.CurseArtifact
-import com.matthewprenger.cursegradle.CurseProject
-import com.matthewprenger.cursegradle.CurseRelation
 import groovy.xml.XmlSlurper
 import org.codehaus.groovy.runtime.ResourceGroovyMethods
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
@@ -19,15 +16,17 @@ buildscript {
 	}
 	dependencies {
 		classpath("org.kohsuke:github-api:+")
+        // remove these 2 to get normal fabric loom versions
+        classpath(files("libs/fabric-loom-1.5.local.jar"))
+        classpath("net.fabricmc:mapping-io:+")
 	}
 }
 
 plugins {
-	id("fabric-loom") version("1.4.+")
+	id("fabric-loom") version("+")
 	id("org.ajoberstar.grgit") version("+")
 	id("org.quiltmc.gradle.licenser") version("+")
 	id("com.modrinth.minotaur") version("+")
-	id("com.matthewprenger.cursegradle") version("+")
     id("com.github.johnrengelman.shadow") version("+")
     `maven-publish`
     eclipse
@@ -212,13 +211,6 @@ repositories {
     maven {
         setUrl("https://maven.shedaniel.me/")
     }
-    maven {
-        setUrl("https://cursemaven.com")
-
-        content {
-            includeGroup("curse.maven")
-        }
-    }
     maven {
         setUrl("https://maven.minecraftforge.net")
     }
@@ -496,9 +488,7 @@ extra {
 }
 
 val modrinth_id: String by extra
-val curseforge_id: String by extra
 val release_type: String by extra
-val curseforge_minecraft_version: String by extra
 val changelog_file: String by extra
 
 val modrinth_version = makeModrinthVersion(mod_version)
@@ -536,36 +526,6 @@ fun getBranch(): String {
     return branch.substring(branch.lastIndexOf("/") + 1)
 }
 
-curseforge {
-    val token = System.getenv("CURSEFORGE_TOKEN")
-    apiKey = if (token == null || token.isEmpty()) "unset" else token
-    val gameVersion = if (curseforge_minecraft_version != "null") curseforge_minecraft_version else minecraft_version
-    project(closureOf<CurseProject> {
-        id = curseforge_id
-        changelog = changelog_text
-        releaseType = release_type
-        addGameVersion("Fabric")
-        addGameVersion("Quilt")
-        addGameVersion(gameVersion)
-        relations(closureOf<CurseRelation> {
-            requiredDependency("fabric-api")
-            optionalDependency("cloth-config")
-        })
-        mainArtifact(remapJar, closureOf<CurseArtifact> {
-            displayName = display_name
-        })
-        addArtifact(tasks.remapSourcesJar.get())
-        addArtifact(javadocJar)
-
-        afterEvaluate {
-            uploadTask.dependsOn(remapJar)
-            uploadTask.dependsOn(tasks.remapSourcesJar.get())
-            uploadTask.dependsOn(javadocJar)
-        }
-    })
-    curseGradleOptions.forgeGradleIntegration = false
-}
-
 modrinth {
     token = System.getenv("MODRINTH_TOKEN")
     projectId = modrinth_id
@@ -616,6 +576,5 @@ val github by tasks.register("github") {
 val publishMod by tasks.register("publishMod") {
     dependsOn(tasks.publish)
     dependsOn(github)
-    dependsOn(tasks.curseforge)
     dependsOn(tasks.modrinth)
 }

gradle/publishing.properties

@@ -1,6 +1,4 @@
 modrinth_id=9KawNmQc
-curseforge_id=709773
 
 release_type=release
-curseforge_minecraft_version=null
 changelog_file=CHANGELOG.md