Minecraft 1.21 support

SpigotMC · Jun 13, 2024 · 8a88ce4 · 8a88ce4
1 parent 006a14a
commit 8a88ce4
Show file tree

Hide file tree

Showing 21 changed files with 47 additions and 45 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.20-R0.3-SNAPSHOT</version>
+        <version>1.21-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-api</artifactId>
-    <version>1.20-R0.3-SNAPSHOT</version>
+    <version>1.21-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-API</name>

diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.20-R0.3-SNAPSHOT</version>
+        <version>1.21-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-bootstrap</artifactId>
-    <version>1.20-R0.3-SNAPSHOT</version>
+    <version>1.21-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Bootstrap</name>

diff --git a/chat/pom.xml b/chat/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.20-R0.3-SNAPSHOT</version>
+        <version>1.21-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-chat</artifactId>
-    <version>1.20-R0.3-SNAPSHOT</version>
+    <version>1.21-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Chat</name>

diff --git a/config/pom.xml b/config/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.20-R0.3-SNAPSHOT</version>
+        <version>1.21-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-config</artifactId>
-    <version>1.20-R0.3-SNAPSHOT</version>
+    <version>1.21-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Config</name>

diff --git a/event/pom.xml b/event/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.20-R0.3-SNAPSHOT</version>
+        <version>1.21-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-event</artifactId>
-    <version>1.20-R0.3-SNAPSHOT</version>
+    <version>1.21-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Event</name>

diff --git a/log/pom.xml b/log/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.20-R0.3-SNAPSHOT</version>
+        <version>1.21-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-log</artifactId>
-    <version>1.20-R0.3-SNAPSHOT</version>
+    <version>1.21-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Log</name>

diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-module</artifactId>
-        <version>1.20-R0.3-SNAPSHOT</version>
+        <version>1.21-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-module-cmd-alert</artifactId>
-    <version>1.20-R0.3-SNAPSHOT</version>
+    <version>1.21-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>cmd_alert</name>

diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-module</artifactId>
-        <version>1.20-R0.3-SNAPSHOT</version>
+        <version>1.21-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-module-cmd-find</artifactId>
-    <version>1.20-R0.3-SNAPSHOT</version>
+    <version>1.21-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>cmd_find</name>

diff --git a/module/cmd-kick/pom.xml b/module/cmd-kick/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-module</artifactId>
-        <version>1.20-R0.3-SNAPSHOT</version>
+        <version>1.21-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-module-cmd-kick</artifactId>
-    <version>1.20-R0.3-SNAPSHOT</version>
+    <version>1.21-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>cmd_kick</name>

diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-module</artifactId>
-        <version>1.20-R0.3-SNAPSHOT</version>
+        <version>1.21-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-module-cmd-list</artifactId>
-    <version>1.20-R0.3-SNAPSHOT</version>
+    <version>1.21-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>cmd_list</name>

diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-module</artifactId>
-        <version>1.20-R0.3-SNAPSHOT</version>
+        <version>1.21-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-module-cmd-send</artifactId>
-    <version>1.20-R0.3-SNAPSHOT</version>
+    <version>1.21-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>cmd_send</name>

diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-module</artifactId>
-        <version>1.20-R0.3-SNAPSHOT</version>
+        <version>1.21-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-module-cmd-server</artifactId>
-    <version>1.20-R0.3-SNAPSHOT</version>
+    <version>1.21-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>cmd_server</name>

diff --git a/module/pom.xml b/module/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.20-R0.3-SNAPSHOT</version>
+        <version>1.21-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-module</artifactId>
-    <version>1.20-R0.3-SNAPSHOT</version>
+    <version>1.21-R0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>BungeeCord Modules</name>

diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-module</artifactId>
-        <version>1.20-R0.3-SNAPSHOT</version>
+        <version>1.21-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-module-reconnect-yaml</artifactId>
-    <version>1.20-R0.3-SNAPSHOT</version>
+    <version>1.21-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>reconnect_yaml</name>

diff --git a/native/pom.xml b/native/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.20-R0.3-SNAPSHOT</version>
+        <version>1.21-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-native</artifactId>
-    <version>1.20-R0.3-SNAPSHOT</version>
+    <version>1.21-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Native</name>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-parent</artifactId>
-    <version>1.20-R0.3-SNAPSHOT</version>
+    <version>1.21-R0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>BungeeCord-Parent</name>

diff --git a/protocol/pom.xml b/protocol/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.20-R0.3-SNAPSHOT</version>
+        <version>1.21-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-protocol</artifactId>
-    <version>1.20-R0.3-SNAPSHOT</version>
+    <version>1.21-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Protocol</name>

diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
@@ -46,7 +46,7 @@ public class ProtocolConstants
     public static final int MINECRAFT_1_20_2 = 764;
     public static final int MINECRAFT_1_20_3 = 765;
     public static final int MINECRAFT_1_20_5 = 766;
-    public static final int MINECRAFT_1_21 = 1073742027;
+    public static final int MINECRAFT_1_21 = 767;
     public static final List<String> SUPPORTED_VERSIONS;
     public static final List<Integer> SUPPORTED_VERSION_IDS;
 
@@ -65,7 +65,8 @@ public class ProtocolConstants
                 "1.17.x",
                 "1.18.x",
                 "1.19.x",
-                "1.20.x"
+                "1.20.x",
+                "1.21.x"
         );
         ImmutableList.Builder<Integer> supportedVersionIds = ImmutableList.<Integer>builder().add(
                 ProtocolConstants.MINECRAFT_1_8,
@@ -106,13 +107,14 @@ public class ProtocolConstants
                 ProtocolConstants.MINECRAFT_1_20,
                 ProtocolConstants.MINECRAFT_1_20_2,
                 ProtocolConstants.MINECRAFT_1_20_3,
-                ProtocolConstants.MINECRAFT_1_20_5
+                ProtocolConstants.MINECRAFT_1_20_5,
+                ProtocolConstants.MINECRAFT_1_21
         );
 
         if ( SNAPSHOT_SUPPORT )
         {
-            supportedVersions.add( "1.21.x" );
-            supportedVersionIds.add( ProtocolConstants.MINECRAFT_1_21 );
+            // supportedVersions.add( "1.21.x" );
+            // supportedVersionIds.add( ProtocolConstants.MINECRAFT_1_21 );
         }
 
         SUPPORTED_VERSIONS = supportedVersions.build();

diff --git a/proxy/pom.xml b/proxy/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.20-R0.3-SNAPSHOT</version>
+        <version>1.21-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-proxy</artifactId>
-    <version>1.20-R0.3-SNAPSHOT</version>
+    <version>1.21-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Proxy</name>
@@ -108,7 +108,7 @@
         <dependency>
             <groupId>com.mysql</groupId>
             <artifactId>mysql-connector-j</artifactId>
-            <version>8.3.0</version>
+            <version>8.4.0</version>
             <scope>runtime</scope>
         </dependency>
         <!-- add these back in as they are not exposed by the API -->

diff --git a/query/pom.xml b/query/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.20-R0.3-SNAPSHOT</version>
+        <version>1.21-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-query</artifactId>
-    <version>1.20-R0.3-SNAPSHOT</version>
+    <version>1.21-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Query</name>

diff --git a/slf4j/pom.xml b/slf4j/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.20-R0.3-SNAPSHOT</version>
+        <version>1.21-R0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-slf4j</artifactId>
-    <version>1.20-R0.3-SNAPSHOT</version>
+    <version>1.21-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-SLF4J</name>