Skip to content

Commit b400627

Browse files
authored
Merge pull request #80 from EternalHuman/master
1.21.2 protocol update
2 parents 6d2ddf2 + c7e400c commit b400627

File tree

5 files changed

+29
-12
lines changed

5 files changed

+29
-12
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<p align="center">
88
<a target="_blank"><img src="https://github.com/CatCoderr/ProtocolSidebar/actions/workflows/build.yaml/badge.svg" alt="Build" /></a>
99
<a target="_blank"><img src="https://img.shields.io/github/license/CatCoderr/ProtocolSidebar" alt="License" /></a>
10-
<a target="_blank"><img src="https://img.shields.io/badge/Minecraft%20Versions-1.12.2--1.21-blue?style=flat" alt="Minecraft Versions" /></a>
10+
<a target="_blank"><img src="https://img.shields.io/badge/Minecraft%20Versions-1.12.2--1.21.2-blue?style=flat" alt="Minecraft Versions" /></a>
1111
</p>
1212

1313
* [Features](#features)
@@ -23,7 +23,7 @@
2323

2424
![Sidebar](https://github.com/CatCoderr/ProtocolSidebar/raw/master/assets/sidebar.gif)
2525

26-
⚠️ **Note**: starting from **6.2.7-SNAPSHOT** version, the repository has been moved to https://catcoder.pl.ua/snapshots.
26+
⚠️ **Note**: starting from **6.2.8-SNAPSHOT** version, the repository has been moved to https://catcoder.pl.ua/snapshots.
2727
You can find URL for Maven and Gradle in the [Adding to your project](#adding-to-your-project) section.
2828

2929

@@ -69,7 +69,7 @@ or [maven-shade-plugin](https://maven.apache.org/plugins/maven-shade-plugin/) (f
6969
<dependency>
7070
<groupId>me.catcoder</groupId>
7171
<artifactId>bukkit-sidebar</artifactId>
72-
<version>6.2.7-SNAPSHOT</version>
72+
<version>6.2.8-SNAPSHOT</version>
7373
</dependency>
7474
```
7575

@@ -82,7 +82,7 @@ repositories {
8282
```
8383
```groovy
8484
dependencies {
85-
implementation 'me.catcoder:bukkit-sidebar:6.2.7-SNAPSHOT'
85+
implementation 'me.catcoder:bukkit-sidebar:6.2.8-SNAPSHOT'
8686
}
8787
```
8888

@@ -95,7 +95,7 @@ repositories {
9595
```
9696
```kotlin
9797
dependencies {
98-
implementation("me.catcoder:bukkit-sidebar:6.2.7-SNAPSHOT")
98+
implementation("me.catcoder:bukkit-sidebar:6.2.8-SNAPSHOT")
9999
}
100100
```
101101

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
}
66

77
group = "me.catcoder"
8-
version = "6.2.7-SNAPSHOT"
8+
version = "6.2.8-SNAPSHOT"
99
description = "Powerful feature-packed Minecraft scoreboard library"
1010

1111
val adventureVersion = "4.16.0"

src/main/java/me/catcoder/sidebar/protocol/PacketIds.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ public enum PacketIds {
1919
map(ProtocolConstants.MINECRAFT_1_20_2, 0x5C),
2020
map(ProtocolConstants.MINECRAFT_1_20_4, 0x5E),
2121
map(ProtocolConstants.MINECRAFT_1_20_4, 0x5E),
22-
map(ProtocolConstants.MINECRAFT_1_20_6, 0x60)
22+
map(ProtocolConstants.MINECRAFT_1_20_6, 0x60),
23+
map(ProtocolConstants.MINECRAFT_1_21_2, 0x67)
2324
),
2425
UPDATE_SCORE(
2526
map(ProtocolConstants.MINECRAFT_1_12_2, 0x45),
@@ -32,13 +33,15 @@ public enum PacketIds {
3233
map(ProtocolConstants.MINECRAFT_1_19_4, 0x5B),
3334
map(ProtocolConstants.MINECRAFT_1_20_2, 0x5D),
3435
map(ProtocolConstants.MINECRAFT_1_20_4, 0x5F),
35-
map(ProtocolConstants.MINECRAFT_1_20_6, 0x61)
36+
map(ProtocolConstants.MINECRAFT_1_20_6, 0x61),
37+
map(ProtocolConstants.MINECRAFT_1_21_2, 0x68)
3638

3739

3840
),
3941
RESET_SCORE(
4042
map(ProtocolConstants.MINECRAFT_1_20_3, 0x42),
41-
map(ProtocolConstants.MINECRAFT_1_20_4, 0x44)
43+
map(ProtocolConstants.MINECRAFT_1_20_4, 0x44),
44+
map(ProtocolConstants.MINECRAFT_1_21_2, 0x49)
4245
),
4346
OBJECTIVE_DISPLAY(
4447
map(ProtocolConstants.MINECRAFT_1_12_2, 0x3B),
@@ -51,7 +54,8 @@ public enum PacketIds {
5154
map(ProtocolConstants.MINECRAFT_1_19_4, 0x51),
5255
map(ProtocolConstants.MINECRAFT_1_20_2, 0x53),
5356
map(ProtocolConstants.MINECRAFT_1_20_4, 0x55),
54-
map(ProtocolConstants.MINECRAFT_1_20_6, 0x57)
57+
map(ProtocolConstants.MINECRAFT_1_20_6, 0x57),
58+
map(ProtocolConstants.MINECRAFT_1_21_2, 0x5C)
5559

5660
),
5761
OBJECTIVE(
@@ -65,7 +69,8 @@ public enum PacketIds {
6569
map(ProtocolConstants.MINECRAFT_1_19_4, 0x58),
6670
map(ProtocolConstants.MINECRAFT_1_20_2, 0x5A),
6771
map(ProtocolConstants.MINECRAFT_1_20_4, 0x5C),
68-
map(ProtocolConstants.MINECRAFT_1_20_6, 0x5E)
72+
map(ProtocolConstants.MINECRAFT_1_20_6, 0x5E),
73+
map(ProtocolConstants.MINECRAFT_1_21_2, 0x64)
6974
);
7075

7176
private final ProtocolConstants.ProtocolMapping[] mappings;

src/main/java/me/catcoder/sidebar/protocol/ProtocolConstants.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,19 @@ public class ProtocolConstants {
4141
public static final int MINECRAFT_1_19_4 = 762;
4242

4343
public static final int MINECRAFT_1_20 = 763;
44+
public static final int MINECRAFT_1_20_1 = 763;
4445
public static final int MINECRAFT_1_20_2 = 764;
4546
public static final int MINECRAFT_1_20_3 = 765;
4647
public static final int MINECRAFT_1_20_4 = 765;
48+
public static final int MINECRAFT_1_20_5 = 766;
4749
public static final int MINECRAFT_1_20_6 = 766;
50+
4851
public static final int MINECRAFT_1_21 = 767;
4952

53+
public static final int MINECRAFT_1_21_2 = 768;
54+
5055
public static final int MINIMUM_SUPPORTED_VERSION = MINECRAFT_1_12_2;
51-
public static final int MAXIMUM_SUPPORTED_VERSION = MINECRAFT_1_21;
56+
public static final int MAXIMUM_SUPPORTED_VERSION = MINECRAFT_1_21_2;
5257

5358
@Getter
5459
@RequiredArgsConstructor

src/main/java/me/catcoder/sidebar/util/version/MinecraftProtocolVersion.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,18 @@ private static NavigableMap<MinecraftVersion, Integer> createLookup() {
5858

5959
map.put(new MinecraftVersion(1, 20, 0), ProtocolConstants.MINECRAFT_1_20);
6060

61+
map.put(new MinecraftVersion(1, 20, 1), ProtocolConstants.MINECRAFT_1_20_1);
62+
6163
map.put(new MinecraftVersion(1, 20, 2), ProtocolConstants.MINECRAFT_1_20_2);
6264
map.put(new MinecraftVersion(1, 20, 3), ProtocolConstants.MINECRAFT_1_20_3);
6365
map.put(new MinecraftVersion(1, 20, 4), ProtocolConstants.MINECRAFT_1_20_4);
66+
map.put(new MinecraftVersion(1, 20, 5), ProtocolConstants.MINECRAFT_1_20_5);
6467
map.put(new MinecraftVersion(1, 20, 6), ProtocolConstants.MINECRAFT_1_20_6);
68+
6569
map.put(new MinecraftVersion(1, 21, 0), ProtocolConstants.MINECRAFT_1_21);
70+
map.put(new MinecraftVersion(1, 21, 1), ProtocolConstants.MINECRAFT_1_21);
71+
map.put(new MinecraftVersion(1, 21, 2), ProtocolConstants.MINECRAFT_1_21_2);
72+
6673

6774
return map;
6875
}

0 commit comments

Comments
 (0)