Fix Area effect particles

CloudburstMC · Apr 1, 2024 · 1937dff · 1937dff
1 parent 6db8c1b
commit 1937dff
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 5 deletions.
diff --git a/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v575/Bedrock_v575.java b/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v575/Bedrock_v575.java
@@ -22,6 +22,7 @@
 import org.cloudburstmc.protocol.bedrock.data.entity.EntityFlag;
 import org.cloudburstmc.protocol.bedrock.packet.*;
 import org.cloudburstmc.protocol.bedrock.transformer.FlagTransformer;
+import org.cloudburstmc.protocol.bedrock.transformer.TypeMapTransformer;
 import org.cloudburstmc.protocol.common.util.TypeMap;
 
 public class Bedrock_v575 extends Bedrock_v568 {
@@ -39,10 +40,16 @@ public class Bedrock_v575 extends Bedrock_v568 {
             .insert(113, EntityFlag.SEARCHING)
             .build();
 
+    protected static final TypeMap<ParticleType> PARTICLE_TYPES = Bedrock_v568.PARTICLE_TYPES
+            .toBuilder()
+            .insert(85, ParticleType.BRUSH_DUST)
+            .build();
+
     protected static final EntityDataTypeMap ENTITY_DATA = Bedrock_v568.ENTITY_DATA
             .toBuilder()
             .update(EntityDataTypes.FLAGS, new FlagTransformer(ENTITY_FLAGS, 0))
             .update(EntityDataTypes.FLAGS_2, new FlagTransformer(ENTITY_FLAGS, 1))
+            .update(EntityDataTypes.AREA_EFFECT_CLOUD_PARTICLE, new TypeMapTransformer<>(PARTICLE_TYPES))
             .build();
 
     protected static final TypeMap<SoundEvent> SOUND_EVENTS = Bedrock_v568.SOUND_EVENTS
@@ -54,11 +61,6 @@ public class Bedrock_v575 extends Bedrock_v568 {
             .insert(466, SoundEvent.UNDEFINED)
             .build();
 
-    protected static final TypeMap<ParticleType> PARTICLE_TYPES = Bedrock_v568.PARTICLE_TYPES
-            .toBuilder()
-            .insert(85, ParticleType.BRUSH_DUST)
-            .build();
-
     protected static final TypeMap<LevelEventType> LEVEL_EVENTS = Bedrock_v568.LEVEL_EVENTS.toBuilder()
             .insert(LEVEL_EVENT_PARTICLE_TYPE, PARTICLE_TYPES)
             .build();

diff --git a/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v618/Bedrock_v618.java b/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v618/Bedrock_v618.java
@@ -1,6 +1,7 @@
 package org.cloudburstmc.protocol.bedrock.codec.v618;
 
 import org.cloudburstmc.protocol.bedrock.codec.BedrockCodec;
+import org.cloudburstmc.protocol.bedrock.codec.EntityDataTypeMap;
 import org.cloudburstmc.protocol.bedrock.codec.v291.serializer.LevelEventSerializer_v291;
 import org.cloudburstmc.protocol.bedrock.codec.v291.serializer.LevelSoundEvent1Serializer_v291;
 import org.cloudburstmc.protocol.bedrock.codec.v313.serializer.LevelSoundEvent2Serializer_v313;
@@ -15,8 +16,10 @@
 import org.cloudburstmc.protocol.bedrock.data.LevelEventType;
 import org.cloudburstmc.protocol.bedrock.data.ParticleType;
 import org.cloudburstmc.protocol.bedrock.data.SoundEvent;
+import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataTypes;
 import org.cloudburstmc.protocol.bedrock.data.inventory.itemstack.request.TextProcessingEventOrigin;
 import org.cloudburstmc.protocol.bedrock.packet.*;
+import org.cloudburstmc.protocol.bedrock.transformer.TypeMapTransformer;
 import org.cloudburstmc.protocol.common.util.TypeMap;
 
 public class Bedrock_v618 extends Bedrock_v594 {
@@ -47,6 +50,11 @@ public class Bedrock_v618 extends Bedrock_v594 {
             .insert(LEVEL_EVENT_PARTICLE_TYPE, PARTICLE_TYPES)
             .build();
 
+    protected static final EntityDataTypeMap ENTITY_DATA = Bedrock_v594.ENTITY_DATA
+            .toBuilder()
+            .update(EntityDataTypes.AREA_EFFECT_CLOUD_PARTICLE, new TypeMapTransformer<>(PARTICLE_TYPES))
+            .build();
+
     public static final BedrockCodec CODEC = Bedrock_v594.CODEC.toBuilder()
             .raknetProtocolVersion(11)
             .protocolVersion(618)

diff --git a/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v630/Bedrock_v630.java b/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v630/Bedrock_v630.java
@@ -1,6 +1,7 @@
 package org.cloudburstmc.protocol.bedrock.codec.v630;
 
 import org.cloudburstmc.protocol.bedrock.codec.BedrockCodec;
+import org.cloudburstmc.protocol.bedrock.codec.EntityDataTypeMap;
 import org.cloudburstmc.protocol.bedrock.codec.v291.serializer.LevelEventSerializer_v291;
 import org.cloudburstmc.protocol.bedrock.codec.v291.serializer.LevelSoundEvent1Serializer_v291;
 import org.cloudburstmc.protocol.bedrock.codec.v313.serializer.LevelSoundEvent2Serializer_v313;
@@ -15,8 +16,10 @@
 import org.cloudburstmc.protocol.bedrock.data.LevelEventType;
 import org.cloudburstmc.protocol.bedrock.data.ParticleType;
 import org.cloudburstmc.protocol.bedrock.data.SoundEvent;
+import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataTypes;
 import org.cloudburstmc.protocol.bedrock.data.inventory.ContainerSlotType;
 import org.cloudburstmc.protocol.bedrock.packet.*;
+import org.cloudburstmc.protocol.bedrock.transformer.TypeMapTransformer;
 import org.cloudburstmc.protocol.common.util.TypeMap;
 
 public class Bedrock_v630 extends Bedrock_v622 {
@@ -34,6 +37,11 @@ public class Bedrock_v630 extends Bedrock_v622 {
             .insert(LEVEL_EVENT_PARTICLE_TYPE, PARTICLE_TYPES)
             .build();
 
+    protected static final EntityDataTypeMap ENTITY_DATA = Bedrock_v622.ENTITY_DATA
+            .toBuilder()
+            .update(EntityDataTypes.AREA_EFFECT_CLOUD_PARTICLE, new TypeMapTransformer<>(PARTICLE_TYPES))
+            .build();
+
     protected static final TypeMap<ContainerSlotType> CONTAINER_SLOT_TYPES = Bedrock_v622.CONTAINER_SLOT_TYPES.toBuilder()
             .insert(62, ContainerSlotType.CRAFTER_BLOCK_CONTAINER)
             .build();

diff --git a/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v649/Bedrock_v649.java b/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v649/Bedrock_v649.java
@@ -1,6 +1,7 @@
 package org.cloudburstmc.protocol.bedrock.codec.v649;
 
 import org.cloudburstmc.protocol.bedrock.codec.BedrockCodec;
+import org.cloudburstmc.protocol.bedrock.codec.EntityDataTypeMap;
 import org.cloudburstmc.protocol.bedrock.codec.v291.serializer.LevelEventSerializer_v291;
 import org.cloudburstmc.protocol.bedrock.codec.v291.serializer.LevelSoundEvent1Serializer_v291;
 import org.cloudburstmc.protocol.bedrock.codec.v313.serializer.LevelSoundEvent2Serializer_v313;
@@ -13,7 +14,9 @@
 import org.cloudburstmc.protocol.bedrock.data.LevelEventType;
 import org.cloudburstmc.protocol.bedrock.data.ParticleType;
 import org.cloudburstmc.protocol.bedrock.data.SoundEvent;
+import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataTypes;
 import org.cloudburstmc.protocol.bedrock.packet.*;
+import org.cloudburstmc.protocol.bedrock.transformer.TypeMapTransformer;
 import org.cloudburstmc.protocol.common.util.TypeMap;
 
 public class Bedrock_v649 extends Bedrock_v630 {
@@ -34,6 +37,11 @@ public class Bedrock_v649 extends Bedrock_v630 {
             .insert(LEVEL_EVENT_PARTICLE_TYPE, PARTICLE_TYPES)
             .build();
 
+    protected static final EntityDataTypeMap ENTITY_DATA = Bedrock_v630.ENTITY_DATA
+            .toBuilder()
+            .update(EntityDataTypes.AREA_EFFECT_CLOUD_PARTICLE, new TypeMapTransformer<>(PARTICLE_TYPES))
+            .build();
+
     protected static final TypeMap<SoundEvent> SOUND_EVENTS = Bedrock_v630.SOUND_EVENTS
             .toBuilder()
             .replace(492, SoundEvent.AMBIENT_IN_AIR)