From 58a1e66ed6346eeb416db1a875e9a0b679b31428 Mon Sep 17 00:00:00 2001 From: RaphiMC <50594595+RaphiMC@users.noreply.github.com> Date: Sun, 10 Dec 2023 22:48:37 +0100 Subject: [PATCH] Optimized packet splitting --- .../ServerboundPacketsb1_8.java | 9 ++------- .../ServerboundPacketsb1_4.java | 6 +----- .../ServerboundPacketsb1_5.java | 9 ++------- .../ServerboundPacketsb1_7.java | 9 ++------- .../protocol1_1to1_0_0_1/ServerboundPackets1_0.java | 9 ++------- .../protocol1_2_1_3to1_1/ServerboundPackets1_1.java | 3 +-- .../ClientboundPackets1_2_1.java | 4 +--- .../ServerboundPackets1_2_1.java | 3 +-- .../ClientboundPackets1_2_4.java | 11 ++--------- .../ServerboundPackets1_2_4.java | 10 ++-------- .../ClientboundPackets1_3_1.java | 4 +--- .../ServerboundPackets1_3_1.java | 3 +-- .../ClientboundPackets1_4_2.java | 9 ++------- .../ClientboundPackets1_4_4.java | 9 ++------- .../ClientboundPackets1_4_6.java | 9 ++------- .../ClientboundPackets1_5_2.java | 12 +++--------- .../ServerboundPackets1_5_2.java | 3 +-- .../ClientboundPackets1_6_1.java | 12 +++--------- .../ClientboundPackets1_6_4.java | 12 +++--------- .../ServerboundPackets1_6_4.java | 9 ++------- 20 files changed, 36 insertions(+), 119 deletions(-) diff --git a/src/main/java/net/raphimc/vialegacy/protocols/beta/protocol1_0_0_1tob1_8_0_1/ServerboundPacketsb1_8.java b/src/main/java/net/raphimc/vialegacy/protocols/beta/protocol1_0_0_1tob1_8_0_1/ServerboundPacketsb1_8.java index a3da27f..e0034bd 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/beta/protocol1_0_0_1tob1_8_0_1/ServerboundPacketsb1_8.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/beta/protocol1_0_0_1tob1_8_0_1/ServerboundPacketsb1_8.java @@ -51,15 +51,10 @@ public enum ServerboundPacketsb1_8 implements ServerboundPacketType, PreNettyPac HELD_ITEM_CHANGE(16, (user, buf) -> buf.skipBytes(2)), ANIMATION(18, (user, buf) -> buf.skipBytes(5)), ENTITY_ACTION(19, (user, buf) -> buf.skipBytes(5)), - POSITION(27, (user, buf) -> { - buf.skipBytes(16); - buf.readBoolean(); - buf.readBoolean(); - }), + POSITION(27, (user, buf) -> buf.skipBytes(18)), CLOSE_WINDOW(101, (user, buf) -> buf.skipBytes(1)), CLICK_WINDOW(102, (user, buf) -> { - buf.skipBytes(6); - buf.readBoolean(); + buf.skipBytes(7); readItemStackb1_2(buf); }), WINDOW_CONFIRMATION(106, (user, buf) -> buf.skipBytes(4)), diff --git a/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_5_0_2tob1_4_0_1/ServerboundPacketsb1_4.java b/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_5_0_2tob1_4_0_1/ServerboundPacketsb1_4.java index dd352f5..f523afd 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_5_0_2tob1_4_0_1/ServerboundPacketsb1_4.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_5_0_2tob1_4_0_1/ServerboundPacketsb1_4.java @@ -54,11 +54,7 @@ public enum ServerboundPacketsb1_4 implements ServerboundPacketType, PreNettyPac HELD_ITEM_CHANGE(16, (user, buf) -> buf.skipBytes(2)), ANIMATION(18, (user, buf) -> buf.skipBytes(5)), ENTITY_ACTION(19, (user, buf) -> buf.skipBytes(5)), - POSITION(27, (user, buf) -> { - buf.skipBytes(16); - buf.readBoolean(); - buf.readBoolean(); - }), + POSITION(27, (user, buf) -> buf.skipBytes(18)), CLOSE_WINDOW(101, (user, buf) -> buf.skipBytes(1)), CLICK_WINDOW(102, (user, buf) -> { buf.skipBytes(6); diff --git a/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_6_0_6tob1_5_0_2/ServerboundPacketsb1_5.java b/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_6_0_6tob1_5_0_2/ServerboundPacketsb1_5.java index 758de65..ef32723 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_6_0_6tob1_5_0_2/ServerboundPacketsb1_5.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_6_0_6tob1_5_0_2/ServerboundPacketsb1_5.java @@ -53,15 +53,10 @@ public enum ServerboundPacketsb1_5 implements ServerboundPacketType, PreNettyPac HELD_ITEM_CHANGE(16, (user, buf) -> buf.skipBytes(2)), ANIMATION(18, (user, buf) -> buf.skipBytes(5)), ENTITY_ACTION(19, (user, buf) -> buf.skipBytes(5)), - POSITION(27, (user, buf) -> { - buf.skipBytes(16); - buf.readBoolean(); - buf.readBoolean(); - }), + POSITION(27, (user, buf) -> buf.skipBytes(18)), CLOSE_WINDOW(101, (user, buf) -> buf.skipBytes(1)), CLICK_WINDOW(102, (user, buf) -> { - buf.skipBytes(6); - buf.readBoolean(); + buf.skipBytes(7); readItemStackb1_2(buf); }), WINDOW_CONFIRMATION(106, (user, buf) -> buf.skipBytes(4)), diff --git a/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_8_0_1tob1_7_0_3/ServerboundPacketsb1_7.java b/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_8_0_1tob1_7_0_3/ServerboundPacketsb1_7.java index f3f3b6b..c18ec11 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_8_0_1tob1_7_0_3/ServerboundPacketsb1_7.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_8_0_1tob1_7_0_3/ServerboundPacketsb1_7.java @@ -52,15 +52,10 @@ public enum ServerboundPacketsb1_7 implements ServerboundPacketType, PreNettyPac HELD_ITEM_CHANGE(16, (user, buf) -> buf.skipBytes(2)), ANIMATION(18, (user, buf) -> buf.skipBytes(5)), ENTITY_ACTION(19, (user, buf) -> buf.skipBytes(5)), - POSITION(27, (user, buf) -> { - buf.skipBytes(16); - buf.readBoolean(); - buf.readBoolean(); - }), + POSITION(27, (user, buf) -> buf.skipBytes(18)), CLOSE_WINDOW(101, (user, buf) -> buf.skipBytes(1)), CLICK_WINDOW(102, (user, buf) -> { - buf.skipBytes(6); - buf.readBoolean(); + buf.skipBytes(7); readItemStackb1_2(buf); }), WINDOW_CONFIRMATION(106, (user, buf) -> buf.skipBytes(4)), diff --git a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_1to1_0_0_1/ServerboundPackets1_0.java b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_1to1_0_0_1/ServerboundPackets1_0.java index 1fac6e7..787a83a 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_1to1_0_0_1/ServerboundPackets1_0.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_1to1_0_0_1/ServerboundPackets1_0.java @@ -51,15 +51,10 @@ public enum ServerboundPackets1_0 implements ServerboundPacketType, PreNettyPack HELD_ITEM_CHANGE(16, (user, buf) -> buf.skipBytes(2)), ANIMATION(18, (user, buf) -> buf.skipBytes(5)), ENTITY_ACTION(19, (user, buf) -> buf.skipBytes(5)), - POSITION(27, (user, buf) -> { - buf.skipBytes(16); - buf.readBoolean(); - buf.readBoolean(); - }), + POSITION(27, (user, buf) -> buf.skipBytes(18)), CLOSE_WINDOW(101, (user, buf) -> buf.skipBytes(1)), CLICK_WINDOW(102, (user, buf) -> { - buf.skipBytes(6); - buf.readBoolean(); + buf.skipBytes(7); readItemStack1_0(buf); }), WINDOW_CONFIRMATION(106, (user, buf) -> buf.skipBytes(4)), diff --git a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_2_1_3to1_1/ServerboundPackets1_1.java b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_2_1_3to1_1/ServerboundPackets1_1.java index 17cc83c..b629fef 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_2_1_3to1_1/ServerboundPackets1_1.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_2_1_3to1_1/ServerboundPackets1_1.java @@ -58,8 +58,7 @@ public enum ServerboundPackets1_1 implements ServerboundPacketType, PreNettyPack ENTITY_ACTION(19, (user, buf) -> buf.skipBytes(5)), CLOSE_WINDOW(101, (user, buf) -> buf.skipBytes(1)), CLICK_WINDOW(102, (user, buf) -> { - buf.skipBytes(6); - buf.readBoolean(); + buf.skipBytes(7); readItemStack1_0(buf); }), WINDOW_CONFIRMATION(106, (user, buf) -> buf.skipBytes(4)), diff --git a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_2_4_5to1_2_1_3/ClientboundPackets1_2_1.java b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_2_4_5to1_2_1_3/ClientboundPackets1_2_1.java index ae8b7cc..f4ff835 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_2_4_5to1_2_1_3/ClientboundPackets1_2_1.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_2_4_5to1_2_1_3/ClientboundPackets1_2_1.java @@ -94,9 +94,7 @@ public enum ClientboundPackets1_2_1 implements ClientboundPacketType, PreNettyPa SET_EXPERIENCE(43, (user, buf) -> buf.skipBytes(8)), PRE_CHUNK(50, (user, buf) -> buf.skipBytes(9)), CHUNK_DATA(51, (user, buf) -> { - buf.skipBytes(8); - buf.readBoolean(); - buf.skipBytes(4); + buf.skipBytes(13); int x = buf.readInt(); buf.skipBytes(4); for (int i = 0; i < x; i++) buf.readByte(); diff --git a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_2_4_5to1_2_1_3/ServerboundPackets1_2_1.java b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_2_4_5to1_2_1_3/ServerboundPackets1_2_1.java index a7395f0..8d3de06 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_2_4_5to1_2_1_3/ServerboundPackets1_2_1.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_2_4_5to1_2_1_3/ServerboundPackets1_2_1.java @@ -57,8 +57,7 @@ public enum ServerboundPackets1_2_1 implements ServerboundPacketType, PreNettyPa ENTITY_ACTION(19, (user, buf) -> buf.skipBytes(5)), CLOSE_WINDOW(101, (user, buf) -> buf.skipBytes(1)), CLICK_WINDOW(102, (user, buf) -> { - buf.skipBytes(6); - buf.readBoolean(); + buf.skipBytes(7); readItemStack1_0(buf); }), WINDOW_CONFIRMATION(106, (user, buf) -> buf.skipBytes(4)), diff --git a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_3_1_2to1_2_4_5/ClientboundPackets1_2_4.java b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_3_1_2to1_2_4_5/ClientboundPackets1_2_4.java index f668249..6180a88 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_3_1_2to1_2_4_5/ClientboundPackets1_2_4.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_3_1_2to1_2_4_5/ClientboundPackets1_2_4.java @@ -94,9 +94,7 @@ public enum ClientboundPackets1_2_4 implements ClientboundPacketType, PreNettyPa SET_EXPERIENCE(43, (user, buf) -> buf.skipBytes(8)), PRE_CHUNK(50, (user, buf) -> buf.skipBytes(9)), CHUNK_DATA(51, (user, buf) -> { - buf.skipBytes(8); - buf.readBoolean(); - buf.skipBytes(4); + buf.skipBytes(13); int x = buf.readInt(); buf.skipBytes(4); for (int i = 0; i < x; i++) buf.readByte(); @@ -157,12 +155,7 @@ public enum ClientboundPackets1_2_4 implements ClientboundPacketType, PreNettyPa readString(buf); buf.skipBytes(3); }), - PLAYER_ABILITIES(202, (user, buf) -> { - buf.readBoolean(); - buf.readBoolean(); - buf.readBoolean(); - buf.readBoolean(); - }), + PLAYER_ABILITIES(202, (user, buf) -> buf.skipBytes(4)), PLUGIN_MESSAGE(250, (user, buf) -> { readString(buf); short s = buf.readShort(); diff --git a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_3_1_2to1_2_4_5/ServerboundPackets1_2_4.java b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_3_1_2to1_2_4_5/ServerboundPackets1_2_4.java index 2840150..888b3a2 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_3_1_2to1_2_4_5/ServerboundPackets1_2_4.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_3_1_2to1_2_4_5/ServerboundPackets1_2_4.java @@ -57,8 +57,7 @@ public enum ServerboundPackets1_2_4 implements ServerboundPacketType, PreNettyPa ENTITY_ACTION(19, (user, buf) -> buf.skipBytes(5)), CLOSE_WINDOW(101, (user, buf) -> buf.skipBytes(1)), CLICK_WINDOW(102, (user, buf) -> { - buf.skipBytes(6); - buf.readBoolean(); + buf.skipBytes(7); readItemStack1_0(buf); }), WINDOW_CONFIRMATION(106, (user, buf) -> buf.skipBytes(4)), @@ -74,12 +73,7 @@ public enum ServerboundPackets1_2_4 implements ServerboundPacketType, PreNettyPa readString(buf); readString(buf); }), - PLAYER_ABILITIES(202, (user, buf) -> { - buf.readBoolean(); - buf.readBoolean(); - buf.readBoolean(); - buf.readBoolean(); - }), + PLAYER_ABILITIES(202, (user, buf) -> buf.skipBytes(4)), PLUGIN_MESSAGE(250, (user, buf) -> { readString(buf); short s = buf.readShort(); diff --git a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_4_2to1_3_1_2/ClientboundPackets1_3_1.java b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_4_2to1_3_1_2/ClientboundPackets1_3_1.java index 1cc8233..a5ec65b 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_4_2to1_3_1_2/ClientboundPackets1_3_1.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_4_2to1_3_1_2/ClientboundPackets1_3_1.java @@ -98,9 +98,7 @@ public enum ClientboundPackets1_3_1 implements ClientboundPacketType, PreNettyPa REMOVE_ENTITY_EFFECT(42, (user, buf) -> buf.skipBytes(5)), SET_EXPERIENCE(43, (user, buf) -> buf.skipBytes(8)), CHUNK_DATA(51, (user, buf) -> { - buf.skipBytes(8); - buf.readBoolean(); - buf.skipBytes(4); + buf.skipBytes(13); int x = buf.readInt(); for (int i = 0; i < x; i++) buf.readByte(); }), diff --git a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_4_2to1_3_1_2/ServerboundPackets1_3_1.java b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_4_2to1_3_1_2/ServerboundPackets1_3_1.java index 7b56073..44372e9 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_4_2to1_3_1_2/ServerboundPackets1_3_1.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_4_2to1_3_1_2/ServerboundPackets1_3_1.java @@ -61,8 +61,7 @@ public enum ServerboundPackets1_3_1 implements ServerboundPacketType, PreNettyPa ENTITY_ACTION(19, (user, buf) -> buf.skipBytes(5)), CLOSE_WINDOW(101, (user, buf) -> buf.skipBytes(1)), CLICK_WINDOW(102, (user, buf) -> { - buf.skipBytes(6); - buf.readBoolean(); + buf.skipBytes(7); readItemStack1_3_1(buf); }), WINDOW_CONFIRMATION(106, (user, buf) -> buf.skipBytes(4)), diff --git a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_4_4_5to1_4_2/ClientboundPackets1_4_2.java b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_4_4_5to1_4_2/ClientboundPackets1_4_2.java index 30b74ae..d443c06 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_4_4_5to1_4_2/ClientboundPackets1_4_2.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_4_4_5to1_4_2/ClientboundPackets1_4_2.java @@ -102,9 +102,7 @@ public enum ClientboundPackets1_4_2 implements ClientboundPacketType, PreNettyPa REMOVE_ENTITY_EFFECT(42, (user, buf) -> buf.skipBytes(5)), SET_EXPERIENCE(43, (user, buf) -> buf.skipBytes(8)), CHUNK_DATA(51, (user, buf) -> { - buf.skipBytes(8); - buf.readBoolean(); - buf.skipBytes(4); + buf.skipBytes(13); int x = buf.readInt(); for (int i = 0; i < x; i++) buf.readByte(); }), @@ -132,10 +130,7 @@ public enum ClientboundPackets1_4_2 implements ClientboundPacketType, PreNettyPa } buf.skipBytes(12); }), - EFFECT(61, (user, buf) -> { - buf.skipBytes(17); - buf.readBoolean(); - }), + EFFECT(61, (user, buf) -> buf.skipBytes(18)), NAMED_SOUND(62, (user, buf) -> { readString(buf); buf.skipBytes(17); diff --git a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_4_6_7to1_4_4_5/ClientboundPackets1_4_4.java b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_4_6_7to1_4_4_5/ClientboundPackets1_4_4.java index 598a1f6..c3e570e 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_4_6_7to1_4_4_5/ClientboundPackets1_4_4.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_4_6_7to1_4_4_5/ClientboundPackets1_4_4.java @@ -101,9 +101,7 @@ public enum ClientboundPackets1_4_4 implements ClientboundPacketType, PreNettyPa REMOVE_ENTITY_EFFECT(42, (user, buf) -> buf.skipBytes(5)), SET_EXPERIENCE(43, (user, buf) -> buf.skipBytes(8)), CHUNK_DATA(51, (user, buf) -> { - buf.skipBytes(8); - buf.readBoolean(); - buf.skipBytes(4); + buf.skipBytes(13); int x = buf.readInt(); for (int i = 0; i < x; i++) buf.readByte(); }), @@ -131,10 +129,7 @@ public enum ClientboundPackets1_4_4 implements ClientboundPacketType, PreNettyPa } buf.skipBytes(12); }), - EFFECT(61, (user, buf) -> { - buf.skipBytes(17); - buf.readBoolean(); - }), + EFFECT(61, (user, buf) -> buf.skipBytes(18)), NAMED_SOUND(62, (user, buf) -> { PreNettyTypes.readString(buf); buf.skipBytes(17); diff --git a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_5_0_1to1_4_6_7/ClientboundPackets1_4_6.java b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_5_0_1to1_4_6_7/ClientboundPackets1_4_6.java index d621bdb..18bd48d 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_5_0_1to1_4_6_7/ClientboundPackets1_4_6.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_5_0_1to1_4_6_7/ClientboundPackets1_4_6.java @@ -97,9 +97,7 @@ public enum ClientboundPackets1_4_6 implements ClientboundPacketType, PreNettyPa REMOVE_ENTITY_EFFECT(42, (user, buf) -> buf.skipBytes(5)), SET_EXPERIENCE(43, (user, buf) -> buf.skipBytes(8)), CHUNK_DATA(51, (user, buf) -> { - buf.skipBytes(8); - buf.readBoolean(); - buf.skipBytes(4); + buf.skipBytes(13); int x = buf.readInt(); for (int i = 0; i < x; i++) buf.readByte(); }), @@ -128,10 +126,7 @@ public enum ClientboundPackets1_4_6 implements ClientboundPacketType, PreNettyPa } buf.skipBytes(12); }), - EFFECT(61, (user, buf) -> { - buf.skipBytes(17); - buf.readBoolean(); - }), + EFFECT(61, (user, buf) -> buf.skipBytes(18)), NAMED_SOUND(62, (user, buf) -> { PreNettyTypes.readString(buf); buf.skipBytes(17); diff --git a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_6_1to1_5_2/ClientboundPackets1_5_2.java b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_6_1to1_5_2/ClientboundPackets1_5_2.java index 46f55d1..a619d47 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_6_1to1_5_2/ClientboundPackets1_5_2.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_6_1to1_5_2/ClientboundPackets1_5_2.java @@ -98,9 +98,7 @@ public enum ClientboundPackets1_5_2 implements ClientboundPacketType, PreNettyPa REMOVE_ENTITY_EFFECT(42, (user, buf) -> buf.skipBytes(5)), SET_EXPERIENCE(43, (user, buf) -> buf.skipBytes(8)), CHUNK_DATA(51, (user, buf) -> { - buf.skipBytes(8); - buf.readBoolean(); - buf.skipBytes(4); + buf.skipBytes(13); int x = buf.readInt(); for (int i = 0; i < x; i++) buf.readByte(); }), @@ -129,10 +127,7 @@ public enum ClientboundPackets1_5_2 implements ClientboundPacketType, PreNettyPa } buf.skipBytes(12); }), - EFFECT(61, (user, buf) -> { - buf.skipBytes(17); - buf.readBoolean(); - }), + EFFECT(61, (user, buf) -> buf.skipBytes(18)), NAMED_SOUND(62, (user, buf) -> { readString(buf); buf.skipBytes(17); @@ -146,8 +141,7 @@ public enum ClientboundPackets1_5_2 implements ClientboundPacketType, PreNettyPa OPEN_WINDOW(100, (user, buf) -> { buf.skipBytes(2); readString(buf); - buf.skipBytes(1); - buf.readBoolean(); + buf.skipBytes(2); }), CLOSE_WINDOW(101, (user, buf) -> buf.skipBytes(1)), SET_SLOT(103, (user, buf) -> { diff --git a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_6_1to1_5_2/ServerboundPackets1_5_2.java b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_6_1to1_5_2/ServerboundPackets1_5_2.java index ab0da24..5444ca8 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_6_1to1_5_2/ServerboundPackets1_5_2.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_6_1to1_5_2/ServerboundPackets1_5_2.java @@ -81,8 +81,7 @@ public enum ServerboundPackets1_5_2 implements ServerboundPacketType, PreNettyPa TAB_COMPLETE(203, (user, buf) -> readString(buf)), CLIENT_SETTINGS(204, (user, buf) -> { readString(buf); - buf.skipBytes(3); - buf.readBoolean(); + buf.skipBytes(4); }), CLIENT_STATUS(205, (user, buf) -> buf.skipBytes(1)), PLUGIN_MESSAGE(250, (user, buf) -> { diff --git a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_6_2to1_6_1/ClientboundPackets1_6_1.java b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_6_2to1_6_1/ClientboundPackets1_6_1.java index 18543f7..69e9090 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_6_2to1_6_1/ClientboundPackets1_6_1.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_6_2to1_6_1/ClientboundPackets1_6_1.java @@ -106,9 +106,7 @@ public enum ClientboundPackets1_6_1 implements ClientboundPacketType, PreNettyPa } }), CHUNK_DATA(51, (user, buf) -> { - buf.skipBytes(8); - buf.readBoolean(); - buf.skipBytes(4); + buf.skipBytes(13); int x = buf.readInt(); for (int i = 0; i < x; i++) buf.readByte(); }), @@ -137,10 +135,7 @@ public enum ClientboundPackets1_6_1 implements ClientboundPacketType, PreNettyPa } buf.skipBytes(12); }), - EFFECT(61, (user, buf) -> { - buf.skipBytes(17); - buf.readBoolean(); - }), + EFFECT(61, (user, buf) -> buf.skipBytes(18)), NAMED_SOUND(62, (user, buf) -> { readString(buf); buf.skipBytes(17); @@ -155,8 +150,7 @@ public enum ClientboundPackets1_6_1 implements ClientboundPacketType, PreNettyPa buf.skipBytes(1); int x = buf.readByte(); readString(buf); - buf.skipBytes(1); - buf.readBoolean(); + buf.skipBytes(2); if (x == 11) buf.readInt(); }), CLOSE_WINDOW(101, (user, buf) -> buf.skipBytes(1)), diff --git a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_7_2_5to1_6_4/ClientboundPackets1_6_4.java b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_7_2_5to1_6_4/ClientboundPackets1_6_4.java index eaf3bde..549e520 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_7_2_5to1_6_4/ClientboundPackets1_6_4.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_7_2_5to1_6_4/ClientboundPackets1_6_4.java @@ -110,9 +110,7 @@ public enum ClientboundPackets1_6_4 implements ClientboundPacketType, PreNettyPa } }), CHUNK_DATA(51, (user, buf) -> { - buf.skipBytes(8); - buf.readBoolean(); - buf.skipBytes(4); + buf.skipBytes(13); int x = buf.readInt(); for (int i = 0; i < x; i++) buf.readByte(); }), @@ -141,10 +139,7 @@ public enum ClientboundPackets1_6_4 implements ClientboundPacketType, PreNettyPa } buf.skipBytes(12); }), - EFFECT(61, (user, buf) -> { - buf.skipBytes(17); - buf.readBoolean(); - }), + EFFECT(61, (user, buf) -> buf.skipBytes(18)), NAMED_SOUND(62, (user, buf) -> { readString(buf); buf.skipBytes(17); @@ -159,8 +154,7 @@ public enum ClientboundPackets1_6_4 implements ClientboundPacketType, PreNettyPa buf.skipBytes(1); int x = buf.readByte(); readString(buf); - buf.skipBytes(1); - buf.readBoolean(); + buf.skipBytes(2); if (x == 11) buf.readInt(); }), CLOSE_WINDOW(101, (user, buf) -> buf.skipBytes(1)), diff --git a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_7_2_5to1_6_4/ServerboundPackets1_6_4.java b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_7_2_5to1_6_4/ServerboundPackets1_6_4.java index 672f244..f2a78ce 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_7_2_5to1_6_4/ServerboundPackets1_6_4.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_7_2_5to1_6_4/ServerboundPackets1_6_4.java @@ -59,11 +59,7 @@ public enum ServerboundPackets1_6_4 implements ServerboundPacketType, PreNettyPa HELD_ITEM_CHANGE(16, (user, buf) -> buf.skipBytes(2)), ANIMATION(18, (user, buf) -> buf.skipBytes(5)), ENTITY_ACTION(19, (user, buf) -> buf.skipBytes(9)), - STEER_VEHICLE(27, (user, buf) -> { - buf.skipBytes(8); - buf.readBoolean(); - buf.readBoolean(); - }), + STEER_VEHICLE(27, (user, buf) -> buf.skipBytes(10)), CLOSE_WINDOW(101, (user, buf) -> buf.skipBytes(1)), CLICK_WINDOW(102, (user, buf) -> { buf.skipBytes(7); @@ -86,8 +82,7 @@ public enum ServerboundPackets1_6_4 implements ServerboundPacketType, PreNettyPa TAB_COMPLETE(203, (user, buf) -> readString(buf)), CLIENT_SETTINGS(204, (user, buf) -> { readString(buf); - buf.skipBytes(3); - buf.readBoolean(); + buf.skipBytes(4); }), CLIENT_STATUS(205, (user, buf) -> buf.skipBytes(1)), PLUGIN_MESSAGE(250, (user, buf) -> {