Merge branch 'mc/1.21'

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Set up JDK  17
         uses: actions/setup-java@v2
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2

.github/workflows/release.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Set up JDK  17
         uses: actions/setup-java@v2
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
@@ -23,4 +23,4 @@ jobs:
           SAPS_TOKEN: ${{ secrets.SAPS_TOKEN }}
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CURSE_TOKEN: ${{ secrets.CURSEFORGE_KEY }}
+          CURSE_TOKEN: ${{ secrets.CURSE_DEPLOY }}

CHANGELOG.md

@@ -1,5 +1,12 @@
-## [84.0.0]
+## [21.0.0]
 
 ### Changed
 
-- Ported to 1.20.4
+- Ported to 1.21
+- Switched to using the `Neoforge` version scheme meaning we've switched from 86.0.0 to 21.0.0... Sorry for the confusion... I don't like it either.
+
+## [86.0.0]
+
+### Changed
+
+- Ported to 1.20.6

build.gradle

@@ -1,7 +1,8 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false
-    id "me.modmuss50.mod-publish-plugin" version "0.4.5"
+    id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
+    id "me.modmuss50.mod-publish-plugin" version "0.5.1"
+    id 'pro.mikey.plugins.insaniam' version "0.1-SNAPSHOT"
 }
 
 architectury {
@@ -51,35 +52,36 @@ allprojects {
 
     tasks.withType(JavaCompile) {
         options.encoding = "UTF-8"
-        options.release = 17
+        options.release = 21
     }
 
     java {
         withSourcesJar()
     }
 }
 
+def changelogData = insaniamUtils.createChangelog {
+    file = file('CHANGELOG.md')
+    versionPattern = ~/## \[[^]]+]/
+    fallbackValue = "No changelog provided"
+    version = project.mod_version
+}
+
 publishMods {
     dryRun = providers.environmentVariable("CURSE_TOKEN").getOrNull() == null
-    changelog = file("./CHANGELOG.md").text
+    changelog = changelogData
     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}"
+        displayName = "[FABRIC] ${project.name} ${mod_version}"
         modLoaders.add("fabric")
     }
 
     def neoforgeOptions = publishOptions {
         file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
-        displayName = "[NEOFORGE][${rootProject.minecraft_version}] ${project.name} ${mod_version}"
-        modLoaders.add("forge")
-    }
-
-    def forgeOptions = publishOptions {
-        file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
-        displayName = "[FORGE][${rootProject.minecraft_version}] ${project.name} ${mod_version}"
+        displayName = "[NEOFORGE] ${project.name} ${mod_version}"
         modLoaders.add("neoforge")
     }
 
@@ -110,13 +112,6 @@ publishMods {
         }
     }
 
-    curseforge("curseforgeForge") {
-        from(curseForgeOptions, forgeOptions)
-        requires {
-            slug = "architectury-api"
-        }
-    }
-
     modrinth("modrinthFabric") {
         from(modrinthOptions, fabricOptions)
         requires {
@@ -125,24 +120,17 @@ publishMods {
         }
     }
 
-    modrinth("modrinthForge") {
-        from(modrinthOptions, neoforgeOptions)
-        requires {
-            slug = "architectury-api"
-        }
-    }
 
     modrinth("modrinthNeoforge") {
-        from(modrinthOptions, forgeOptions)
+        from(modrinthOptions, neoforgeOptions)
         requires {
             slug = "architectury-api"
         }
     }
 
     github {
-        file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
         additionalFiles.from project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile }
-        additionalFiles.from project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
+        file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
 
         repository = "${project.github_repo}"
         accessToken = providers.environmentVariable("GITHUB_TOKEN")

common/build.gradle

@@ -9,7 +9,7 @@ loom {
 dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
 
-    modApi "dev.architectury:architectury:${rootProject.architectury_version}"
+    modApi "dev.architectury:architectury:${rootProject.architectury_api_version}"
 }
 
 publishing {

fabric/build.gradle

@@ -23,7 +23,7 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
     modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
     // Remove the next line if you don't want to depend on the API
-    modApi "dev.architectury:architectury-fabric:${rootProject.architectury_version}"
+    modApi "dev.architectury:architectury-fabric:${rootProject.architectury_api_version}"
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }

fabric/src/main/resources/fabric.mod.json

@@ -6,8 +6,8 @@
   "description": "Speeds up leaf decay",
   "authors": ["ErrorMikey"],
   "contact": {
-    "homepage": "https://github.com/errormikey/accelerated-decay",
-    "sources": "https://github.com/errormikey/accelerated-decay"
+    "homepage": "https://github.com/Nanite/AcceleratedDecay",
+    "sources": "https://github.com/Nanite/AcceleratedDecay"
   },
   "license": "GPL3",
   "icon": "assets/AcceleratedDecay/icon.png",
@@ -21,7 +21,7 @@
   ],
   "depends": {
     "fabric": "*",
-    "minecraft": ">=1.20.1",
-    "architectury": ">=9.1.12"
+    "minecraft": ">=1.21",
+    "architectury": ">=13.0.0"
   }
 }

gradle.properties

@@ -1,18 +1,17 @@
 org.gradle.jvmargs=-Xmx2048M
 
-minecraft_version=1.20.4
-enabled_platforms=fabric,forge,neoforge
+minecraft_version=1.21
+enabled_platforms=fabric,neoforge
 
 archives_base_name=accelerated-decay
-mod_version=84.0.0
+mod_version=21.0.0
 maven_group=pro.mikey.mods
 
-fabric_loader_version=0.15.3
-fabric_api_version=0.92.0+1.20.4
-forge_version=49.0.12
-neoforge_version=20.4.62-beta
+fabric_loader_version=0.15.11
+fabric_api_version=0.100.1+1.21
+neoforge_version=21.0.10-beta
 
-architectury_version=11.0.9
+architectury_api_version=13.0.1
 
 curseforge_id=699872
 modrinth_id=laX5CckD

gradle/wrapper/gradle-wrapper.properties

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

neoforge/build.gradle

@@ -29,7 +29,7 @@ configurations {
 dependencies {
     neoForge "net.neoforged:neoforge:${rootProject.neoforge_version}"
     // Remove the next line if you don't want to depend on the API
-    modApi "dev.architectury:architectury-neoforge:${rootProject.architectury_version}"
+    modApi "dev.architectury:architectury-neoforge:${rootProject.architectury_api_version}"
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionNeoForge")) { transitive = false }
@@ -38,7 +38,7 @@ dependencies {
 processResources {
     inputs.property "version", project.version
 
-    filesMatching("META-INF/mods.toml") {
+    filesMatching("META-INF/neoforge.mods.toml") {
         expand "version": project.version
     }
 }