From 581303a54c9263b05191f629f9c9c574bb873443 Mon Sep 17 00:00:00 2001 From: "Five (Xer)" Date: Thu, 11 Mar 2021 09:53:55 +0100 Subject: [PATCH] Snaphot 21w10a --- .../api/network/ProtocolVersion.java | 2 +- .../proxy/protocol/StateRegistry.java | 31 ++++++++++--------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/api/src/main/java/com/velocitypowered/api/network/ProtocolVersion.java b/api/src/main/java/com/velocitypowered/api/network/ProtocolVersion.java index 0149970e6..13d2c8124 100644 --- a/api/src/main/java/com/velocitypowered/api/network/ProtocolVersion.java +++ b/api/src/main/java/com/velocitypowered/api/network/ProtocolVersion.java @@ -54,7 +54,7 @@ public enum ProtocolVersion { MINECRAFT_1_16_2(751, "1.16.2"), MINECRAFT_1_16_3(753, "1.16.3"), MINECRAFT_1_16_4(754, "1.16.4", "1.16.5"), - MINECRAFT_1_17(-1, 16, "1.17"); // Snapshot: 21w08a, future protocol: 755 + MINECRAFT_1_17(-1, 18, "1.17"); // Snapshot: 21w10a, future protocol: 755 private static final int SNAPSHOT_BIT = 30; diff --git a/proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java b/proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java index 243239eb0..213e15222 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java @@ -131,7 +131,8 @@ public enum StateRegistry { map(0x0A, MINECRAFT_1_12, false), map(0x09, MINECRAFT_1_12_1, false), map(0x0A, MINECRAFT_1_13, false), - map(0x0B, MINECRAFT_1_14, false)); + map(0x0B, MINECRAFT_1_14, false), + map(0x0A, MINECRAFT_1_17, false)); serverbound.register(KeepAlive.class, KeepAlive::new, map(0x00, MINECRAFT_1_7_2, false), map(0x0B, MINECRAFT_1_9, false), @@ -139,7 +140,8 @@ public enum StateRegistry { map(0x0B, MINECRAFT_1_12_1, false), map(0x0E, MINECRAFT_1_13, false), map(0x0F, MINECRAFT_1_14, false), - map(0x10, MINECRAFT_1_16, false)); + map(0x10, MINECRAFT_1_16, false), + map(0x0F, MINECRAFT_1_17, false)); serverbound.register(ResourcePackResponse.class, ResourcePackResponse::new, map(0x19, MINECRAFT_1_8, false), map(0x16, MINECRAFT_1_9, false), @@ -147,7 +149,8 @@ public enum StateRegistry { map(0x1D, MINECRAFT_1_13, false), map(0x1F, MINECRAFT_1_14, false), map(0x20, MINECRAFT_1_16, false), - map(0x21, MINECRAFT_1_16_2, false)); + map(0x21, MINECRAFT_1_16_2, false), + map(0x20, MINECRAFT_1_17, false)); clientbound.register(BossBar.class, BossBar::new, map(0x0C, MINECRAFT_1_9, false), @@ -183,7 +186,7 @@ public enum StateRegistry { map(0x19, MINECRAFT_1_15, false), map(0x18, MINECRAFT_1_16, false), map(0x17, MINECRAFT_1_16_2, false), - map(0x19, MINECRAFT_1_17, false)); + map(0x18, MINECRAFT_1_17, false)); clientbound.register(Disconnect.class, Disconnect::new, map(0x40, MINECRAFT_1_7_2, false), map(0x1A, MINECRAFT_1_9, false), @@ -192,7 +195,7 @@ public enum StateRegistry { map(0x1B, MINECRAFT_1_15, false), map(0x1A, MINECRAFT_1_16, false), map(0x19, MINECRAFT_1_16_2, false), - map(0x1B, MINECRAFT_1_17, false)); + map(0x1A, MINECRAFT_1_17, false)); clientbound.register(KeepAlive.class, KeepAlive::new, map(0x00, MINECRAFT_1_7_2, false), map(0x1F, MINECRAFT_1_9, false), @@ -201,7 +204,7 @@ public enum StateRegistry { map(0x21, MINECRAFT_1_15, false), map(0x20, MINECRAFT_1_16, false), map(0x1F, MINECRAFT_1_16_2, false), - map(0x22, MINECRAFT_1_17, false)); + map(0x21, MINECRAFT_1_17, false)); clientbound.register(JoinGame.class, JoinGame::new, map(0x01, MINECRAFT_1_7_2, false), map(0x23, MINECRAFT_1_9, false), @@ -210,7 +213,7 @@ public enum StateRegistry { map(0x26, MINECRAFT_1_15, false), map(0x25, MINECRAFT_1_16, false), map(0x24, MINECRAFT_1_16_2, false), - map(0x27, MINECRAFT_1_17, false)); + map(0x26, MINECRAFT_1_17, false)); clientbound.register(Respawn.class, Respawn::new, map(0x07, MINECRAFT_1_7_2, true), map(0x33, MINECRAFT_1_9, true), @@ -221,7 +224,7 @@ public enum StateRegistry { map(0x3B, MINECRAFT_1_15, true), map(0x3A, MINECRAFT_1_16, true), map(0x39, MINECRAFT_1_16_2, true), - map(0x3D, MINECRAFT_1_17, true)); + map(0x3C, MINECRAFT_1_17, true)); clientbound.register(ResourcePackRequest.class, ResourcePackRequest::new, map(0x48, MINECRAFT_1_8, true), map(0x32, MINECRAFT_1_9, true), @@ -232,7 +235,7 @@ public enum StateRegistry { map(0x3A, MINECRAFT_1_15, true), map(0x39, MINECRAFT_1_16, true), map(0x38, MINECRAFT_1_16_2, true), - map(0x3C, MINECRAFT_1_17, true)); + map(0x3B, MINECRAFT_1_17, true)); clientbound.register(HeaderAndFooter.class, HeaderAndFooter::new, map(0x47, MINECRAFT_1_8, true), map(0x48, MINECRAFT_1_9, true), @@ -243,7 +246,7 @@ public enum StateRegistry { map(0x53, MINECRAFT_1_14, true), map(0x54, MINECRAFT_1_15, true), map(0x53, MINECRAFT_1_16, true), - map(0x5E, MINECRAFT_1_17, true)); + map(0x5D, MINECRAFT_1_17, true)); clientbound.register(LegacyTitlePacket.class, LegacyTitlePacket::new, map(0x45, MINECRAFT_1_8, true), map(0x45, MINECRAFT_1_9, true), @@ -254,11 +257,11 @@ public enum StateRegistry { map(0x50, MINECRAFT_1_15, true), map(0x4F, MINECRAFT_1_16, MINECRAFT_1_16_4, true)); clientbound.register(TitleSubtitlePacket.class, TitleSubtitlePacket::new, - map(0x57, MINECRAFT_1_17, true)); + map(0x56, MINECRAFT_1_17, true)); clientbound.register(TitleTextPacket.class, TitleTextPacket::new, - map(0x5A, MINECRAFT_1_17, true)); + map(0x58, MINECRAFT_1_17, true)); clientbound.register(TitleActionbarPacket.class, TitleActionbarPacket::new, - map(0x41, MINECRAFT_1_17, true)); + map(0x40, MINECRAFT_1_17, true)); clientbound.register(TitleTimesPacket.class, TitleTimesPacket::new, map(0x59, MINECRAFT_1_17, true)); clientbound.register(TitleClearPacket.class, TitleClearPacket::new, @@ -272,7 +275,7 @@ public enum StateRegistry { map(0x34, MINECRAFT_1_15, false), map(0x33, MINECRAFT_1_16, false), map(0x32, MINECRAFT_1_16_2, false), - map(0x36, MINECRAFT_1_17, false)); + map(0x35, MINECRAFT_1_17, false)); } }, LOGIN {