From e08c263ced65db7350de3beb4a5dff568a204968 Mon Sep 17 00:00:00 2001
From: Gero <gecam59@gmail.com>
Date: Fri, 19 Apr 2024 11:02:01 +0200
Subject: [PATCH] Add missing dust_color_transition data remapping (changed in
 24w03a)

---
 .../viaversion/api/type/types/misc/ParticleType.java     | 2 +-
 .../rewriter/BlockItemPacketRewriter1_20_5.java          | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/ParticleType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/ParticleType.java
index 50fa2e806..e840958f1 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/ParticleType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/ParticleType.java
@@ -80,7 +80,7 @@ public class ParticleType extends DynamicType<Particle> {
             particle.add(Type.FLOAT, Type.FLOAT.readPrimitive(buf)); // Red 0-1
             particle.add(Type.FLOAT, Type.FLOAT.readPrimitive(buf)); // Green 0-1
             particle.add(Type.FLOAT, Type.FLOAT.readPrimitive(buf)); // Blue 0-1
-            particle.add(Type.FLOAT, Type.FLOAT.readPrimitive(buf)); // Scale 0.01-4
+            particle.add(Type.FLOAT, Type.FLOAT.readPrimitive(buf)); // Scale 0.01-4 (moved to the end as of 24w03a / 1.20.5)
             particle.add(Type.FLOAT, Type.FLOAT.readPrimitive(buf)); // Red
             particle.add(Type.FLOAT, Type.FLOAT.readPrimitive(buf)); // Green
             particle.add(Type.FLOAT, Type.FLOAT.readPrimitive(buf)); // Blue
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
index a7263c24a..4fac307a2 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
@@ -214,6 +214,13 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
             if (particle.id() == protocol.getMappingData().getParticleMappings().mappedId("entity_effect")) {
                 particle.add(Type.INT, data != 0 ? ThreadLocalRandom.current().nextInt() : 0); // rgb
             }
+            if (particle.id() == protocol.getMappingData().getParticleMappings().mappedId("dust_color_transition")) {
+                for (int i = 0; i < 7; i++) {
+                    particle.add(Type.FLOAT, wrapper.read(Type.FLOAT));
+                }
+                // fromColor, scale, toColor -> fromColor, toColor, scale
+                particle.add(Type.FLOAT, particle.<Float> removeArgument(3).getValue());
+            }
 
             if (mappings.isBlockParticle(particleId)) {
                 final int blockStateId = wrapper.read(Type.VAR_INT);
@@ -223,6 +230,8 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
                 particle.add(Types1_20_5.ITEM, item);
             }
 
+            // TODO: We should read the particle data of every particle.
+            //  Otherwise reading the particle type in future versions will be broken.
             wrapper.write(Types1_20_5.PARTICLE, particle);
         });