From 82d68bfe9bee47dcd90723044d22841c5ca9f60f Mon Sep 17 00:00:00 2001
From: onebeastchris <github@onechris.mozmail.com>
Date: Thu, 13 Jun 2024 00:14:10 +0200
Subject: [PATCH] Bump fabric/neoforge dependencies to 1.21, update README.md,
 bump Geyser version to 2.4.0

---
 README.md                                             |  2 +-
 .../src/main/resources/META-INF/neoforge.mods.toml    |  2 +-
 .../main/kotlin/geyser.modded-conventions.gradle.kts  | 11 ++++++++---
 gradle.properties                                     |  2 +-
 gradle/libs.versions.toml                             |  8 ++++----
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index dd2d096ec..c45af73ed 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ The ultimate goal of this project is to allow Minecraft: Bedrock Edition users t
 
 Special thanks to the DragonProxy project for being a trailblazer in protocol translation and for all the team members who have joined us here!
 
-### Currently supporting Minecraft Bedrock 1.20.80 - 1.21.0 and Minecraft Java 1.20.5/1.20.6
+### Currently supporting Minecraft Bedrock 1.20.80 - 1.21.0 and Minecraft Java 1.21
 
 ## Setting Up
 Take a look [here](https://wiki.geysermc.org/geyser/setup/) for how to set up Geyser.
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 ff2823aa2..3a25f6119 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
@@ -20,6 +20,6 @@ config = "geyser.mixins.json"
 [[dependencies.geyser_neoforge]]
     modId="minecraft"
     type="required"
-    versionRange="[1.20.5,1.21)"
+    versionRange="[1.20.5,)"
     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 b75e9c5be..6472e4312 100644
--- a/build-logic/src/main/kotlin/geyser.modded-conventions.gradle.kts
+++ b/build-logic/src/main/kotlin/geyser.modded-conventions.gradle.kts
@@ -110,18 +110,23 @@ afterEvaluate {
 }
 
 dependencies {
-    minecraft("com.mojang:minecraft:1.20.5")
+    minecraft("com.mojang:minecraft:1.21-rc1")
     mappings(loom.officialMojangMappings())
 }
 
 repositories {
     // mavenLocal()
-    maven("https://repo.opencollab.dev/maven-releases/")
-    maven("https://repo.opencollab.dev/maven-snapshots/")
+    maven("https://repo.opencollab.dev/main")
     maven("https://jitpack.io")
     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 {
diff --git a/gradle.properties b/gradle.properties
index ea473906a..a222b1d99 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,5 +7,5 @@ org.gradle.vfs.watch=false
 
 group=org.geysermc
 id=geyser
-version=2.3.2-SNAPSHOT
+version=2.4.0-SNAPSHOT
 description=Allows for players from Minecraft: Bedrock Edition to join Minecraft: Java Edition servers.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index afd001220..11851a5cd 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.20.5"
-fabric-loader = "0.15.10"
-fabric-api = "0.97.6+1.20.5"
+fabric-minecraft = "1.21-rc1"
+fabric-loader = "0.15.11"
+fabric-api = "0.100.1+1.21"
 fabric-permissions = "0.2-SNAPSHOT"
-neoforge-minecraft = "20.5.0-beta"
+neoforge-minecraft = "21.0.0-alpha.1.21-rc1.20240611.001314"
 mixin = "0.8.5"
 
 # plugin versions