feat: tool changes

.github/workflows/release.yml

@@ -8,30 +8,19 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    if: |
-      !contains(github.event.head_commit.message, '[ciskip]')
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK
+      - name: Set up JDK  8
         uses: actions/setup-java@v2
         with:
+          java-version: '8'
           distribution: 'temurin'
-          java-version: '17'
-      - name: Build with Gradle
+      - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: build
-      - name: Publish to Maven & Curseforge
-        uses: gradle/gradle-build-action@v2
+          arguments: build publish publishMods --no-daemon
         env:
           SAPS_TOKEN: ${{ secrets.SAPS_TOKEN }}
-          CURSEFORGE_KEY: ${{ secrets.CURSEFORGE_KEY }}
-        with:
-          arguments: publish curseforgePublish
-      - name: Release to Github
-        uses: "softprops/action-gh-release@v1"
-        with:
-          body_path: "./CHANGELOG.md"
-          prerelease: false
-          files: |
-            ./+(forge|fabric)/build/libs/*+@(mc+([0-9]).+([0-9]).+([0-9])).jar
+          MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CURSE_TOKEN: ${{ secrets.CURSEFORGE_KEY }}

.gitignore

@@ -18,3 +18,5 @@ classes/
 .settings
 *.launch
 .DS_Store
+
+.architectury-transformer

CHANGELOG.md

@@ -1,7 +1,7 @@
 # Accelerated Decay Changelog
 
-## [0.1.3]
+## [69.0.0]
 
-### Fixed
+### Changed
 
-- Added protection around clients being able to call server events
+- Backported to 1.16.5 thanks to [@Kasualix](https://github.com/Kasualix)

build.gradle

@@ -1,6 +1,7 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "0.12.0-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false
+    id "me.modmuss50.mod-publish-plugin" version "0.4.5"
 }
 
 architectury {
@@ -30,11 +31,9 @@ allprojects {
 
     ext.ENV = System.getenv()
     ext.SNAPSHOT = ENV.SNAPSHOT != null && (ENV.SNAPSHOT == "true" || ENV.SNAPSHOT == true)
-    ext.MAVEN_URL = "https://maven.saps.dev/${SNAPSHOT ? "snapshots" : "releases"}"
-    ext.MAVEN_VERSION = rootProject.version + (SNAPSHOT ? "-SNAPSHOT" : "")
 
     archivesBaseName = rootProject.archives_base_name
-    version = "${rootProject.mod_version}+mc${rootProject.minecraft_version}"
+    version = "${rootProject.mod_version}" + (SNAPSHOT ? "-SNAPSHOT" : "")
     group = rootProject.maven_group
 
     repositories {
@@ -48,6 +47,89 @@ allprojects {
     java {
         withSourcesJar()
     }
+
+    publishing {
+        repositories {
+            if (providers.environmentVariable("SAPS_TOKEN").isPresent()) {
+                maven {
+                    url "https://maven.saps.dev/${providers.environmentVariable("SNAPSHOT").map { "snapshots" }.getOrElse("releases")}"
+                    credentials {
+                        username = "errormikey"
+                        password = "${providers.environmentVariable("SAPS_TOKEN").get()}"
+                    }
+                }
+            }
+        }
+    }
 }
 
-task curseforgePublish
+publishMods {
+    dryRun = providers.environmentVariable("CURSE_TOKEN").getOrNull() == null
+    changelog = file("./CHANGELOG.md").text
+    version = "${mod_version}"
+    type = STABLE
+
+    def fabricOptions = publishOptions {
+        file = project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile }
+        displayName = "[FABRIC][${rootProject.minecraft_version}] ${project.name} ${mod_version}"
+        modLoaders.add("fabric")
+    }
+
+    def forgeOptions = publishOptions {
+        file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
+        displayName = "[FORGE][${rootProject.minecraft_version}] ${project.name} ${mod_version}"
+        modLoaders.add("neoforge")
+    }
+
+    def curseForgeOptions = curseforgeOptions {
+        accessToken = providers.environmentVariable("CURSE_TOKEN")
+        projectId = "${curseforge_id}"
+        minecraftVersions.add("${minecraft_version}")
+    }
+
+    def modrinthOptions = modrinthOptions {
+        accessToken = providers.environmentVariable("MODRINTH_TOKEN")
+        projectId = "${modrinth_id}"
+        minecraftVersions.add("${minecraft_version}")
+    }
+
+    curseforge("curseforgeFabric") {
+        from(curseForgeOptions, fabricOptions)
+        requires {
+            slug = "architectury-api"
+            slug = "fabric-api"
+        }
+    }
+
+    curseforge("curseforgeForge") {
+        from(curseForgeOptions, forgeOptions)
+        requires {
+            slug = "architectury-api"
+        }
+    }
+
+    modrinth("modrinthFabric") {
+        from(modrinthOptions, fabricOptions)
+        requires {
+            slug = "architectury-api"
+            slug = "fabric-api"
+        }
+    }
+
+    modrinth("modrinthForge") {
+        from(modrinthOptions, forgeOptions)
+        requires {
+            slug = "architectury-api"
+        }
+    }
+
+    github {
+        file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
+        additionalFiles.from project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile }
+
+        repository = "${project.github_repo}"
+        accessToken = providers.environmentVariable("GITHUB_TOKEN")
+        commitish = providers.environmentVariable("GITHUB_SHA").orElse("dryRun")
+        tagName = providers.environmentVariable("GITHUB_REF_NAME").orElse("dryRun")
+    }
+}

common/build.gradle

@@ -17,20 +17,6 @@ publishing {
         mavenCommon(MavenPublication) {
             artifactId = "${rootProject.archivesBaseName}-${project.name}"
             from components.java
-
-            version = MAVEN_VERSION
-        }
-    }
-
-    repositories {
-        if (ENV.SAPS_TOKEN) {
-            maven {
-                url MAVEN_URL
-                credentials {
-                    username = "errormikey"
-                    password = "${ENV.SAPS_TOKEN}"
-                }
-            }
         }
     }
 }

fabric/build.gradle

@@ -1,6 +1,5 @@
 plugins {
     id "com.github.johnrengelman.shadow" version "7.1.2"
-    id "com.matthewprenger.cursegradle" version "1.4.0"
 }
 
 architectury {
@@ -42,19 +41,19 @@ shadowJar {
     exclude "architectury.common.json"
 
     configurations = [project.configurations.shadowCommon]
-    classifier "dev-shadow"
+    setArchiveClassifier "dev-shadow"
 }
 
 remapJar {
     injectAccessWidener = true
     input.set shadowJar.archiveFile
     dependsOn shadowJar
-    classifier null
+    setArchiveClassifier null
     setArchivesBaseName("${rootProject.archivesBaseName}-${project.name}") // adds fabric to the maven and curse name
 }
 
 jar {
-    classifier "dev"
+    setArchiveClassifier "dev"
 }
 
 sourcesJar {
@@ -74,38 +73,6 @@ publishing {
         mavenFabric(MavenPublication) {
             artifactId = "${rootProject.archivesBaseName}-${project.name}" // adds fabric or forge to the maven name
             from components.java
-
-            version = MAVEN_VERSION
-        }
-    }
-
-    repositories {
-        if (ENV.SAPS_TOKEN) {
-            maven {
-                url MAVEN_URL
-                credentials {
-                    username = "errormikey"
-                    password = "${ENV.SAPS_TOKEN}"
-                }
-            }
         }
     }
 }
-
-if (ENV.CURSEFORGE_KEY) {
-    curseforge {
-        apiKey = ENV.CURSEFORGE_KEY
-        project {
-            id = rootProject.curseforge_id
-            releaseType = "beta"
-            addGameVersion "Fabric"
-            addGameVersion "Java 17"
-            addGameVersion rootProject.minecraft_version
-            mainArtifact(remapJar.archiveFile)
-            changelog = file("./../CHANGELOG.md")
-            changelogType = 'markdown'
-        }
-    }
-}
-
-rootProject.tasks.curseforgePublish.dependsOn tasks.curseforge

forge/build.gradle

@@ -1,6 +1,5 @@
 plugins {
     id "com.github.johnrengelman.shadow" version "7.1.2"
-    id "com.matthewprenger.cursegradle" version "1.4.0"
 }
 
 architectury {
@@ -56,18 +55,18 @@ shadowJar {
     exclude "architectury.common.json"
 
     configurations = [project.configurations.shadowCommon]
-    classifier "dev-shadow"
+    setArchiveClassifier "dev-shadow"
 }
 
 remapJar {
     input.set shadowJar.archiveFile
     dependsOn shadowJar
-    classifier null
+    setArchiveClassifier null
     setArchivesBaseName("${rootProject.archivesBaseName}-${project.name}") // adds fabric to the maven and curse name
 }
 
 jar {
-    classifier "dev"
+    setArchiveClassifier "dev"
 }
 
 sourcesJar {
@@ -87,38 +86,6 @@ publishing {
         mavenForge(MavenPublication) {
             artifactId = "${rootProject.archivesBaseName}-${project.name}"
             from components.java
-
-            version = MAVEN_VERSION
-        }
-    }
-
-    repositories {
-        if (ENV.SAPS_TOKEN) {
-            maven {
-                url MAVEN_URL
-                credentials {
-                    username = "errormikey"
-                    password = "${ENV.SAPS_TOKEN}"
-                }
-            }
         }
     }
 }
-
-if (ENV.CURSEFORGE_KEY) {
-    curseforge {
-        apiKey = ENV.CURSEFORGE_KEY
-        project {
-            id = rootProject.curseforge_id
-            releaseType = "release"
-            addGameVersion "Forge"
-            addGameVersion "Java 8"
-            addGameVersion rootProject.minecraft_version
-            mainArtifact(remapJar.archiveFile)
-            changelog = file("./../CHANGELOG.md")
-            changelogType = 'markdown'
-        }
-    }
-}
-
-rootProject.tasks.curseforgePublish.dependsOn tasks.curseforge

gradle.properties

@@ -4,13 +4,14 @@ minecraft_version=1.16.5
 enabled_platforms=fabric,forge
 
 archives_base_name=accelerated-decay
-mod_version=0.1.3
+mod_version=69.0.0
 maven_group=pro.mikey.mods
 
-architectury_version=4.10.88
-
 fabric_loader_version=0.14.9
 fabric_api_version=0.42.0+1.16
 
 forge_version=1.16.5-36.2.39
+
 curseforge_id=699872
+modrinth_id=laX5CckD
+github_repo=ErrorMikey/AcceleratedDecay

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists