From 90573625f13b91aebd077136dade67637573a0e7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 9 Jun 2021 09:00:00 +1000 Subject: [PATCH] Minecraft 1.17 support --- .github/workflows/maven.yml | 2 +- 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-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 | 4 ++-- query/pom.xml | 4 ++-- slf4j/pom.xml | 4 ++-- 21 files changed, 45 insertions(+), 43 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index a865d1399..7e89fcdf9 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -9,7 +9,7 @@ jobs: strategy: fail-fast: false matrix: - java: [8, 11] + java: [8, 11, 16] name: Java ${{ matrix.java }} diff --git a/api/pom.xml b/api/pom.xml index 29c58dd8b..e64231f56 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-parent - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-api - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT jar BungeeCord-API diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml index 39816e7b2..f9dc01f45 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-parent - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-bootstrap - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT jar BungeeCord-Bootstrap diff --git a/chat/pom.xml b/chat/pom.xml index d7aca2adc..fb797b1eb 100644 --- a/chat/pom.xml +++ b/chat/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-parent - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-chat - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT jar BungeeCord-Chat diff --git a/config/pom.xml b/config/pom.xml index bfb82d529..4f3c17737 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-parent - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-config - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT jar BungeeCord-Config diff --git a/event/pom.xml b/event/pom.xml index 6c26e547b..3a9c76345 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-parent - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-event - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT jar BungeeCord-Event diff --git a/log/pom.xml b/log/pom.xml index fd735eb7b..6d6242e1d 100644 --- a/log/pom.xml +++ b/log/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-parent - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-log - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT jar BungeeCord-Log diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml index 7d912e902..4b3a82ea9 100644 --- a/module/cmd-alert/pom.xml +++ b/module/cmd-alert/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-module - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-module-cmd-alert - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT jar cmd_alert diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml index c8f2353fa..1c7f2515c 100644 --- a/module/cmd-find/pom.xml +++ b/module/cmd-find/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-module - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-module-cmd-find - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT jar cmd_find diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml index 46dd4b651..91fadc2b9 100644 --- a/module/cmd-list/pom.xml +++ b/module/cmd-list/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-module - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-module-cmd-list - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT jar cmd_list diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml index 6158b2cbe..30097fc3c 100644 --- a/module/cmd-send/pom.xml +++ b/module/cmd-send/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-module - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-module-cmd-send - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT jar cmd_send diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml index 7ce143ad7..d69f1e612 100644 --- a/module/cmd-server/pom.xml +++ b/module/cmd-server/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-module - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-module-cmd-server - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT jar cmd_server diff --git a/module/pom.xml b/module/pom.xml index e0cec205a..dbc316dd0 100644 --- a/module/pom.xml +++ b/module/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-parent - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-module - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT pom BungeeCord Modules diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml index 5d3d81d5e..8d1df1fd9 100644 --- a/module/reconnect-yaml/pom.xml +++ b/module/reconnect-yaml/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-module - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-module-reconnect-yaml - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT jar reconnect_yaml diff --git a/native/pom.xml b/native/pom.xml index cf46174c0..f8bacabd6 100644 --- a/native/pom.xml +++ b/native/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-parent - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-native - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT jar BungeeCord-Native diff --git a/pom.xml b/pom.xml index ad213e93a..5f4cbce37 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ net.md-5 bungeecord-parent - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT pom BungeeCord-Parent diff --git a/protocol/pom.xml b/protocol/pom.xml index 5ec853a57..f66ca6ca9 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-parent - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-protocol - 1.16-R0.5-SNAPSHOT + 1.17-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 45fe954cb..b9f1ff082 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 @@ -34,7 +34,7 @@ public class ProtocolConstants public static final int MINECRAFT_1_16_2 = 751; public static final int MINECRAFT_1_16_3 = 753; public static final int MINECRAFT_1_16_4 = 754; - public static final int MINECRAFT_1_17 = 1073741852; + public static final int MINECRAFT_1_17 = 755; public static final List SUPPORTED_VERSIONS; public static final List SUPPORTED_VERSION_IDS; @@ -49,7 +49,8 @@ public class ProtocolConstants "1.13.x", "1.14.x", "1.15.x", - "1.16.x" + "1.16.x", + "1.17.x" ); ImmutableList.Builder supportedVersionIds = ImmutableList.builder().add( ProtocolConstants.MINECRAFT_1_8, @@ -78,13 +79,14 @@ public class ProtocolConstants ProtocolConstants.MINECRAFT_1_16_1, ProtocolConstants.MINECRAFT_1_16_2, ProtocolConstants.MINECRAFT_1_16_3, - ProtocolConstants.MINECRAFT_1_16_4 + ProtocolConstants.MINECRAFT_1_16_4, + ProtocolConstants.MINECRAFT_1_17 ); if ( SNAPSHOT_SUPPORT ) { - supportedVersions.add( "1.17.x" ); - supportedVersionIds.add( ProtocolConstants.MINECRAFT_1_17 ); + // supportedVersions.add( "1.17.x" ); + // supportedVersionIds.add( ProtocolConstants.MINECRAFT_1_17 ); } SUPPORTED_VERSIONS = supportedVersions.build(); diff --git a/proxy/pom.xml b/proxy/pom.xml index 77fa06e2e..0f0af3dc2 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-parent - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-proxy - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT jar BungeeCord-Proxy diff --git a/query/pom.xml b/query/pom.xml index 3023d072b..4212899e7 100644 --- a/query/pom.xml +++ b/query/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-parent - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-query - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT jar BungeeCord-Query diff --git a/slf4j/pom.xml b/slf4j/pom.xml index e7f19178d..fd365ed0b 100644 --- a/slf4j/pom.xml +++ b/slf4j/pom.xml @@ -6,13 +6,13 @@ net.md-5 bungeecord-parent - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT ../pom.xml net.md-5 bungeecord-slf4j - 1.16-R0.5-SNAPSHOT + 1.17-R0.1-SNAPSHOT jar BungeeCord-SLF4J