From 67e6e1a2e3023cf78759218452a7765d2c6c641f Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Wed, 3 Apr 2024 16:32:47 +0200 Subject: [PATCH] 24w14a --- .../api/protocol/version/ProtocolVersion.java | 2 +- .../packet/ClientboundPackets1_20_5.java | 3 +- .../packet/ServerboundPackets1_20_5.java | 106 +++++++++--------- .../viaversion/util/ComponentUtil.java | 4 +- gradle.properties | 2 +- 5 files changed, 59 insertions(+), 58 deletions(-) diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java index a769ba123..6d5d7aab2 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java +++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java @@ -83,7 +83,7 @@ public class ProtocolVersion implements Comparable { public static final ProtocolVersion v1_20 = register(763, "1.20/1.20.1", new SubVersionRange("1.20", 0, 1)); public static final ProtocolVersion v1_20_2 = register(764, "1.20.2"); public static final ProtocolVersion v1_20_3 = register(765, "1.20.3/1.20.4", new SubVersionRange("1.20", 3, 4)); - public static final ProtocolVersion v1_20_5 = register(766, 182, "1.20.5"); + public static final ProtocolVersion v1_20_5 = register(766, 184, "1.20.5"); public static final ProtocolVersion unknown = new ProtocolVersion(VersionType.SPECIAL, -1, -1, "UNKNOWN", null); public static ProtocolVersion register(int version, String name) { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ClientboundPackets1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ClientboundPackets1_20_5.java index 9036d1b29..f53873c2e 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ClientboundPackets1_20_5.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ClientboundPackets1_20_5.java @@ -139,7 +139,8 @@ public enum ClientboundPackets1_20_5 implements ClientboundPacket1_20_5 { ENTITY_PROPERTIES, // 0x75 ENTITY_EFFECT, // 0x76 DECLARE_RECIPES, // 0x77 - TAGS; // 0x78 + TAGS, // 0x78 + PROJECTILE_POWER; // 0x79 @Override public int getId() { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ServerboundPackets1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ServerboundPackets1_20_5.java index 73c3c47cd..de6377fbc 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ServerboundPackets1_20_5.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ServerboundPackets1_20_5.java @@ -24,59 +24,59 @@ public enum ServerboundPackets1_20_5 implements ServerboundPacket1_20_5 { SET_DIFFICULTY, // 0x02 CHAT_ACK, // 0x03 CHAT_COMMAND, // 0x04 - CHAT_COMMAND_SIGNED, // 0x04 - CHAT_MESSAGE, // 0x05 - CHAT_SESSION_UPDATE, // 0x06 - CHUNK_BATCH_RECEIVED, // 0x07 - CLIENT_STATUS, // 0x08 - CLIENT_SETTINGS, // 0x09 - TAB_COMPLETE, // 0x0A - CONFIGURATION_ACKNOWLEDGED, // 0x0B - CLICK_WINDOW_BUTTON, // 0x0C - CLICK_WINDOW, // 0x0D - CLOSE_WINDOW, // 0x0E - CONTAINER_SLOT_STATE_CHANGED, // 0x0F - COOKIE_RESPONSE, // 0x10 - PLUGIN_MESSAGE, // 0x11 - DEBUG_SAMPLE_SUBSCRIPTION, // 0x12 - EDIT_BOOK, // 0x13 - ENTITY_NBT_REQUEST, // 0x14 - INTERACT_ENTITY, // 0x15 - GENERATE_JIGSAW, // 0x16 - KEEP_ALIVE, // 0x17 - LOCK_DIFFICULTY, // 0x18 - PLAYER_POSITION, // 0x19 - PLAYER_POSITION_AND_ROTATION, // 0x1A - PLAYER_ROTATION, // 0x1B - PLAYER_MOVEMENT, // 0x1C - VEHICLE_MOVE, // 0x1D - STEER_BOAT, // 0x1E - PICK_ITEM, // 0x1F - PING_REQUEST, // 0x20 - CRAFT_RECIPE_REQUEST, // 0x21 - PLAYER_ABILITIES, // 0x22 - PLAYER_DIGGING, // 0x23 - ENTITY_ACTION, // 0x24 - STEER_VEHICLE, // 0x25 - PONG, // 0x26 - RECIPE_BOOK_DATA, // 0x27 - SEEN_RECIPE, // 0x28 - RENAME_ITEM, // 0x29 - RESOURCE_PACK_STATUS, // 0x2A - ADVANCEMENT_TAB, // 0x2B - SELECT_TRADE, // 0x2C - SET_BEACON_EFFECT, // 0x2D - HELD_ITEM_CHANGE, // 0x2E - UPDATE_COMMAND_BLOCK, // 0x2F - UPDATE_COMMAND_BLOCK_MINECART, // 0x30 - CREATIVE_INVENTORY_ACTION, // 0x31 - UPDATE_JIGSAW_BLOCK, // 0x32 - UPDATE_STRUCTURE_BLOCK, // 0x33 - UPDATE_SIGN, // 0x34 - ANIMATION, // 0x35 - SPECTATE, // 0x36 - PLAYER_BLOCK_PLACEMENT, // 0x37 - USE_ITEM; // 0x38 + CHAT_COMMAND_SIGNED, // 0x05 + CHAT_MESSAGE, // 0x06 + CHAT_SESSION_UPDATE, // 0x07 + CHUNK_BATCH_RECEIVED, // 0x08 + CLIENT_STATUS, // 0x09 + CLIENT_SETTINGS, // 0x0A + TAB_COMPLETE, // 0x0B + CONFIGURATION_ACKNOWLEDGED, // 0x0C + CLICK_WINDOW_BUTTON, // 0x0D + CLICK_WINDOW, // 0x0E + CLOSE_WINDOW, // 0x0F + CONTAINER_SLOT_STATE_CHANGED, // 0x10 + COOKIE_RESPONSE, // 0x11 + PLUGIN_MESSAGE, // 0x12 + DEBUG_SAMPLE_SUBSCRIPTION, // 0x13 + EDIT_BOOK, // 0x14 + ENTITY_NBT_REQUEST, // 0x15 + INTERACT_ENTITY, // 0x16 + GENERATE_JIGSAW, // 0x17 + KEEP_ALIVE, // 0x18 + LOCK_DIFFICULTY, // 0x19 + PLAYER_POSITION, // 0x1A + PLAYER_POSITION_AND_ROTATION, // 0x1B + PLAYER_ROTATION, // 0x1C + PLAYER_MOVEMENT, // 0x1D + VEHICLE_MOVE, // 0x1E + STEER_BOAT, // 0x1F + PICK_ITEM, // 0x20 + PING_REQUEST, // 0x21 + CRAFT_RECIPE_REQUEST, // 0x22 + PLAYER_ABILITIES, // 0x23 + PLAYER_DIGGING, // 0x24 + ENTITY_ACTION, // 0x25 + STEER_VEHICLE, // 0x26 + PONG, // 0x27 + RECIPE_BOOK_DATA, // 0x28 + SEEN_RECIPE, // 0x29 + RENAME_ITEM, // 0x2A + RESOURCE_PACK_STATUS, // 0x2B + ADVANCEMENT_TAB, // 0x2C + SELECT_TRADE, // 0x2D + SET_BEACON_EFFECT, // 0x2E + HELD_ITEM_CHANGE, // 0x2F + UPDATE_COMMAND_BLOCK, // 0x30 + UPDATE_COMMAND_BLOCK_MINECART, // 0x31 + CREATIVE_INVENTORY_ACTION, // 0x32 + UPDATE_JIGSAW_BLOCK, // 0x33 + UPDATE_STRUCTURE_BLOCK, // 0x34 + UPDATE_SIGN, // 0x35 + ANIMATION, // 0x36 + SPECTATE, // 0x37 + PLAYER_BLOCK_PLACEMENT, // 0x38 + USE_ITEM; // 0x39 @Override public int getId() { diff --git a/common/src/main/java/com/viaversion/viaversion/util/ComponentUtil.java b/common/src/main/java/com/viaversion/viaversion/util/ComponentUtil.java index 33c8c2fce..dddfb0083 100644 --- a/common/src/main/java/com/viaversion/viaversion/util/ComponentUtil.java +++ b/common/src/main/java/com/viaversion/viaversion/util/ComponentUtil.java @@ -94,7 +94,7 @@ public final class ComponentUtil { public static @Nullable String tagToJsonString(@Nullable final Tag tag) { try { - final ATextComponent component = TextComponentCodec.V1_20_3.deserializeNbtTree(tag); + final ATextComponent component = SerializerVersion.V1_20_3.toComponent(tag); return component != null ? SerializerVersion.V1_20_3.jsonSerializer.serialize(component) : null; } catch (final Exception e) { Via.getPlatform().getLogger().log(Level.SEVERE, "Error converting tag: " + tag, e); @@ -109,7 +109,7 @@ public final class ComponentUtil { try { final ATextComponent component = TextComponentSerializer.V1_20_3.deserialize(json); - return TextComponentCodec.V1_20_3.serializeNbt(component); + return SerializerVersion.V1_20_3.toTag(component); } catch (final Exception e) { Via.getPlatform().getLogger().log(Level.SEVERE, "Error converting component: " + json, e); return new StringTag(""); diff --git a/gradle.properties b/gradle.properties index 756ebc4b7..417aab75c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Project properties - we put these here so they can be modified without causing a recompile of the build scripts -projectVersion=4.10.0-24w13a-SNAPSHOT +projectVersion=4.10.0-24w14a-SNAPSHOT # Smile emoji mcVersions=1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10, 1.9.4, 1.9.3, 1.9.2, 1.9.1, 1.9, 1.8.9