From 457a0a69bfa046fa12f95dd3d721c0c82f5d971c Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Tue, 17 Jun 2025 15:54:23 +0200
Subject: [PATCH] Bump version string and protocol version to 1.21.6 release
 Notably, this does not bump the world data version. This will be left for
 when the actual Vanilla base is updated, just in case. This early bump will
 likely be the exception for more ironed out update previews in the future.

---
 .../patches/features/0032-1.21.6-patch.patch  | 55 +++++++++++++++++++
 .../patches/resources/version.json.patch      | 23 ++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 paper-server/patches/features/0032-1.21.6-patch.patch
 create mode 100644 paper-server/patches/resources/version.json.patch

diff --git a/paper-server/patches/features/0032-1.21.6-patch.patch b/paper-server/patches/features/0032-1.21.6-patch.patch
new file mode 100644
index 0000000000..f137c84c35
--- /dev/null
+++ b/paper-server/patches/features/0032-1.21.6-patch.patch
@@ -0,0 +1,55 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nassim Jahnke <nassim@njahnke.dev>
+Date: Tue, 17 Jun 2025 04:53:03 +0200
+Subject: [PATCH] 1.21.6 patch
+
+
+diff --git a/net/minecraft/DetectedVersion.java b/net/minecraft/DetectedVersion.java
+index 08d96a04e49f5c17d85c9015693a8ef4e6a476c6..d2fde575226633ad00446b44222a39b9f3d25952 100644
+--- a/net/minecraft/DetectedVersion.java
++++ b/net/minecraft/DetectedVersion.java
+@@ -20,13 +20,13 @@ public class DetectedVersion {
+     private static WorldVersion createFromConstants() {
+         return new WorldVersion.Simple(
+             UUID.randomUUID().toString().replaceAll("-", ""),
+-            "1.21.6-rc1",
++            "1.21.6",
+             new DataVersion(4434, "main"),
+             SharedConstants.getProtocolVersion(),
+             63,
+             80,
+             new Date(),
+-            false
++            true
+         );
+     }
+ 
+diff --git a/net/minecraft/SharedConstants.java b/net/minecraft/SharedConstants.java
+index fdb3fc9b610f013d0e13936316fbba6c19bb21b0..dbb7414895e3720bd02083826ef60fdfc3f96398 100644
+--- a/net/minecraft/SharedConstants.java
++++ b/net/minecraft/SharedConstants.java
+@@ -10,13 +10,13 @@ import net.minecraft.world.level.ChunkPos;
+ 
+ public class SharedConstants {
+     @Deprecated
+-    public static final boolean SNAPSHOT = true;
++    public static final boolean SNAPSHOT = false;
+     @Deprecated
+     public static final int WORLD_VERSION = 4434;
+     @Deprecated
+     public static final String SERIES = "main";
+     @Deprecated
+-    public static final String VERSION_STRING = "1.21.6-rc1";
++    public static final String VERSION_STRING = "1.21.6";
+     @Deprecated
+     public static final int RELEASE_NETWORK_PROTOCOL_VERSION = 771;
+     @Deprecated
+@@ -165,7 +165,7 @@ public class SharedConstants {
+     }
+ 
+     public static int getProtocolVersion() {
+-        return 1073742080;
++        return RELEASE_NETWORK_PROTOCOL_VERSION;
+     }
+ 
+     public static boolean debugVoidTerrain(ChunkPos chunkPos) {
diff --git a/paper-server/patches/resources/version.json.patch b/paper-server/patches/resources/version.json.patch
new file mode 100644
index 0000000000..00e1d92ba5
--- /dev/null
+++ b/paper-server/patches/resources/version.json.patch
@@ -0,0 +1,23 @@
+--- a/version.json
++++ b/version.json
+@@ -1,9 +_,9 @@
+ {
+-    "id": "1.21.6-rc1",
+-    "name": "1.21.6 Release Candidate 1",
++    "id": "1.21.6",
++    "name": "1.21.6",
+     "world_version": 4434,
+     "series_id": "main",
+-    "protocol_version": 1073742080,
++    "protocol_version": 771,
+     "pack_version": {
+         "resource": 63,
+         "data": 80
+@@ -11,6 +_,6 @@
+     "build_time": "2025-06-12T12:01:32+00:00",
+     "java_component": "java-runtime-delta",
+     "java_version": 21,
+-    "stable": false,
++    "stable": true,
+     "use_editor": false
+ }