feat: port to 1.20.5

.github/workflows/build-release.yml

@@ -11,10 +11,10 @@ jobs:
       !contains(github.event.head_commit.message, '[ciskip]')
     uses: nanite/workflows/.github/workflows/[email protected]
     with:
-      java-version: 17
+      java-version: 21
       changelog-file: "./CHANGELOG.md"
       release-to-github: false
     secrets:
       nanite-token: ${{ secrets.NANITE_DEPLOY }}
       curse-token: ${{ secrets.CURSE_DEPLOY }}
-      modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+      modrinth-token: ${{ secrets.MODRINTH_TOKEN }}

CHANGELOG.md

@@ -1,5 +1,5 @@
-## 6.0.0
+## 7.0.0
 
 ### Changed
 
-- Updated to 1.20.4
+- Updated to 1.20.5

build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id "architectury-plugin" version "3.4.151"
-    id "dev.architectury.loom" version "1.4.373" apply false
+    id "architectury-plugin" version "3.4-SNAPSHOT"
+    id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
     id "me.modmuss50.mod-publish-plugin" version "0.4.5"
 }
 
@@ -56,7 +56,7 @@ allprojects {
 
     tasks.withType(JavaCompile) {
         options.encoding = "UTF-8"
-        options.release = 17
+        options.release = 21
     }
 
     java {
@@ -90,11 +90,11 @@ publishMods {
         modLoaders.add("fabric")
     }
 
-    def forgeOptions = publishOptions {
-        file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
-        displayName = "[FORGE][${minecraft_version}] ${project.name} ${mod_version}"
-        modLoaders.add("forge")
-    }
+//    def forgeOptions = publishOptions {
+//        file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
+//        displayName = "[FORGE][${minecraft_version}] ${project.name} ${mod_version}"
+//        modLoaders.add("forge")
+//    }
 
     def neoforgeOptions = publishOptions {
         file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
@@ -127,15 +127,15 @@ publishMods {
         }
     }
 
-    curseforge("curseforgeForge") {
-        from(curseForgeOptions, forgeOptions)
-        requires {
-            slug = "cloth-config"
-        }
-        requires {
-            slug = "architectury-api"
-        }
-    }
+//    curseforge("curseforgeForge") {
+//        from(curseForgeOptions, forgeOptions)
+//        requires {
+//            slug = "cloth-config"
+//        }
+//        requires {
+//            slug = "architectury-api"
+//        }
+//    }
 
     curseforge("curseforgeNeoforge") {
         from(curseForgeOptions, neoforgeOptions)
@@ -162,15 +162,15 @@ publishMods {
             }
         }
 
-        modrinth("modrinthForge") {
-            from(modrinthOptions, forgeOptions)
-            requires {
-                slug = "cloth-config"
-            }
-            requires {
-                slug = "architectury-api"
-            }
-        }
+//        modrinth("modrinthForge") {
+//            from(modrinthOptions, forgeOptions)
+//            requires {
+//                slug = "cloth-config"
+//            }
+//            requires {
+//                slug = "architectury-api"
+//            }
+//        }
 
         modrinth("modrinthNeoforge") {
             from(modrinthOptions, neoforgeOptions)

gradle.properties

@@ -1,25 +1,26 @@
 org.gradle.jvmargs=-Xmx3G
 
-minecraft_version=1.20.4
-enabled_platforms=fabric,forge,neoforge
+minecraft_version=1.20.5
+#forge
+enabled_platforms=fabric,neoforge
 
 archives_base_name=SimpleDiscordRichPresence
-mod_version=6.0.0
+mod_version=7.0.0
 maven_group=com.sunekaer.mods
 
 curseforge_id=334853
 modrinth_id=SCAopByd
 maven_url=https://maven.nanite.dev/
 
-architectury_version=11.0.8
+architectury_version=12.0.28
 
-fabric_loader_version=0.15.2
-fabric_api_version=0.91.3+1.20.4
+fabric_loader_version=0.15.11
+fabric_api_version=0.97.8+1.20.5
 
 forge_version=49.0.9
-neoforge_version=20.4.43-beta
+neoforge_version=20.5.21-beta
 
 #kubejs_version=2001.6.4-build.114
 #rhino_version=1902.2.3-build.284
 
-cloth_config_version=13.0.114
+cloth_config_version=14.0.126

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

@@ -45,7 +45,7 @@ dependencies {
 processResources {
     inputs.property "version", project.version
 
-    filesMatching("META-INF/mods.toml") {
+    filesMatching("META-INF/neoforge.mods.toml") {
         expand "version": project.version
     }
 }

neoforge/src/main/resources/META-INF/mods.toml → neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[1,)"
+loaderVersion = "[2,)"
 issueTrackerURL="https://github.com/Sunekaer/Simple-Discord-Rich-Presence/issues"
 license="All Rights Reserved"
 
@@ -18,14 +18,14 @@ Simple Discord Rich Presence
 [[dependencies.sdrp]]
 modId = "neoforge"
 type = "required"
-versionRange = "[20.4,)"
+versionRange = "[20.5,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.sdrp]]
 modId = "minecraft"
 type = "required"
-versionRange = "[1.20.4,)"
+versionRange = "[1.20.5,)"
 ordering = "NONE"
 side = "BOTH"
 

settings.gradle

@@ -1,13 +1,13 @@
 pluginManagement {
     repositories {
-        maven { url "https://maven.saps.dev/mirror" }
-        maven { url "https://maven.fabricmc.net/" }
         maven { url "https://maven.architectury.dev/" }
+        maven { url "https://maven.fabricmc.net/" }
         maven { url "https://maven.minecraftforge.net/" }
         gradlePluginPortal()
     }
 }
 
-include("common", "fabric", "forge", "neoforge")
+// forge
+include("common", "fabric", "neoforge")
 
 rootProject.name = "SimpleDiscordRichPresence"