From e020c616c9d00fd2d909ac58c7291f997c85a3d0 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Wed, 31 Jan 2024 17:36:12 +0100
Subject: [PATCH] 24w05a

---
 .../Protocol1_20_5To1_20_3.java               |   1 +
 .../packet/ClientboundPackets1_20_5.java      |   1 +
 .../packet/ServerboundPackets1_20_5.java      |   1 +
 .../rewriter/EntityPacketRewriter1_20_5.java  |   2 +-
 .../viaversion/data/identifiers-1.20.5.nbt    | Bin 3967 -> 3985 bytes
 .../data/mappings-1.20.3to1.20.5.nbt          | Bin 863 -> 871 bytes
 gradle.properties                             |   2 +-
 7 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/Protocol1_20_5To1_20_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/Protocol1_20_5To1_20_3.java
index e372cb170..2948fda8f 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/Protocol1_20_5To1_20_3.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/Protocol1_20_5To1_20_3.java
@@ -87,6 +87,7 @@ public final class Protocol1_20_5To1_20_3 extends AbstractProtocol<ClientboundPa
         cancelServerbound(State.LOGIN, ServerboundLoginPackets.COOKIE_RESPONSE.getId());
         cancelServerbound(ServerboundConfigurationPackets1_20_5.COOKIE_RESPONSE);
         cancelServerbound(ServerboundPackets1_20_5.COOKIE_RESPONSE);
+        cancelServerbound(ServerboundPackets1_20_5.DEBUG_SAMPLE_SUBSCRIPTION);
     }
 
     @Override
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 dc9f8e57b..4ef4b7220 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
@@ -46,6 +46,7 @@ public enum ClientboundPackets1_20_5 implements ClientboundPacket1_20_5 {
     CUSTOM_CHAT_COMPLETIONS, // 0x18
     PLUGIN_MESSAGE, // 0x19
     DAMAGE_EVENT, // 0x1A
+    DEBUG_SAMPLE, // 0x1B
     DELETE_CHAT_MESSAGE, // 0x1B
     DISCONNECT, // 0x1C
     DISGUISED_CHAT, // 0x1D
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 a981f488d..3f6cd09c2 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
@@ -37,6 +37,7 @@ public enum ServerboundPackets1_20_5 implements ServerboundPacket1_20_5 {
     CONTAINER_SLOT_STATE_CHANGED, // 0x0F
     COOKIE_RESPONSE, // 0x10
     PLUGIN_MESSAGE, // 0x11
+    DEBUG_SAMPLE_SUBSCRIPTION, // 0x12
     EDIT_BOOK, // 0x12
     ENTITY_NBT_REQUEST, // 0x13
     INTERACT_ENTITY, // 0x14
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java
index 27b488cb6..a0c1c39b1 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java
@@ -199,7 +199,7 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter<Clientbound
                 Types1_20_5.META_TYPES.particleType
         );
 
-        filter().type(EntityTypes1_20_5.WOLF).addIndex(21); // Has armor
+        filter().type(EntityTypes1_20_5.LLAMA).removeIndex(20); // Carpet color
 
         filter().type(EntityTypes1_20_5.MINECART_ABSTRACT).index(11).handler((event, meta) -> {
             final int blockState = meta.value();
diff --git a/common/src/main/resources/assets/viaversion/data/identifiers-1.20.5.nbt b/common/src/main/resources/assets/viaversion/data/identifiers-1.20.5.nbt
index c3313bc84558408d172ce426816b81bb60a7e3ce..9701a5d40a582849396d01cad77f53a1757e6ad8 100644
GIT binary patch
delta 32
ocmew_H&K2=IV)r8<_cCdRvrd{vc%GylKABOyu8gbxSq2B0JcL5Pyhe`

delta 19
bcmbOz|6guHIV)qz<_cCd*3BEZ9<l%cN#_R)

diff --git a/common/src/main/resources/assets/viaversion/data/mappings-1.20.3to1.20.5.nbt b/common/src/main/resources/assets/viaversion/data/mappings-1.20.3to1.20.5.nbt
index 360f8abd9083630f995551ce92326354f956c120..b41c468f38df7fe5e787b41712aa5e466183c49b 100644
GIT binary patch
delta 103
zcmcc5_MB~kKBLM+11%sC?dzk!$iS4D!pO|PQk+?p%D}+J%+0`*Si-=-zzW1>Kx_}h
o%Yb-2P$(NHS&|RrfFvD(*awKW0`Y#JP{+hKsf?+cgBW?40N2M72><{9

delta 95
zcmaFPcAss6KBLG)11(17iP63;!i)?|nJJ9S3@pW&RjCXNY|PvYOo=573=AwlYzD;k
kK)eiy*8?R=@_`JHgd-690P$8J-aqk6Dr3s#C`Mi;08(%e^8f$<

diff --git a/gradle.properties b/gradle.properties
index fc798064a..fa32b587d 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-24w04a-SNAPSHOT
+projectVersion=4.10.0-24w05a-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