From ed06d71ac891a4103e917c5f0aa447de0c2ea2d9 Mon Sep 17 00:00:00 2001 From: mworzala Date: Tue, 19 Dec 2023 00:18:13 +0200 Subject: [PATCH] upgrade: first join --- gradle/libs.versions.toml | 1 + .../network/packet/client/ClientPacketsHandler.java | 1 + .../packet/server/ServerPacketIdentifier.java | 13 +++++++++---- .../server/common/ResourcePackSendPacket.java | 4 ++-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 127390ad6..8b7d006e7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,6 +4,7 @@ metadata.format.version = "1.1" # Important dependencies data = "1.20.2-rv1" +#data = "1.20.4-rv1" adventure = "4.15.0" kotlin = "1.7.22" hydrazine = "1.7.2" diff --git a/src/main/java/net/minestom/server/network/packet/client/ClientPacketsHandler.java b/src/main/java/net/minestom/server/network/packet/client/ClientPacketsHandler.java index 4ce49a3d3..073cec172 100644 --- a/src/main/java/net/minestom/server/network/packet/client/ClientPacketsHandler.java +++ b/src/main/java/net/minestom/server/network/packet/client/ClientPacketsHandler.java @@ -104,6 +104,7 @@ public sealed class ClientPacketsHandler permits ClientPacketsHandler.Status, Cl register(nextId(), ClientClickWindowButtonPacket::new); register(nextId(), ClientClickWindowPacket::new); register(nextId(), ClientCloseWindowPacket::new); + nextId(); // window slot state register(nextId(), ClientPluginMessagePacket::new); register(nextId(), ClientEditBookPacket::new); register(nextId(), ClientQueryEntityNbtPacket::new); diff --git a/src/main/java/net/minestom/server/network/packet/server/ServerPacketIdentifier.java b/src/main/java/net/minestom/server/network/packet/server/ServerPacketIdentifier.java index b90845fdd..3d006b9ca 100644 --- a/src/main/java/net/minestom/server/network/packet/server/ServerPacketIdentifier.java +++ b/src/main/java/net/minestom/server/network/packet/server/ServerPacketIdentifier.java @@ -20,9 +20,10 @@ public final class ServerPacketIdentifier { public static final int CONFIGURATION_KEEP_ALIVE = 0x03; public static final int CONFIGURATION_PING = 0x04; public static final int CONFIGURATION_REGISTRY_DATA = 0x05; - public static final int CONFIGURATION_RESOURCE_PACK_SEND = 0x06; - public static final int CONFIGURATION_UPDATE_ENABLED_FEATURES = 0x07; - public static final int CONFIGURATION_TAGS = 0x08; + public static final int CONFIGURATION_RESOURCE_PACK_POP_PACKET = 0x06; + public static final int CONFIGURATION_RESOURCE_PACK_PUSH_PACKET = 0x07; + public static final int CONFIGURATION_UPDATE_ENABLED_FEATURES = 0x08; + public static final int CONFIGURATION_TAGS = 0x09; public static final int BUNDLE = nextPlayId(); public static final int SPAWN_ENTITY = nextPlayId(); @@ -90,7 +91,9 @@ public final class ServerPacketIdentifier { public static final int UNLOCK_RECIPES = nextPlayId(); public static final int DESTROY_ENTITIES = nextPlayId(); public static final int REMOVE_ENTITY_EFFECT = nextPlayId(); - public static final int RESOURCE_PACK_SEND = nextPlayId(); + public static final int RESET_SCORE = nextPlayId(); + public static final int RESOURCE_PACK_POP = nextPlayId(); + public static final int RESOURCE_PACK_PUSH = nextPlayId(); public static final int RESPAWN = nextPlayId(); public static final int ENTITY_HEAD_LOOK = nextPlayId(); public static final int MULTI_BLOCK_CHANGE = nextPlayId(); @@ -132,6 +135,8 @@ public final class ServerPacketIdentifier { public static final int NBT_QUERY_RESPONSE = nextPlayId(); public static final int COLLECT_ITEM = nextPlayId(); public static final int ENTITY_TELEPORT = nextPlayId(); + public static final int TICK_STATE = nextPlayId(); + public static final int TICK_STEP = nextPlayId(); public static final int ADVANCEMENTS = nextPlayId(); public static final int ENTITY_PROPERTIES = nextPlayId(); public static final int ENTITY_EFFECT = nextPlayId(); diff --git a/src/main/java/net/minestom/server/network/packet/server/common/ResourcePackSendPacket.java b/src/main/java/net/minestom/server/network/packet/server/common/ResourcePackSendPacket.java index 83ae4b77d..eacb13730 100644 --- a/src/main/java/net/minestom/server/network/packet/server/common/ResourcePackSendPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/common/ResourcePackSendPacket.java @@ -49,8 +49,8 @@ public record ResourcePackSendPacket( @Override public int getId(@NotNull ConnectionState state) { return switch (state) { - case CONFIGURATION -> ServerPacketIdentifier.CONFIGURATION_RESOURCE_PACK_SEND; - case PLAY -> ServerPacketIdentifier.RESOURCE_PACK_SEND; +// case CONFIGURATION -> ServerPacketIdentifier.CONFIGURATION_RESOURCE_PACK_SEND; +// case PLAY -> ServerPacketIdentifier.RESOURCE_PACK_SEND; default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.CONFIGURATION, ConnectionState.PLAY); }; }