From 0acaed7c7a2e304502f5e13216a8914e9cea2e1b Mon Sep 17 00:00:00 2001 From: Gero Date: Sat, 20 Apr 2024 23:50:24 +0200 Subject: [PATCH] Use correct item type for 1.20.5 particle reading --- .../viaversion/viaversion/api/type/types/misc/ParticleType.java | 2 ++ .../protocol1_20_5to1_20_3/Protocol1_20_5To1_20_3.java | 2 +- 2 files changed, 3 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 e840958f1..591ac82c4 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 @@ -28,6 +28,7 @@ import com.viaversion.viaversion.api.minecraft.Particle; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.protocol.Protocol; import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.api.type.types.version.Types1_20_5; import com.viaversion.viaversion.util.Key; import io.netty.buffer.ByteBuf; @@ -70,6 +71,7 @@ public class ParticleType extends DynamicType { public static final DataReader ITEM1_13 = itemHandler(Type.ITEM1_13); public static final DataReader ITEM1_13_2 = itemHandler(Type.ITEM1_13_2); public static final DataReader ITEM1_20_2 = itemHandler(Type.ITEM1_20_2); + public static final DataReader ITEM1_20_5 = itemHandler(Types1_20_5.ITEM); public static final DataReader DUST = (buf, particle) -> { particle.add(Type.FLOAT, Type.FLOAT.readPrimitive(buf)); // Red 0-1 particle.add(Type.FLOAT, Type.FLOAT.readPrimitive(buf)); // Green 0-1 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 edca3cd97..28c4f34bb 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 @@ -252,7 +252,7 @@ public final class Protocol1_20_5To1_20_3 extends AbstractProtocol