From 6a715770e21d0569d00e50b8ab4eea7a9c8518be Mon Sep 17 00:00:00 2001
From: onebeastchris <github@onechris.mozmail.com>
Date: Thu, 13 Jun 2024 23:20:43 +0200
Subject: [PATCH] Update mod dependencies to their official 1.21 releases

---
 .../mod/fabric/src/main/resources/fabric.mod.json      |  4 ++--
 .../src/main/resources/META-INF/neoforge.mods.toml     |  4 ++--
 .../main/kotlin/geyser.modded-conventions.gradle.kts   | 10 ++--------
 gradle/libs.versions.toml                              |  4 ++--
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/bootstrap/mod/fabric/src/main/resources/fabric.mod.json b/bootstrap/mod/fabric/src/main/resources/fabric.mod.json
index 93f48b73c..262f9833a 100644
--- a/bootstrap/mod/fabric/src/main/resources/fabric.mod.json
+++ b/bootstrap/mod/fabric/src/main/resources/fabric.mod.json
@@ -23,8 +23,8 @@
     "geyser.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.15.10",
+    "fabricloader": ">=0.15.11",
     "fabric": "*",
-    "minecraft": ">=1.20.5"
+    "minecraft": ">=1.21"
   }
 }
diff --git a/bootstrap/mod/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/bootstrap/mod/neoforge/src/main/resources/META-INF/neoforge.mods.toml
index 3a25f6119..fa01bb6ec 100644
--- a/bootstrap/mod/neoforge/src/main/resources/META-INF/neoforge.mods.toml
+++ b/bootstrap/mod/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -14,12 +14,12 @@ config = "geyser.mixins.json"
 [[dependencies.geyser_neoforge]]
     modId="neoforge"
     type="required"
-    versionRange="[20.5.0-beta,)"
+    versionRange="[21.0.0-beta,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.geyser_neoforge]]
     modId="minecraft"
     type="required"
-    versionRange="[1.20.5,)"
+    versionRange="[1.21,)"
     ordering="NONE"
     side="BOTH"
\ No newline at end of file
diff --git a/build-logic/src/main/kotlin/geyser.modded-conventions.gradle.kts b/build-logic/src/main/kotlin/geyser.modded-conventions.gradle.kts
index 6472e4312..86c2a2f6a 100644
--- a/build-logic/src/main/kotlin/geyser.modded-conventions.gradle.kts
+++ b/build-logic/src/main/kotlin/geyser.modded-conventions.gradle.kts
@@ -110,7 +110,7 @@ afterEvaluate {
 }
 
 dependencies {
-    minecraft("com.mojang:minecraft:1.21-rc1")
+    minecraft("com.mojang:minecraft:1.21")
     mappings(loom.officialMojangMappings())
 }
 
@@ -121,12 +121,6 @@ repositories {
     maven("https://oss.sonatype.org/content/repositories/snapshots/")
     maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
     maven("https://maven.neoforged.net/releases")
-    maven("https://prmaven.neoforged.net/NeoForge/pr1076") {
-        name = "Maven for 1.21 PR"
-        content {
-            includeModule("net.neoforged", "neoforge")
-        }
-    }
 }
 
 modrinth {
@@ -139,6 +133,6 @@ modrinth {
     syncBodyFrom.set(rootProject.file("README.md").readText())
 
     uploadFile.set(tasks.getByPath("remapModrinthJar"))
-    gameVersions.addAll("1.20.5", "1.20.6")
+    gameVersions.addAll("1.21")
     failSilently.set(true)
 }
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 10a94c3db..5e55aa117 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -28,11 +28,11 @@ commodore = "2.2"
 bungeecord = "a7c6ede"
 velocity = "3.3.0-SNAPSHOT"
 viaproxy = "3.2.1"
-fabric-minecraft = "1.21-rc1"
+fabric-minecraft = "1.21"
 fabric-loader = "0.15.11"
 fabric-api = "0.100.1+1.21"
 fabric-permissions = "0.2-SNAPSHOT"
-neoforge-minecraft = "21.0.0-alpha.1.21-rc1.20240611.001314"
+neoforge-minecraft = "21.0.0-beta"
 mixin = "0.8.5"
 
 # plugin versions