Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ val viaVersionVersion = "5.0.0"
val viaNBTVersion = "5.0.2"
val miniPlaceholdersVersion = "2.2.3"
val lombokVersion = "1.18.30"
val foliaLibVersion = "main-SNAPSHOT"
val foliaLibVersion = "0.5.1"

allprojects {
apply(plugin = "java-library")
Expand All @@ -29,6 +29,7 @@ allprojects {
maven { url = uri("https://repo.viaversion.com") }
maven { url = uri("https://repo.maven.apache.org/maven2/") }
maven { url = uri("https://repo.opencollab.dev/maven-releases/") }
maven { url = uri("https://repo.tcoded.com/releases") }
}
dependencies {
testImplementation("junit:junit:4.13.2")
Expand All @@ -40,7 +41,7 @@ allprojects {
testCompileOnly("io.papermc.paper:paper-api:${paperVersion}")

implementation("com.viaversion:nbt:${viaNBTVersion}")
implementation("com.github.technicallycoded:FoliaLib:${foliaLibVersion}")
implementation("com.tcoded:FoliaLib:${foliaLibVersion}")

compileOnly("org.projectlombok:lombok:${lombokVersion}")
annotationProcessor("org.projectlombok:lombok:${lombokVersion}")
Expand Down
17 changes: 10 additions & 7 deletions src/main/java/me/catcoder/sidebar/protocol/PacketIds.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ public enum PacketIds {
map(ProtocolConstants.MINECRAFT_1_20_4, 0x5E),
map(ProtocolConstants.MINECRAFT_1_20_4, 0x5E),
map(ProtocolConstants.MINECRAFT_1_20_6, 0x60),
map(ProtocolConstants.MINECRAFT_1_21_2, 0x67)
map(ProtocolConstants.MINECRAFT_1_21_2, 0x67),
map(ProtocolConstants.MINECRAFT_1_21_5, 0x66)
),
UPDATE_SCORE(
map(ProtocolConstants.MINECRAFT_1_12_2, 0x45),
Expand All @@ -34,14 +35,14 @@ public enum PacketIds {
map(ProtocolConstants.MINECRAFT_1_20_2, 0x5D),
map(ProtocolConstants.MINECRAFT_1_20_4, 0x5F),
map(ProtocolConstants.MINECRAFT_1_20_6, 0x61),
map(ProtocolConstants.MINECRAFT_1_21_2, 0x68)


map(ProtocolConstants.MINECRAFT_1_21_2, 0x68),
map(ProtocolConstants.MINECRAFT_1_21_5, 0x67)
),
RESET_SCORE(
map(ProtocolConstants.MINECRAFT_1_20_3, 0x42),
map(ProtocolConstants.MINECRAFT_1_20_4, 0x44),
map(ProtocolConstants.MINECRAFT_1_21_2, 0x49)
map(ProtocolConstants.MINECRAFT_1_21_2, 0x49),
map(ProtocolConstants.MINECRAFT_1_21_5, 0x48)
),
OBJECTIVE_DISPLAY(
map(ProtocolConstants.MINECRAFT_1_12_2, 0x3B),
Expand All @@ -55,7 +56,8 @@ public enum PacketIds {
map(ProtocolConstants.MINECRAFT_1_20_2, 0x53),
map(ProtocolConstants.MINECRAFT_1_20_4, 0x55),
map(ProtocolConstants.MINECRAFT_1_20_6, 0x57),
map(ProtocolConstants.MINECRAFT_1_21_2, 0x5C)
map(ProtocolConstants.MINECRAFT_1_21_2, 0x5C),
map(ProtocolConstants.MINECRAFT_1_21_5, 0x5B)

),
OBJECTIVE(
Expand All @@ -70,7 +72,8 @@ public enum PacketIds {
map(ProtocolConstants.MINECRAFT_1_20_2, 0x5A),
map(ProtocolConstants.MINECRAFT_1_20_4, 0x5C),
map(ProtocolConstants.MINECRAFT_1_20_6, 0x5E),
map(ProtocolConstants.MINECRAFT_1_21_2, 0x64)
map(ProtocolConstants.MINECRAFT_1_21_2, 0x64),
map(ProtocolConstants.MINECRAFT_1_21_5, 0x63)
);

private final ProtocolConstants.ProtocolMapping[] mappings;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,19 @@ public class ProtocolConstants {
public static final int MINECRAFT_1_21 = 767;

public static final int MINECRAFT_1_21_2 = 768;
public static final int MINECRAFT_1_21_3 = 768;
public static final int MINECRAFT_1_21_4 = 769;
public static final int MINECRAFT_1_21_5 = 770;

public static final int MINECRAFT_1_21_6 = 771;
public static final int MINECRAFT_1_21_7 = 772;
public static final int MINECRAFT_1_21_8 = 772;

public static final int MINECRAFT_1_21_9 = 773;
public static final int MINECRAFT_1_21_10 = 773;

public static final int MINIMUM_SUPPORTED_VERSION = MINECRAFT_1_12_2;
public static final int MAXIMUM_SUPPORTED_VERSION = MINECRAFT_1_21_2;
public static final int MAXIMUM_SUPPORTED_VERSION = MINECRAFT_1_21_10;

@Getter
@RequiredArgsConstructor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,13 @@ public <R> ByteBuf createTeamPacket(int mode, int index,

private static void writeDefaults(int serverVersion, @NonNull NetOutput packet) {
packet.writeByte(10); // friendly tags
packet.writeString("always"); // name tag visibility
packet.writeString("always"); // collision rule
if (serverVersion <= ProtocolConstants.MINECRAFT_1_21_4) {
packet.writeString("always"); // name tag visibility
packet.writeString("always"); // collision rule
} else {
packet.writeVarInt(0); // name tag visibility
packet.writeVarInt(0); // collision rule
}
if (serverVersion < ProtocolConstants.MINECRAFT_1_13) {
packet.writeByte(-1); // reset color
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,14 @@ private static NavigableMap<MinecraftVersion, Integer> createLookup() {
map.put(new MinecraftVersion(1, 21, 0), ProtocolConstants.MINECRAFT_1_21);
map.put(new MinecraftVersion(1, 21, 1), ProtocolConstants.MINECRAFT_1_21);
map.put(new MinecraftVersion(1, 21, 2), ProtocolConstants.MINECRAFT_1_21_2);

map.put(new MinecraftVersion(1, 21, 3), ProtocolConstants.MINECRAFT_1_21_3);
map.put(new MinecraftVersion(1, 21, 4), ProtocolConstants.MINECRAFT_1_21_4);
map.put(new MinecraftVersion(1, 21, 5), ProtocolConstants.MINECRAFT_1_21_5);
map.put(new MinecraftVersion(1, 21, 6), ProtocolConstants.MINECRAFT_1_21_6);
map.put(new MinecraftVersion(1, 21, 7), ProtocolConstants.MINECRAFT_1_21_7);
map.put(new MinecraftVersion(1, 21, 8), ProtocolConstants.MINECRAFT_1_21_8);
map.put(new MinecraftVersion(1, 21, 9), ProtocolConstants.MINECRAFT_1_21_9);
map.put(new MinecraftVersion(1, 21, 10), ProtocolConstants.MINECRAFT_1_21_10);

return map;
}
Expand Down