Skip to content

Commit ec74a78

Browse files
pull[bot]pull[bot]
authored
Merge pull request #53 from SpigotMC/master
[pull] master from SpigotMC:master
2 parents 5cd24ea + d2a317e commit ec74a78

File tree

2 files changed

+55
-28
lines changed

2 files changed

+55
-28
lines changed

‎protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java‎

Lines changed: 54 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@ public enum Protocol
110110
map( ProtocolConstants.MINECRAFT_1_20_2, 0x24 ),
111111
map( ProtocolConstants.MINECRAFT_1_20_5, 0x26 ),
112112
map( ProtocolConstants.MINECRAFT_1_21_2, 0x27 ),
113-
map( ProtocolConstants.MINECRAFT_1_21_5, 0x26 )
113+
map( ProtocolConstants.MINECRAFT_1_21_5, 0x26 ),
114+
map( ProtocolConstants.MINECRAFT_1_21_9, 0x2B )
114115
);
115116
TO_CLIENT.registerPacket(
116117
Login.class,
@@ -129,7 +130,8 @@ public enum Protocol
129130
map( ProtocolConstants.MINECRAFT_1_20_2, 0x29 ),
130131
map( ProtocolConstants.MINECRAFT_1_20_5, 0x2B ),
131132
map( ProtocolConstants.MINECRAFT_1_21_2, 0x2C ),
132-
map( ProtocolConstants.MINECRAFT_1_21_5, 0x2B )
133+
map( ProtocolConstants.MINECRAFT_1_21_5, 0x2B ),
134+
map( ProtocolConstants.MINECRAFT_1_21_9, 0x30 )
133135
);
134136
TO_CLIENT.registerPacket(
135137
Chat.class,
@@ -164,7 +166,8 @@ public enum Protocol
164166
map( ProtocolConstants.MINECRAFT_1_20_3, 0x45 ),
165167
map( ProtocolConstants.MINECRAFT_1_20_5, 0x47 ),
166168
map( ProtocolConstants.MINECRAFT_1_21_2, 0x4C ),
167-
map( ProtocolConstants.MINECRAFT_1_21_5, 0x4B )
169+
map( ProtocolConstants.MINECRAFT_1_21_5, 0x4B ),
170+
map( ProtocolConstants.MINECRAFT_1_21_9, 0x50 )
168171
);
169172
TO_CLIENT.registerPacket(
170173
BossBar.class,
@@ -228,7 +231,8 @@ public enum Protocol
228231
map( ProtocolConstants.MINECRAFT_1_20_3, 0x5C ),
229232
map( ProtocolConstants.MINECRAFT_1_20_5, 0x5E ),
230233
map( ProtocolConstants.MINECRAFT_1_21_2, 0x64 ),
231-
map( ProtocolConstants.MINECRAFT_1_21_5, 0x63 )
234+
map( ProtocolConstants.MINECRAFT_1_21_5, 0x63 ),
235+
map( ProtocolConstants.MINECRAFT_1_21_9, 0x68 )
232236
);
233237
TO_CLIENT.registerPacket(
234238
ScoreboardScore.class,
@@ -248,15 +252,17 @@ public enum Protocol
248252
map( ProtocolConstants.MINECRAFT_1_20_3, 0x5F ),
249253
map( ProtocolConstants.MINECRAFT_1_20_5, 0x61 ),
250254
map( ProtocolConstants.MINECRAFT_1_21_2, 0x68 ),
251-
map( ProtocolConstants.MINECRAFT_1_21_5, 0x67 )
255+
map( ProtocolConstants.MINECRAFT_1_21_5, 0x67 ),
256+
map( ProtocolConstants.MINECRAFT_1_21_9, 0x6C )
252257
);
253258
TO_CLIENT.registerPacket(
254259
ScoreboardScoreReset.class,
255260
ScoreboardScoreReset::new,
256261
map( ProtocolConstants.MINECRAFT_1_20_3, 0x42 ),
257262
map( ProtocolConstants.MINECRAFT_1_20_5, 0x44 ),
258263
map( ProtocolConstants.MINECRAFT_1_21_2, 0x49 ),
259-
map( ProtocolConstants.MINECRAFT_1_21_5, 0x48 )
264+
map( ProtocolConstants.MINECRAFT_1_21_5, 0x48 ),
265+
map( ProtocolConstants.MINECRAFT_1_21_9, 0x4D )
260266
);
261267
TO_CLIENT.registerPacket(
262268
ScoreboardDisplay.class,
@@ -276,7 +282,8 @@ public enum Protocol
276282
map( ProtocolConstants.MINECRAFT_1_20_3, 0x55 ),
277283
map( ProtocolConstants.MINECRAFT_1_20_5, 0x57 ),
278284
map( ProtocolConstants.MINECRAFT_1_21_2, 0x5C ),
279-
map( ProtocolConstants.MINECRAFT_1_21_5, 0x5B )
285+
map( ProtocolConstants.MINECRAFT_1_21_5, 0x5B ),
286+
map( ProtocolConstants.MINECRAFT_1_21_9, 0x60 )
280287
);
281288
TO_CLIENT.registerPacket(
282289
Team.class,
@@ -296,7 +303,8 @@ public enum Protocol
296303
map( ProtocolConstants.MINECRAFT_1_20_3, 0x5E ),
297304
map( ProtocolConstants.MINECRAFT_1_20_5, 0x60 ),
298305
map( ProtocolConstants.MINECRAFT_1_21_2, 0x67 ),
299-
map( ProtocolConstants.MINECRAFT_1_21_5, 0x66 )
306+
map( ProtocolConstants.MINECRAFT_1_21_5, 0x66 ),
307+
map( ProtocolConstants.MINECRAFT_1_21_9, 0x6B )
300308
);
301309
TO_CLIENT.registerPacket(
302310
PluginMessage.class,
@@ -334,7 +342,8 @@ public enum Protocol
334342
map( ProtocolConstants.MINECRAFT_1_19_4, 0x1A ),
335343
map( ProtocolConstants.MINECRAFT_1_20_2, 0x1B ),
336344
map( ProtocolConstants.MINECRAFT_1_20_5, 0x1D ),
337-
map( ProtocolConstants.MINECRAFT_1_21_5, 0x1C )
345+
map( ProtocolConstants.MINECRAFT_1_21_5, 0x1C ),
346+
map( ProtocolConstants.MINECRAFT_1_21_9, 0x20 )
338347
);
339348
TO_CLIENT.registerPacket(
340349
Title.class,
@@ -356,7 +365,8 @@ public enum Protocol
356365
map( ProtocolConstants.MINECRAFT_1_20_3, 0x63 ),
357366
map( ProtocolConstants.MINECRAFT_1_20_5, 0x65 ),
358367
map( ProtocolConstants.MINECRAFT_1_21_2, 0x6C ),
359-
map( ProtocolConstants.MINECRAFT_1_21_5, 0x6B )
368+
map( ProtocolConstants.MINECRAFT_1_21_5, 0x6B ),
369+
map( ProtocolConstants.MINECRAFT_1_21_9, 0x70 )
360370
);
361371
TO_CLIENT.registerPacket(
362372
ClearTitles.class,
@@ -382,7 +392,8 @@ public enum Protocol
382392
map( ProtocolConstants.MINECRAFT_1_20_3, 0x61 ),
383393
map( ProtocolConstants.MINECRAFT_1_20_5, 0x63 ),
384394
map( ProtocolConstants.MINECRAFT_1_21_2, 0x6A ),
385-
map( ProtocolConstants.MINECRAFT_1_21_5, 0x69 )
395+
map( ProtocolConstants.MINECRAFT_1_21_5, 0x69 ),
396+
map( ProtocolConstants.MINECRAFT_1_21_9, 0x6E )
386397
);
387398
TO_CLIENT.registerPacket(
388399
TitleTimes.class,
@@ -397,7 +408,8 @@ public enum Protocol
397408
map( ProtocolConstants.MINECRAFT_1_20_3, 0x64 ),
398409
map( ProtocolConstants.MINECRAFT_1_20_5, 0x66 ),
399410
map( ProtocolConstants.MINECRAFT_1_21_2, 0x6D ),
400-
map( ProtocolConstants.MINECRAFT_1_21_5, 0x6C )
411+
map( ProtocolConstants.MINECRAFT_1_21_5, 0x6C ),
412+
map( ProtocolConstants.MINECRAFT_1_21_9, 0x71 )
401413
);
402414
TO_CLIENT.registerPacket(
403415
SystemChat.class,
@@ -411,7 +423,8 @@ public enum Protocol
411423
map( ProtocolConstants.MINECRAFT_1_20_3, 0x69 ),
412424
map( ProtocolConstants.MINECRAFT_1_20_5, 0x6C ),
413425
map( ProtocolConstants.MINECRAFT_1_21_2, 0x73 ),
414-
map( ProtocolConstants.MINECRAFT_1_21_5, 0x72 )
426+
map( ProtocolConstants.MINECRAFT_1_21_5, 0x72 ),
427+
map( ProtocolConstants.MINECRAFT_1_21_9, 0x77 )
415428
);
416429
TO_CLIENT.registerPacket(
417430
PlayerListHeaderFooter.class,
@@ -436,7 +449,8 @@ public enum Protocol
436449
map( ProtocolConstants.MINECRAFT_1_20_3, 0x6A ),
437450
map( ProtocolConstants.MINECRAFT_1_20_5, 0x6D ),
438451
map( ProtocolConstants.MINECRAFT_1_21_2, 0x74 ),
439-
map( ProtocolConstants.MINECRAFT_1_21_5, 0x73 )
452+
map( ProtocolConstants.MINECRAFT_1_21_5, 0x73 ),
453+
map( ProtocolConstants.MINECRAFT_1_21_9, 0x78 )
440454
);
441455
TO_CLIENT.registerPacket(
442456
EntityStatus.class,
@@ -456,7 +470,8 @@ public enum Protocol
456470
map( ProtocolConstants.MINECRAFT_1_19_4, 0x1C ),
457471
map( ProtocolConstants.MINECRAFT_1_20_2, 0x1D ),
458472
map( ProtocolConstants.MINECRAFT_1_20_5, 0x1F ),
459-
map( ProtocolConstants.MINECRAFT_1_21_5, 0x1E )
473+
map( ProtocolConstants.MINECRAFT_1_21_5, 0x1E ),
474+
map( ProtocolConstants.MINECRAFT_1_21_9, 0x22 )
460475
);
461476
TO_CLIENT.registerPacket(
462477
Commands.class,
@@ -487,7 +502,8 @@ public enum Protocol
487502
map( ProtocolConstants.MINECRAFT_1_20_2, 0x20 ),
488503
map( ProtocolConstants.MINECRAFT_1_20_5, 0x22 ),
489504
map( ProtocolConstants.MINECRAFT_1_21_2, 0x23 ),
490-
map( ProtocolConstants.MINECRAFT_1_21_5, 0x22 )
505+
map( ProtocolConstants.MINECRAFT_1_21_5, 0x22 ),
506+
map( ProtocolConstants.MINECRAFT_1_21_9, 0x26 )
491507
);
492508
TO_CLIENT.registerPacket(
493509
ViewDistance.class,
@@ -505,7 +521,8 @@ public enum Protocol
505521
map( ProtocolConstants.MINECRAFT_1_20_3, 0x53 ),
506522
map( ProtocolConstants.MINECRAFT_1_20_5, 0x55 ),
507523
map( ProtocolConstants.MINECRAFT_1_21_2, 0x59 ),
508-
map( ProtocolConstants.MINECRAFT_1_21_5, 0x58 )
524+
map( ProtocolConstants.MINECRAFT_1_21_5, 0x58 ),
525+
map( ProtocolConstants.MINECRAFT_1_21_9, 0x5D )
509526
);
510527
TO_CLIENT.registerPacket(
511528
ServerData.class,
@@ -518,7 +535,8 @@ public enum Protocol
518535
map( ProtocolConstants.MINECRAFT_1_20_3, 0x49 ),
519536
map( ProtocolConstants.MINECRAFT_1_20_5, 0x4B ),
520537
map( ProtocolConstants.MINECRAFT_1_21_2, 0x50 ),
521-
map( ProtocolConstants.MINECRAFT_1_21_5, 0x4F )
538+
map( ProtocolConstants.MINECRAFT_1_21_5, 0x4F ),
539+
map( ProtocolConstants.MINECRAFT_1_21_9, 0x54 )
522540
);
523541
TO_CLIENT.registerPacket(
524542
PlayerListItemRemove.class,
@@ -528,7 +546,8 @@ public enum Protocol
528546
map( ProtocolConstants.MINECRAFT_1_20_2, 0x3B ),
529547
map( ProtocolConstants.MINECRAFT_1_20_5, 0x3D ),
530548
map( ProtocolConstants.MINECRAFT_1_21_2, 0x3F ),
531-
map( ProtocolConstants.MINECRAFT_1_21_5, 0x3E )
549+
map( ProtocolConstants.MINECRAFT_1_21_5, 0x3E ),
550+
map( ProtocolConstants.MINECRAFT_1_21_9, 0x43 )
532551
);
533552
TO_CLIENT.registerPacket(
534553
PlayerListItemUpdate.class,
@@ -538,7 +557,8 @@ public enum Protocol
538557
map( ProtocolConstants.MINECRAFT_1_20_2, 0x3C ),
539558
map( ProtocolConstants.MINECRAFT_1_20_5, 0x3E ),
540559
map( ProtocolConstants.MINECRAFT_1_21_2, 0x40 ),
541-
map( ProtocolConstants.MINECRAFT_1_21_5, 0x3F )
560+
map( ProtocolConstants.MINECRAFT_1_21_5, 0x3F ),
561+
map( ProtocolConstants.MINECRAFT_1_21_9, 0x44 )
542562
);
543563
TO_CLIENT.registerPacket(
544564
StartConfiguration.class,
@@ -547,7 +567,8 @@ public enum Protocol
547567
map( ProtocolConstants.MINECRAFT_1_20_3, 0x67 ),
548568
map( ProtocolConstants.MINECRAFT_1_20_5, 0x69 ),
549569
map( ProtocolConstants.MINECRAFT_1_21_2, 0x70 ),
550-
map( ProtocolConstants.MINECRAFT_1_21_5, 0x6F )
570+
map( ProtocolConstants.MINECRAFT_1_21_5, 0x6F ),
571+
map( ProtocolConstants.MINECRAFT_1_21_9, 0x74 )
551572
);
552573
TO_CLIENT.registerPacket(
553574
CookieRequest.class,
@@ -561,40 +582,46 @@ public enum Protocol
561582
RegisterType.ENCODE,
562583
map( ProtocolConstants.MINECRAFT_1_20_5, 0x6B ),
563584
map( ProtocolConstants.MINECRAFT_1_21_2, 0x72 ),
564-
map( ProtocolConstants.MINECRAFT_1_21_5, 0x71 )
585+
map( ProtocolConstants.MINECRAFT_1_21_5, 0x71 ),
586+
map( ProtocolConstants.MINECRAFT_1_21_9, 0x76 )
565587
);
566588
TO_CLIENT.registerPacket(
567589
Transfer.class,
568590
Transfer::new,
569591
RegisterType.ENCODE,
570592
map( ProtocolConstants.MINECRAFT_1_20_5, 0x73 ),
571-
map( ProtocolConstants.MINECRAFT_1_21_2, 0x7A )
593+
map( ProtocolConstants.MINECRAFT_1_21_2, 0x7A ),
594+
map( ProtocolConstants.MINECRAFT_1_21_9, 0x7F )
572595
);
573596
TO_CLIENT.registerPacket(
574597
DisconnectReportDetails.class,
575598
DisconnectReportDetails::new,
576599
RegisterType.ENCODE,
577600
map( ProtocolConstants.MINECRAFT_1_21, 0x7A ),
578-
map( ProtocolConstants.MINECRAFT_1_21_2, 0x81 )
601+
map( ProtocolConstants.MINECRAFT_1_21_2, 0x81 ),
602+
map( ProtocolConstants.MINECRAFT_1_21_9, 0x86 )
579603
);
580604
TO_CLIENT.registerPacket(
581605
ServerLinks.class,
582606
ServerLinks::new,
583607
RegisterType.ENCODE,
584608
map( ProtocolConstants.MINECRAFT_1_21, 0x7B ),
585-
map( ProtocolConstants.MINECRAFT_1_21_2, 0x82 )
609+
map( ProtocolConstants.MINECRAFT_1_21_2, 0x82 ),
610+
map( ProtocolConstants.MINECRAFT_1_21_9, 0x87 )
586611
);
587612
TO_CLIENT.registerPacket(
588613
ClearDialog.class,
589614
ClearDialog::new,
590615
RegisterType.ENCODE,
591-
map( ProtocolConstants.MINECRAFT_1_21_6, 0x84 )
616+
map( ProtocolConstants.MINECRAFT_1_21_6, 0x84 ),
617+
map( ProtocolConstants.MINECRAFT_1_21_9, 0x89 )
592618
);
593619
TO_CLIENT.registerPacket(
594620
ShowDialog.class,
595621
ShowDialog::new,
596622
RegisterType.ENCODE,
597-
map( ProtocolConstants.MINECRAFT_1_21_6, 0x85 )
623+
map( ProtocolConstants.MINECRAFT_1_21_6, 0x85 ),
624+
map( ProtocolConstants.MINECRAFT_1_21_9, 0x8A )
598625
);
599626

600627
TO_SERVER.registerPacket(

‎protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class ProtocolConstants
5252
public static final int MINECRAFT_1_21_5 = 770;
5353
public static final int MINECRAFT_1_21_6 = 771;
5454
public static final int MINECRAFT_1_21_7 = 772;
55-
public static final int MINECRAFT_1_21_9 = 1073742089;
55+
public static final int MINECRAFT_1_21_9 = 1073742092;
5656
public static final List<String> SUPPORTED_VERSIONS;
5757
public static final List<Integer> SUPPORTED_VERSION_IDS;
5858

0 commit comments

Comments
 (0)