From adac67b85cbb459384dbc059673619a674a7981c Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Tue, 21 Nov 2023 07:13:37 +0100 Subject: [PATCH] Handle new resource pack actions --- .../Protocol1_20_2To1_20_3.java | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_2to1_20_3/Protocol1_20_2To1_20_3.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_2to1_20_3/Protocol1_20_2To1_20_3.java index af56bd67..3ab0bfc0 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_2to1_20_3/Protocol1_20_2To1_20_3.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_2to1_20_3/Protocol1_20_2To1_20_3.java @@ -300,22 +300,31 @@ public final class Protocol1_20_2To1_20_3 extends BackwardsProtocol { - final ResourcepackIDStorage storage = wrapper.user().get(ResourcepackIDStorage.class); - wrapper.write(Type.UUID, storage != null ? storage.uuid() : UUID.randomUUID()); - }); + registerServerbound(ServerboundPackets1_20_2.RESOURCE_PACK_STATUS, resourcePackStatusHandler()); cancelClientbound(State.CONFIGURATION, ClientboundConfigurationPackets1_20_3.RESOURCE_PACK_POP.getId()); - registerServerbound(State.CONFIGURATION, ServerboundConfigurationPackets1_20_2.RESOURCE_PACK, wrapper -> { - final ResourcepackIDStorage storage = wrapper.user().get(ResourcepackIDStorage.class); - wrapper.write(Type.UUID, storage != null ? storage.uuid() : UUID.randomUUID()); - }); + registerServerbound(State.CONFIGURATION, ServerboundConfigurationPackets1_20_2.RESOURCE_PACK, resourcePackStatusHandler()); registerClientbound(State.CONFIGURATION, ClientboundConfigurationPackets1_20_3.RESOURCE_PACK_PUSH.getId(), ServerboundConfigurationPackets1_20_2.RESOURCE_PACK.getId(), resourcePackHandler()); // TODO Auto map via packet types provider registerClientbound(State.CONFIGURATION, ClientboundConfigurationPackets1_20_3.UPDATE_ENABLED_FEATURES.getId(), ClientboundConfigurationPackets1_20_2.UPDATE_ENABLED_FEATURES.getId()); registerClientbound(State.CONFIGURATION, ClientboundConfigurationPackets1_20_3.UPDATE_TAGS.getId(), ClientboundConfigurationPackets1_20_2.UPDATE_TAGS.getId()); } + private PacketHandler resourcePackStatusHandler() { + return wrapper -> { + final ResourcepackIDStorage storage = wrapper.user().get(ResourcepackIDStorage.class); + wrapper.write(Type.UUID, storage != null ? storage.uuid() : UUID.randomUUID()); + + final int action = wrapper.read(Type.VAR_INT); + if (action > 3) { // Aadded invalid url, failed reload, and discarded + wrapper.write(Type.VAR_INT, 2); // Failed download + } else { + wrapper.write(Type.VAR_INT, action); + } + }; + } + + private PacketHandler resourcePackHandler() { return wrapper -> { final UUID uuid = wrapper.read(Type.UUID);