From 8a88ce464e0b107b15523109afd7810096e635ca Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 14 Jun 2024 01:05:00 +1000 Subject: [PATCH] Minecraft 1.21 support --- api/pom.xml | 4 ++-- bootstrap/pom.xml | 4 ++-- chat/pom.xml | 4 ++-- config/pom.xml | 4 ++-- event/pom.xml | 4 ++-- log/pom.xml | 4 ++-- module/cmd-alert/pom.xml | 4 ++-- module/cmd-find/pom.xml | 4 ++-- module/cmd-kick/pom.xml | 4 ++-- module/cmd-list/pom.xml | 4 ++-- module/cmd-send/pom.xml | 4 ++-- module/cmd-server/pom.xml | 4 ++-- module/pom.xml | 4 ++-- module/reconnect-yaml/pom.xml | 4 ++-- native/pom.xml | 4 ++-- pom.xml | 2 +- protocol/pom.xml | 4 ++-- .../net/md_5/bungee/protocol/ProtocolConstants.java | 12 +++++++----- proxy/pom.xml | 6 +++--- query/pom.xml | 4 ++-- slf4j/pom.xml | 4 ++-- 21 files changed, 47 insertions(+), 45 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 4f520c31..57c96a42 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-parent - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-api - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT jar BungeeCord-API diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml index 91061700..ff27b54e 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-parent - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-bootstrap - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT jar BungeeCord-Bootstrap diff --git a/chat/pom.xml b/chat/pom.xml index 4239d5a1..71c4ce27 100644 --- a/chat/pom.xml +++ b/chat/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-parent - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-chat - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT jar BungeeCord-Chat diff --git a/config/pom.xml b/config/pom.xml index e7a474c6..4b94f112 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-parent - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-config - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT jar BungeeCord-Config diff --git a/event/pom.xml b/event/pom.xml index 1f36ab90..84711f0f 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-parent - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-event - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT jar BungeeCord-Event diff --git a/log/pom.xml b/log/pom.xml index 1e2f2e96..0091af13 100644 --- a/log/pom.xml +++ b/log/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-parent - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-log - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT jar BungeeCord-Log diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml index 62e1f137..fd6bb27e 100644 --- a/module/cmd-alert/pom.xml +++ b/module/cmd-alert/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-module - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-module-cmd-alert - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT jar cmd_alert diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml index 5ca1b4c3..a679a54a 100644 --- a/module/cmd-find/pom.xml +++ b/module/cmd-find/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-module - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-module-cmd-find - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT jar cmd_find diff --git a/module/cmd-kick/pom.xml b/module/cmd-kick/pom.xml index 2a498c05..8f79be48 100644 --- a/module/cmd-kick/pom.xml +++ b/module/cmd-kick/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-module - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-module-cmd-kick - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT jar cmd_kick diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml index 99090af7..39e7b998 100644 --- a/module/cmd-list/pom.xml +++ b/module/cmd-list/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-module - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-module-cmd-list - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT jar cmd_list diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml index 5aee8173..fe51d004 100644 --- a/module/cmd-send/pom.xml +++ b/module/cmd-send/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-module - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-module-cmd-send - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT jar cmd_send diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml index d33200e2..bc1409aa 100644 --- a/module/cmd-server/pom.xml +++ b/module/cmd-server/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-module - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-module-cmd-server - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT jar cmd_server diff --git a/module/pom.xml b/module/pom.xml index 21ba8f2b..cea355bd 100644 --- a/module/pom.xml +++ b/module/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-parent - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-module - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT pom BungeeCord Modules diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml index e3a077f3..f1fb430a 100644 --- a/module/reconnect-yaml/pom.xml +++ b/module/reconnect-yaml/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-module - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-module-reconnect-yaml - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT jar reconnect_yaml diff --git a/native/pom.xml b/native/pom.xml index 56d505ab..bd3a8ab8 100644 --- a/native/pom.xml +++ b/native/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-parent - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-native - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT jar BungeeCord-Native diff --git a/pom.xml b/pom.xml index 03c222fb..7335e8b7 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ net.md-5 bungeecord-parent - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT pom BungeeCord-Parent diff --git a/protocol/pom.xml b/protocol/pom.xml index 6f5acbc2..d697cea8 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-parent - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-protocol - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT jar BungeeCord-Protocol 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 index 8f76a4ad..82ef4c5d 100644 --- 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 SUPPORTED_VERSIONS; public static final List 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 supportedVersionIds = ImmutableList.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 index 3729633c..764ae27d 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-parent - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-proxy - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT jar BungeeCord-Proxy @@ -108,7 +108,7 @@ com.mysql mysql-connector-j - 8.3.0 + 8.4.0 runtime diff --git a/query/pom.xml b/query/pom.xml index e07828dd..84c5f207 100644 --- a/query/pom.xml +++ b/query/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-parent - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-query - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT jar BungeeCord-Query diff --git a/slf4j/pom.xml b/slf4j/pom.xml index 3b944b85..5c611d8c 100644 --- a/slf4j/pom.xml +++ b/slf4j/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-parent - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-slf4j - 1.20-R0.3-SNAPSHOT + 1.21-R0.1-SNAPSHOT jar BungeeCord-SLF4J