From db33544cc1a8ca4552b1693da25807442052ebf3 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 2 Mar 2019 22:35:35 +0000 Subject: [PATCH] Adopt protocol patch registration for upstream changes --- .../0003-1.7.x-Protocol-Patch.patch | 282 +++++++++++++++++- 1 file changed, 276 insertions(+), 6 deletions(-) diff --git a/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch b/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch index 4e59fbf..f2cd2b4 100644 --- a/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch +++ b/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch @@ -1,4 +1,4 @@ -From 0002b1f2ea298245dfa864b82cb41ebc23e96f73 Mon Sep 17 00:00:00 2001 +From 11df9d459a1b1204e39e95519c7df2c2ded1c243 Mon Sep 17 00:00:00 2001 From: Troy Frew Date: Tue, 15 Nov 2016 10:31:04 -0500 Subject: [PATCH] 1.7.x Protocol Patch @@ -167,15 +167,285 @@ index d4b03843..9aac7ca9 100644 } } diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java -index d1320698..961e95e1 100644 +index d1320698..049c7879 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java -@@ -391,6 +391,8 @@ public enum Protocol +@@ -54,7 +54,7 @@ public enum Protocol + { + TO_SERVER.registerPacket( + Handshake.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x00 ) ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x00 ) // Travertine + ); + } + }, +@@ -65,28 +65,28 @@ public enum Protocol + { + TO_CLIENT.registerPacket( + KeepAlive.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x00 ), ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x00 ), // Travertine + map( ProtocolConstants.MINECRAFT_1_9, 0x1F ), + map( ProtocolConstants.MINECRAFT_1_12, 0x1F ), + map( ProtocolConstants.MINECRAFT_1_13, 0x21 ) + ); + TO_CLIENT.registerPacket( + Login.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x01 ), ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x01 ), // Travertine + map( ProtocolConstants.MINECRAFT_1_9, 0x23 ), + map( ProtocolConstants.MINECRAFT_1_12, 0x23 ), + map( ProtocolConstants.MINECRAFT_1_13, 0x25 ) + ); + TO_CLIENT.registerPacket( + Chat.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x02 ), ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x02 ), // Travertine + map( ProtocolConstants.MINECRAFT_1_9, 0x0F ), + map( ProtocolConstants.MINECRAFT_1_12, 0x0F ), + map( ProtocolConstants.MINECRAFT_1_13, 0x0E ) + ); + TO_CLIENT.registerPacket( + Respawn.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x07 ), ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x07 ), // Travertine + map( ProtocolConstants.MINECRAFT_1_9, 0x33 ), + map( ProtocolConstants.MINECRAFT_1_12, 0x34 ), + map( ProtocolConstants.MINECRAFT_1_12_1, 0x35 ), +@@ -101,7 +101,7 @@ public enum Protocol + // Waterfall start + TO_CLIENT.registerPacket( + EntityEffect.class, +- map(ProtocolConstants.MINECRAFT_1_8, 0x1D), ++ map(ProtocolConstants.MINECRAFT_1_7_2, 0x1D), // Travertine + map(ProtocolConstants.MINECRAFT_1_9, 0x4C), + map(ProtocolConstants.MINECRAFT_1_9_4, 0x4B), + map(ProtocolConstants.MINECRAFT_1_10, 0x4B), +@@ -111,7 +111,7 @@ public enum Protocol + ); + TO_CLIENT.registerPacket( + EntityRemoveEffect.class, +- map(ProtocolConstants.MINECRAFT_1_8, 0x1E), ++ map(ProtocolConstants.MINECRAFT_1_7_2, 0x1E), // Travertine + map(ProtocolConstants.MINECRAFT_1_9, 0x31), + map(ProtocolConstants.MINECRAFT_1_12, 0x32), + map(ProtocolConstants.MINECRAFT_1_12_1, 0x33), +@@ -120,7 +120,7 @@ public enum Protocol + // Waterfall end + TO_CLIENT.registerPacket( + PlayerListItem.class, // PlayerInfo +- map( ProtocolConstants.MINECRAFT_1_8, 0x38 ), ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x38 ), // Travertine + map( ProtocolConstants.MINECRAFT_1_9, 0x2D ), + map( ProtocolConstants.MINECRAFT_1_12, 0x2D ), + map( ProtocolConstants.MINECRAFT_1_12_1, 0x2E ), +@@ -128,14 +128,14 @@ public enum Protocol + ); + TO_CLIENT.registerPacket( + TabCompleteResponse.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x3A ), ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x3A ), // Travertine + map( ProtocolConstants.MINECRAFT_1_9, 0x0E ), + map( ProtocolConstants.MINECRAFT_1_12, 0x0E ), + map( ProtocolConstants.MINECRAFT_1_13, 0x10 ) + ); + TO_CLIENT.registerPacket( + ScoreboardObjective.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x3B ), ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x3B ), // Travertine + map( ProtocolConstants.MINECRAFT_1_9, 0x3F ), + map( ProtocolConstants.MINECRAFT_1_12, 0x41 ), + map( ProtocolConstants.MINECRAFT_1_12_1, 0x42 ), +@@ -143,7 +143,7 @@ public enum Protocol + ); + TO_CLIENT.registerPacket( + ScoreboardScore.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x3C ), ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x3C ), // Travertine + map( ProtocolConstants.MINECRAFT_1_9, 0x42 ), + map( ProtocolConstants.MINECRAFT_1_12, 0x44 ), + map( ProtocolConstants.MINECRAFT_1_12_1, 0x45 ), +@@ -151,7 +151,7 @@ public enum Protocol + ); + TO_CLIENT.registerPacket( + ScoreboardDisplay.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x3D ), ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x3D ), // Travertine + map( ProtocolConstants.MINECRAFT_1_9, 0x38 ), + map( ProtocolConstants.MINECRAFT_1_12, 0x3A ), + map( ProtocolConstants.MINECRAFT_1_12_1, 0x3B ), +@@ -159,7 +159,7 @@ public enum Protocol + ); + TO_CLIENT.registerPacket( + Team.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x3E ), ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x3E ), // Travertine + map( ProtocolConstants.MINECRAFT_1_9, 0x41 ), + map( ProtocolConstants.MINECRAFT_1_12, 0x43 ), + map( ProtocolConstants.MINECRAFT_1_12_1, 0x44 ), +@@ -167,28 +167,28 @@ public enum Protocol + ); + TO_CLIENT.registerPacket( + PluginMessage.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x3F ), ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x3F ), // Travertine + map( ProtocolConstants.MINECRAFT_1_9, 0x18 ), + map( ProtocolConstants.MINECRAFT_1_12, 0x18 ), + map( ProtocolConstants.MINECRAFT_1_13, 0x19 ) + ); + TO_CLIENT.registerPacket( + Kick.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x40 ), ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x40 ), // Travertine + map( ProtocolConstants.MINECRAFT_1_9, 0x1A ), + map( ProtocolConstants.MINECRAFT_1_12, 0x1A ), + map( ProtocolConstants.MINECRAFT_1_13, 0x1B ) + ); + TO_CLIENT.registerPacket( + Title.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x45 ), ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x45 ), // Travertine + map( ProtocolConstants.MINECRAFT_1_12, 0x47 ), + map( ProtocolConstants.MINECRAFT_1_12_1, 0x48 ), + map( ProtocolConstants.MINECRAFT_1_13, 0x4B ) + ); + TO_CLIENT.registerPacket( + PlayerListHeaderFooter.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x47 ), ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x47 ), // Travertine + map( ProtocolConstants.MINECRAFT_1_9, 0x48 ), + map( ProtocolConstants.MINECRAFT_1_9_4, 0x47 ), + map( ProtocolConstants.MINECRAFT_1_12, 0x49 ), +@@ -197,7 +197,7 @@ public enum Protocol + ); + TO_CLIENT.registerPacket( + EntityStatus.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x1A ), ++ map( ProtocolConstants.MINECRAFT_1_8, 0x1A ), // Travertine + map( ProtocolConstants.MINECRAFT_1_9, 0x1B ), + map( ProtocolConstants.MINECRAFT_1_12, 0x1B ), + map( ProtocolConstants.MINECRAFT_1_13, 0x1C ) +@@ -209,7 +209,7 @@ public enum Protocol + + TO_SERVER.registerPacket( + KeepAlive.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x00 ), ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x00 ), // Travertine + map( ProtocolConstants.MINECRAFT_1_9, 0x0B ), + map( ProtocolConstants.MINECRAFT_1_12, 0x0C ), + map( ProtocolConstants.MINECRAFT_1_12_1, 0x0B ), +@@ -217,7 +217,7 @@ public enum Protocol + ); + TO_SERVER.registerPacket( + Chat.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x01 ), ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x01 ), // Travertine + map( ProtocolConstants.MINECRAFT_1_9, 0x02 ), + map( ProtocolConstants.MINECRAFT_1_12, 0x03 ), + map( ProtocolConstants.MINECRAFT_1_12_1, 0x02 ), +@@ -225,7 +225,7 @@ public enum Protocol + ); + TO_SERVER.registerPacket( + TabCompleteRequest.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x14 ), ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x14 ), // Travertine + map( ProtocolConstants.MINECRAFT_1_9, 0x01 ), + map( ProtocolConstants.MINECRAFT_1_12, 0x02 ), + map( ProtocolConstants.MINECRAFT_1_12_1, 0x01 ), +@@ -233,7 +233,7 @@ public enum Protocol + ); + TO_SERVER.registerPacket( + ClientSettings.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x15 ), ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x15 ), // Travertine + map( ProtocolConstants.MINECRAFT_1_9, 0x04 ), + map( ProtocolConstants.MINECRAFT_1_12, 0x05 ), + map( ProtocolConstants.MINECRAFT_1_12_1, 0x04 ), +@@ -241,7 +241,7 @@ public enum Protocol + ); + TO_SERVER.registerPacket( + PluginMessage.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x17 ), ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x17 ), // Travertine + map( ProtocolConstants.MINECRAFT_1_9, 0x09 ), + map( ProtocolConstants.MINECRAFT_1_12, 0x0A ), + map( ProtocolConstants.MINECRAFT_1_12_1, 0x09 ), +@@ -256,20 +256,20 @@ public enum Protocol + { + TO_CLIENT.registerPacket( + StatusResponse.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x00 ) ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x00 ) // Travertine + ); + TO_CLIENT.registerPacket( + PingPacket.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x01 ) ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x01 ) // Travertine + ); + + TO_SERVER.registerPacket( + StatusRequest.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x00 ) ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x00 ) // Travertine + ); + TO_SERVER.registerPacket( + PingPacket.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x01 ) ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x01 ) // Travertine + ); + } + }, +@@ -280,19 +280,19 @@ public enum Protocol + { + TO_CLIENT.registerPacket( + Kick.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x00 ) ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x00 ) // Travertine + ); + TO_CLIENT.registerPacket( + EncryptionRequest.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x01 ) ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x01 ) // Travertine + ); + TO_CLIENT.registerPacket( + LoginSuccess.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x02 ) ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x02 ) // Travertine + ); + TO_CLIENT.registerPacket( + SetCompression.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x03 ) ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x03 ) // Travertine + ); + TO_CLIENT.registerPacket( + LoginPayloadRequest.class, +@@ -301,15 +301,15 @@ public enum Protocol + + TO_SERVER.registerPacket( + LoginRequest.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x00 ) ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x00 ) // Travertine + ); + TO_SERVER.registerPacket( + EncryptionResponse.class, +- map( ProtocolConstants.MINECRAFT_1_8, 0x01 ) ++ map( ProtocolConstants.MINECRAFT_1_7_2, 0x01 ) // Travertine + ); + TO_SERVER.registerPacket( + LoginPayloadResponse.class, +- map( ProtocolConstants.MINECRAFT_1_13, 0x02 ) ++ map( ProtocolConstants.MINECRAFT_1_13, 0x02 ) // Travertine + ); + } + }; +@@ -390,7 +390,9 @@ public enum Protocol + } private final TIntObjectMap> linkedProtocols = new TIntObjectHashMap<>(); { - linkedProtocols.put( ProtocolConstants.MINECRAFT_1_8, Arrays.asList( -+ ProtocolConstants.MINECRAFT_1_7_2, +- linkedProtocols.put( ProtocolConstants.MINECRAFT_1_8, Arrays.asList( ++ linkedProtocols.put( ProtocolConstants.MINECRAFT_1_7_2, Arrays.asList( // Travertine + ProtocolConstants.MINECRAFT_1_7_6, ++ ProtocolConstants.MINECRAFT_1_8, // Travertine ProtocolConstants.MINECRAFT_1_9, ProtocolConstants.MINECRAFT_1_12, ProtocolConstants.MINECRAFT_1_13 @@ -1969,5 +2239,5 @@ index daf12f74..e33861ab 100644 @Override -- -2.20.1 +2.21.0