Done with the particle hell changes

SammySemicolon · SammySemicolon · commit 10fba7eda75b · 2025-04-30T09:46:21.000+02:00
diff --git a/src/main/java/com/sammy/malum/common/item/food/ConcentratedGluttonyItem.java b/src/main/java/com/sammy/malum/common/item/food/ConcentratedGluttonyItem.java
@@ -69,6 +69,8 @@ public static void createGluttonyVFX(ServerLevel serverLevel, LivingEntity targe
 
     public static void createGluttonyVFX(ServerLevel serverLevel, LivingEntity target, float potency) {
         var position = target.position().add(0, target.getBbHeight() / 2f, 0);
-        ParticleEffectTypeRegistry.GLUTTONY_ABSORB.createPositionedEffect(serverLevel, new NetworkedParticleEffectPositionData(position), AbsorbGluttonyParticleEffect.createData(potency));
+        ParticleEffectTypeRegistry.GLUTTONY_ABSORB.createEffect(position)
+                .customData(new AbsorbGluttonyParticleEffect.AbsorbGluttonyEffectData(potency))
+                .spawn(serverLevel);
     }
 }
diff --git a/src/main/java/com/sammy/malum/common/spiritrite/PotionRiteEffect.java b/src/main/java/com/sammy/malum/common/spiritrite/PotionRiteEffect.java
@@ -30,10 +30,12 @@ public PotionRiteEffect(MalumSpiritType definingSpirit, Class<? extends LivingEn
     public void doRiteEffect(TotemBaseBlockEntity totemBase, ServerLevel level) {
         getNearbyEntities(totemBase, targetClass).filter(getEntityPredicate()).forEach(e -> {
             MobEffectInstance instance = new MobEffectInstance(mobEffectHolder, 1200, 1, true, true);
-            final boolean success = e.addEffect(instance);
+            boolean success = e.addEffect(instance);
             if (!e.hasEffect(instance.getEffect()) && success) {
-                ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT.createEntityEffect(e, new MalumNetworkedParticleEffectColorData(definingSpirit));
             }
+            ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT.createEffect(e)
+                    .color(definingSpirit)
+                    .spawn(level);
         });
     }
 
diff --git a/src/main/java/com/sammy/malum/common/spiritrite/arcane/SacredRiteType.java b/src/main/java/com/sammy/malum/common/spiritrite/arcane/SacredRiteType.java
@@ -40,7 +40,10 @@ public void doRiteEffect(TotemBaseBlockEntity totemBase, ServerLevel level) {
                 getNearbyEntities(totemBase, LivingEntity.class, e -> !(e instanceof Monster)).forEach(e -> {
                     if (e.getHealth() < e.getMaxHealth()) {
                         e.heal(2);
-                        ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT.createEntityEffect(e, new MalumNetworkedParticleEffectColorData(SACRED_SPIRIT));
+                        ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT
+                                .createEffect(e)
+                                .color(SACRED_SPIRIT)
+                                .spawn(level);
                     }
                 });
             }
@@ -57,14 +60,17 @@ public void doRiteEffect(TotemBaseBlockEntity totemBase, ServerLevel level) {
                     if (e instanceof Animal animal) {
                         if (animal.getAge() < 0) {
                             if (totemBase.getLevel().random.nextFloat() <= 0.04f) {
-                                ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT.createEntityEffect(e, new MalumNetworkedParticleEffectColorData(SACRED_SPIRIT));
+                                ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT
+                                        .createEffect(e)
+                                        .color(SACRED_SPIRIT)
+                                        .spawn(level);
                                 animal.ageUp(25);
                             }
                         }
                     }
                     if (NOURISHMENT_RITE_ACTORS.containsKey(e.getClass())) {
                         NourishmentRiteActor<? extends Mob> nourishmentRiteActor = NOURISHMENT_RITE_ACTORS.get(e.getClass());
-                        nourishmentRiteActor.tryAct(totemBase, e);
+                        nourishmentRiteActor.tryAct(level, totemBase, e);
                     }
                 });
             }
@@ -125,10 +131,13 @@ public NourishmentRiteActor(Class<T> targetClass) {
         }
 
         @SuppressWarnings("unchecked")
-        public final void tryAct(TotemBaseBlockEntity totemBaseBlockEntity, Mob mob) {
+        public final void tryAct(ServerLevel level, TotemBaseBlockEntity totemBaseBlockEntity, Mob mob) {
             if (targetClass.isInstance(mob)) {
                 act(totemBaseBlockEntity, (T) mob);
-                ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT.createEntityEffect(mob, new MalumNetworkedParticleEffectColorData(SACRED_SPIRIT));
+                ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT
+                        .createEffect(mob)
+                        .color(SACRED_SPIRIT)
+                        .spawn(level);
             }
         }
 
diff --git a/src/main/java/com/sammy/malum/common/spiritrite/arcane/WickedRiteType.java b/src/main/java/com/sammy/malum/common/spiritrite/arcane/WickedRiteType.java
@@ -30,7 +30,10 @@ public void doRiteEffect(TotemBaseBlockEntity totemBase, ServerLevel level) {
                 getNearbyEntities(totemBase, LivingEntity.class, e -> !(e instanceof Player)).forEach(e -> {
                     final DamageSource damageSource = DamageTypeHelper.create(e.level(), DamageTypeRegistry.VOODOO_PLAYERLESS);
                     if (e.getHealth() > 2.5f && !e.isInvulnerableTo(damageSource)) {
-                        ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT.createEntityEffect(e, new MalumNetworkedParticleEffectColorData(WICKED_SPIRIT));
+                        ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT
+                                .createEffect(e)
+                                .color(WICKED_SPIRIT)
+                                .spawn(level);
                         e.hurt(damageSource, 2);
                     }
                 });
@@ -48,7 +51,10 @@ public void doRiteEffect(TotemBaseBlockEntity totemBase, ServerLevel level) {
                     final boolean hadNoEffect = !e.hasEffect(MobEffects.DAMAGE_BOOST);
                     final boolean success = e.addEffect(new MobEffectInstance(MobEffects.DAMAGE_BOOST, 1200, 1));
                     if (hadNoEffect && success) {
-                        ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT.createEntityEffect(e, new MalumNetworkedParticleEffectColorData(WICKED_SPIRIT));
+                        ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT
+                                .createEffect(e)
+                                .color(WICKED_SPIRIT)
+                                .spawn(level);
                     }
                     e.addEffect(new MobEffectInstance(MobEffects.HEALTH_BOOST, 1200, 1));
                     e.addEffect(new MobEffectInstance(MobEffects.DAMAGE_RESISTANCE, 1200, 1));
diff --git a/src/main/java/com/sammy/malum/common/spiritrite/eldritch/EldritchAerialRiteType.java b/src/main/java/com/sammy/malum/common/spiritrite/eldritch/EldritchAerialRiteType.java
@@ -38,7 +38,11 @@ public void doRiteEffect(TotemBaseBlockEntity totemBase, ServerLevel level) {
                         var state = level.getBlockState(p);
                         if (!state.isAir() && level.getBlockEntity(p) == null && canSilkTouch(level, pos, state)) {
                             FallingBlockEntity.fall(level, p, state);
-                            ParticleEffectTypeRegistry.BLOCK_FALL_RITE_EFFECT.createPositionedEffect(level, new NetworkedParticleEffectPositionData(p), new MalumNetworkedParticleEffectColorData(AERIAL_SPIRIT));
+
+                            ParticleEffectTypeRegistry.BLOCK_FALL_RITE_EFFECT
+                                    .createEffect(p)
+                                    .color(AERIAL_SPIRIT)
+                                    .spawn(level);
                             level.playSound(null, p, SoundRegistry.TOTEM_AERIAL_MAGIC.get(), SoundSource.BLOCKS, 0.5f, 2.6F + (level.random.nextFloat() - level.random.nextFloat()) * 0.8F);
                         }
                     }
@@ -57,7 +61,10 @@ public void doRiteEffect(TotemBaseBlockEntity totemBase, ServerLevel level) {
                     Stat<ResourceLocation> sleepStat = Stats.CUSTOM.get(Stats.TIME_SINCE_REST);
                     int value = stats.getValue(sleepStat);
                     stats.setValue(p, sleepStat, Math.max(0, value - 1000));
-                    ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT.createEntityEffect(p, new MalumNetworkedParticleEffectColorData(AERIAL_SPIRIT));
+                    ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT
+                            .createEffect(p)
+                            .color(AERIAL_SPIRIT)
+                            .spawn(level);
                 });
             }
         };
diff --git a/src/main/java/com/sammy/malum/common/spiritrite/eldritch/EldritchAqueousRiteType.java b/src/main/java/com/sammy/malum/common/spiritrite/eldritch/EldritchAqueousRiteType.java
@@ -25,7 +25,10 @@ public TotemicRiteEffect getNaturalRiteEffect() {
             public void doRiteEffect(TotemBaseBlockEntity totemBase, ServerLevel level) {
                 getNearbyBlocks(totemBase, PointedDripstoneBlock.class).forEach(p -> {
                     if (level.random.nextFloat() < 0.1f) {
-                        ParticleEffectTypeRegistry.BLOCK_FALL_RITE_EFFECT.createPositionedEffect(level, new NetworkedParticleEffectPositionData(p), new MalumNetworkedParticleEffectColorData(AQUEOUS_SPIRIT));
+                        ParticleEffectTypeRegistry.BLOCK_FALL_RITE_EFFECT
+                                .createEffect(p)
+                                .color(AQUEOUS_SPIRIT)
+                                .spawn(level);
                         for (int i = 0; i < 4 + level.random.nextInt(2); i++) {
                             level.getBlockState(p).randomTick(level, p, level.random);
                         }
@@ -53,7 +56,10 @@ public void doRiteEffect(TotemBaseBlockEntity totemBase, ServerLevel level) {
                 getNearbyEntities(totemBase, Zombie.class).filter(z -> !(z instanceof Drowned)).forEach(e -> {
                     if (!e.isUnderWaterConverting()) {
                         e.startUnderWaterConversion(100);
-                        ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT.createEntityEffect(e, new MalumNetworkedParticleEffectColorData(AQUEOUS_SPIRIT));
+                        ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT
+                                .createEffect(e)
+                                .color(AQUEOUS_SPIRIT)
+                                .spawn(level);
                     }
                 });
             }
diff --git a/src/main/java/com/sammy/malum/common/spiritrite/eldritch/EldritchEarthenRiteType.java b/src/main/java/com/sammy/malum/common/spiritrite/eldritch/EldritchEarthenRiteType.java
@@ -25,7 +25,10 @@ public void doRiteEffect(TotemBaseBlockEntity totemBase, ServerLevel level) {
                     boolean canBreak = !state.isAir() && state.getDestroySpeed(level, p) != -1;
                     if (canBreak) {
                         level.destroyBlock(p, true);
-                        ParticleEffectTypeRegistry.BLOCK_RITE_EFFECT.createPositionedEffect(level, new NetworkedParticleEffectPositionData(p), new MalumNetworkedParticleEffectColorData(EARTHEN_SPIRIT));
+                        ParticleEffectTypeRegistry.BLOCK_RITE_EFFECT
+                                .createEffect(p)
+                                .color(EARTHEN_SPIRIT)
+                                .spawn(level);
                     }
                 });
             }
@@ -45,7 +48,10 @@ public void doRiteEffect(TotemBaseBlockEntity totemBase, ServerLevel level) {
                         BlockState cobblestone = Blocks.COBBLESTONE.defaultBlockState();
                         level.setBlockAndUpdate(p, cobblestone);
                         level.levelEvent(2001, p, Block.getId(cobblestone));
-                        ParticleEffectTypeRegistry.BLOCK_RITE_EFFECT.createPositionedEffect(level, new NetworkedParticleEffectPositionData(p), new MalumNetworkedParticleEffectColorData(EARTHEN_SPIRIT));
+                        ParticleEffectTypeRegistry.BLOCK_RITE_EFFECT
+                                .createEffect(p)
+                                .color(EARTHEN_SPIRIT)
+                                .spawn(level);
                     }
                 });
             }
diff --git a/src/main/java/com/sammy/malum/common/spiritrite/eldritch/EldritchInfernalRiteType.java b/src/main/java/com/sammy/malum/common/spiritrite/eldritch/EldritchInfernalRiteType.java
@@ -33,7 +33,10 @@ public void doRiteEffect(TotemBaseBlockEntity totemBase, ServerLevel level) {
                             var newState = block.defaultBlockState();
                             level.setBlockAndUpdate(p, newState);
                             level.levelEvent(2001, p, Block.getId(newState));
-                            ParticleEffectTypeRegistry.BLOCK_RITE_EFFECT.createPositionedEffect(level, new NetworkedParticleEffectPositionData(p), new MalumNetworkedParticleEffectColorData(INFERNAL_SPIRIT));
+                            ParticleEffectTypeRegistry.BLOCK_RITE_EFFECT
+                                    .createEffect(p)
+                                    .color(INFERNAL_SPIRIT)
+                                    .spawn(level);
                         }
                     }
                 });
@@ -48,7 +51,10 @@ public TotemicRiteEffect getCorruptedEffect() {
             public void doRiteEffect(TotemBaseBlockEntity totemBase, ServerLevel level) {
                 getNearbyBlocks(totemBase, AbstractFurnaceBlock.class).forEach(p -> {
                     if (level.getBlockEntity(p) instanceof AbstractFurnaceBlockEntity furnace) {
-                        ParticleEffectTypeRegistry.BLOCK_RITE_EFFECT.createPositionedEffect(level, new NetworkedParticleEffectPositionData(furnace.getBlockPos()), new MalumNetworkedParticleEffectColorData(INFERNAL_SPIRIT));
+                        ParticleEffectTypeRegistry.BLOCK_RITE_EFFECT
+                                .createEffect(p)
+                                .color(INFERNAL_SPIRIT)
+                                .spawn(level);
                         furnace.cookingProgress = Math.min(furnace.cookingProgress + 20, furnace.cookingTotalTime - 1);
                     }
                 });
diff --git a/src/main/java/com/sammy/malum/common/spiritrite/eldritch/EldritchSacredRiteType.java b/src/main/java/com/sammy/malum/common/spiritrite/eldritch/EldritchSacredRiteType.java
@@ -74,7 +74,11 @@ public void doRiteEffect(TotemBaseBlockEntity totemBase, ServerLevel level) {
                         if (e.canFallInLove() && e.getAge() == 0) {
                             if (level.random.nextFloat() <= 0.2f) {
                                 e.setInLoveTime(600);
-                                ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT.createEntityEffect(e, new MalumNetworkedParticleEffectColorData(SACRED_SPIRIT));
+
+                                ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT
+                                        .createEffect(e)
+                                        .color(SACRED_SPIRIT)
+                                        .spawn(level);
                             }
                         }
                     });
diff --git a/src/main/java/com/sammy/malum/common/spiritrite/eldritch/EldritchWickedRiteType.java b/src/main/java/com/sammy/malum/common/spiritrite/eldritch/EldritchWickedRiteType.java
@@ -29,7 +29,10 @@ public TotemicRiteEffect getNaturalRiteEffect() {
             public void doRiteEffect(TotemBaseBlockEntity totemBase, ServerLevel level) {
                 getNearbyEntities(totemBase, LivingEntity.class, e -> !(e instanceof Player)).forEach(e -> {
                     if (e.getHealth() <= 2.5f && !e.isInvulnerableTo(DamageTypeHelper.create(e.level(), DamageTypeRegistry.VOODOO_PLAYERLESS))) {
-                        ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT.createEntityEffect(e, new MalumNetworkedParticleEffectColorData(WICKED_SPIRIT));
+                        ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT
+                                .createEffect(e)
+                                .color(WICKED_SPIRIT)
+                                .spawn(level);
                         e.hurt(DamageTypeHelper.create(e.level(), DamageTypeRegistry.VOODOO_PLAYERLESS), 10f);
                     }
                 });
@@ -51,7 +54,10 @@ public void doRiteEffect(TotemBaseBlockEntity totemBase, ServerLevel level) {
                     animals.removeIf(Animal::isInLove);
                     for (Animal animal : animals) {
                         animal.hurt(DamageTypeHelper.create(animal.level(), DamageTypeRegistry.VOODOO_PLAYERLESS), animal.getMaxHealth());
-                        ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT.createEntityEffect(animal, new MalumNetworkedParticleEffectColorData(WICKED_SPIRIT));
+                        ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT
+                                .createEffect(animal)
+                                .color(WICKED_SPIRIT)
+                                .spawn(level);
                         if (maxKills-- <= 0) {
                             return;
                         }
diff --git a/src/main/java/com/sammy/malum/common/worldevent/ActiveBlightWorldEvent.java b/src/main/java/com/sammy/malum/common/worldevent/ActiveBlightWorldEvent.java
@@ -88,7 +88,7 @@ public void createBlight(ServerLevel level, int intensity) {
 
     public static void createBlightVFX(ServerLevel level, LodestoneBlockFiller filler) {
         filler.getLayer(BLIGHT).entrySet().stream().filter(e -> e.getValue().getState().getBlock() instanceof BlightedSoilBlock).map(Map.Entry::getKey)
-                .forEach(p -> ParticleEffectTypeRegistry.BLIGHTING_MIST.createPositionedEffect(level, new NetworkedParticleEffectPositionData(p)));
+                .forEach(p -> ParticleEffectTypeRegistry.BLIGHTING_MIST.createEffect(p).spawn(level));
     }
     private static final PerlinSimplexNoise COVERING_NOISE = new PerlinSimplexNoise(new WorldgenRandom(new LegacyRandomSource(1234L)), ImmutableList.of(0));
 
diff --git a/src/main/java/com/sammy/malum/common/worldevent/DelayedDamageWorldEvent.java b/src/main/java/com/sammy/malum/common/worldevent/DelayedDamageWorldEvent.java
@@ -19,6 +19,7 @@
 import javax.annotation.*;
 import java.util.*;
 
+@SuppressWarnings("rawtypes")
 public class DelayedDamageWorldEvent extends WorldEventInstance {
 
     protected ResourceKey<DamageType> physicalDamageType = DamageTypes.PLAYER_ATTACK;
@@ -37,7 +38,7 @@ public class DelayedDamageWorldEvent extends WorldEventInstance {
     protected float minVolume;
     protected float maxVolume;
 
-    protected NetworkedParticleEffectType<?> particleEffect;
+    protected NetworkedParticleEffectType particleEffect;
     protected MalumNetworkedParticleEffectColorData particleColor;
     protected NetworkedParticleEffectExtraData nbtData;
 
diff --git a/src/main/java/com/sammy/malum/common/worldevent/SuspiciousDeviceTriggerWorldEvent.java b/src/main/java/com/sammy/malum/common/worldevent/SuspiciousDeviceTriggerWorldEvent.java
@@ -22,10 +22,9 @@ public void createBlight(ServerLevel level, int intensity) {
         final RandomSource random = level.random;
         level.playSound(null, position, SoundRegistry.SUSPICIOUS_DEVICE_DETONATES_AGAIN.get(), SoundSource.BLOCKS, 0.5f, RandomHelper.randomBetween(random, 0.8f, 1.2f));
         final Vec3 center = position.getCenter().add(SpiritCrucibleCoreBlockEntity.CRUCIBLE_CORE_AUGMENT_OFFSET);
-        ParticleEffectTypeRegistry.ETHERIC_NITRATE_IMPACT.createPositionedEffect(level,
-                new NetworkedParticleEffectPositionData(center),
-                new MalumNetworkedParticleEffectColorData(SpiritTypeRegistry.ARCANE_SPIRIT, SpiritTypeRegistry.ELDRITCH_SPIRIT));
-
+        ParticleEffectTypeRegistry.ETHERIC_NITRATE_IMPACT.createEffect(center)
+                .color(SpiritTypeRegistry.ARCANE_SPIRIT, SpiritTypeRegistry.ELDRITCH_SPIRIT)
+                .spawn(level);
         if (level.getBlockEntity(position) instanceof SpiritCrucibleCoreBlockEntity crucible) {
             crucible.destroyMultiblock(null, level, position);
             level.destroyBlock(position, false);
diff --git a/src/main/java/com/sammy/malum/common/worldevent/UnchainedTotemConversionWorldEvent.java b/src/main/java/com/sammy/malum/common/worldevent/UnchainedTotemConversionWorldEvent.java
@@ -38,16 +38,16 @@ public void createBlight(ServerLevel level, int intensity) {
         int offset = transformedTotemParts;
         BlockPos totemPos = position.above(offset);
         if (level.getBlockEntity(totemPos) instanceof TotemPoleBlockEntity totemPoleTile) {
-            placeTotemPole(totemPos, totemPoleTile.spirit);
+            placeTotemPole(level, totemPos, totemPoleTile.spirit);
         }
         transformedTotemParts++;
     }
 
-    public void placeTotemPole(BlockPos pos, MalumSpiritType spiritType) {
+    public void placeTotemPole(ServerLevel level, BlockPos pos, MalumSpiritType spiritType) {
         BlockState totemPoleState = BlockStateHelper.setBlockStateWithExistingProperties(level, pos, SOULWOOD_TOTEM_POLE.get().defaultBlockState(), 3);
         TotemPoleBlockEntity totemPole = new TotemPoleBlockEntity(pos, totemPoleState);
         totemPole.setLevel(level);
-        totemPole.setSpirit(spiritType);
+        totemPole.setSpirit(level, spiritType);
         level.setBlockEntity(totemPole);
         placeBlock(pos, totemPoleState);
         maybePlaceBlightedGunk(pos, totemPoleState);
diff --git a/src/main/java/com/sammy/malum/core/handlers/enchantment/AscensionHandler.java b/src/main/java/com/sammy/malum/core/handlers/enchantment/AscensionHandler.java
diff --git a/src/main/java/com/sammy/malum/registry/common/PacketRegistry.java b/src/main/java/com/sammy/malum/registry/common/PacketRegistry.java
diff --git a/src/main/java/com/sammy/malum/visual_effects/GeasParticleEffects.java b/src/main/java/com/sammy/malum/visual_effects/GeasParticleEffects.java
diff --git a/src/main/java/com/sammy/malum/visual_effects/networked/geas/ShakenFaithParticleEffect.java b/src/main/java/com/sammy/malum/visual_effects/networked/geas/ShakenFaithParticleEffect.java

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,8 @@ public static void createGluttonyVFX(ServerLevel serverLevel, LivingEntity targe`
`69`	`69`
`70`	`70`	`public static void createGluttonyVFX(ServerLevel serverLevel, LivingEntity target, float potency) {`
`71`	`71`	`var position = target.position().add(0, target.getBbHeight() / 2f, 0);`
`72`		`- ParticleEffectTypeRegistry.GLUTTONY_ABSORB.createPositionedEffect(serverLevel, new NetworkedParticleEffectPositionData(position), AbsorbGluttonyParticleEffect.createData(potency));`
	`72`	`+ ParticleEffectTypeRegistry.GLUTTONY_ABSORB.createEffect(position)`
	`73`	`+ .customData(new AbsorbGluttonyParticleEffect.AbsorbGluttonyEffectData(potency))`
	`74`	`+ .spawn(serverLevel);`
`73`	`75`	`}`
`74`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,12 @@ public PotionRiteEffect(MalumSpiritType definingSpirit, Class<? extends LivingEn`
`30`	`30`	`public void doRiteEffect(TotemBaseBlockEntity totemBase, ServerLevel level) {`
`31`	`31`	`getNearbyEntities(totemBase, targetClass).filter(getEntityPredicate()).forEach(e -> {`
`32`	`32`	`MobEffectInstance instance = new MobEffectInstance(mobEffectHolder, 1200, 1, true, true);`
`33`		`- final boolean success = e.addEffect(instance);`
	`33`	`+ boolean success = e.addEffect(instance);`
`34`	`34`	`if (!e.hasEffect(instance.getEffect()) && success) {`
`35`		`- ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT.createEntityEffect(e, new MalumNetworkedParticleEffectColorData(definingSpirit));`
`36`	`35`	`}`
	`36`	`+ ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT.createEffect(e)`
	`37`	`+ .color(definingSpirit)`
	`38`	`+ .spawn(level);`
`37`	`39`	`});`
`38`	`40`	`}`
`39`	`41`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,10 @@ public void doRiteEffect(TotemBaseBlockEntity totemBase, ServerLevel level) {`
`40`	`40`	`getNearbyEntities(totemBase, LivingEntity.class, e -> !(e instanceof Monster)).forEach(e -> {`
`41`	`41`	`if (e.getHealth() < e.getMaxHealth()) {`
`42`	`42`	`e.heal(2);`
`43`		`- ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT.createEntityEffect(e, new MalumNetworkedParticleEffectColorData(SACRED_SPIRIT));`
	`43`	`+ ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT`
	`44`	`+ .createEffect(e)`
	`45`	`+ .color(SACRED_SPIRIT)`
	`46`	`+ .spawn(level);`
`44`	`47`	`}`
`45`	`48`	`});`
`46`	`49`	`}`
`@@ -57,14 +60,17 @@ public void doRiteEffect(TotemBaseBlockEntity totemBase, ServerLevel level) {`
`57`	`60`	`if (e instanceof Animal animal) {`
`58`	`61`	`if (animal.getAge() < 0) {`
`59`	`62`	`if (totemBase.getLevel().random.nextFloat() <= 0.04f) {`
`60`		`- ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT.createEntityEffect(e, new MalumNetworkedParticleEffectColorData(SACRED_SPIRIT));`
	`63`	`+ ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT`
	`64`	`+ .createEffect(e)`
	`65`	`+ .color(SACRED_SPIRIT)`
	`66`	`+ .spawn(level);`
`61`	`67`	`animal.ageUp(25);`
`62`	`68`	`}`
`63`	`69`	`}`
`64`	`70`	`}`
`65`	`71`	`if (NOURISHMENT_RITE_ACTORS.containsKey(e.getClass())) {`
`66`	`72`	`NourishmentRiteActor<? extends Mob> nourishmentRiteActor = NOURISHMENT_RITE_ACTORS.get(e.getClass());`
`67`		`- nourishmentRiteActor.tryAct(totemBase, e);`
	`73`	`+ nourishmentRiteActor.tryAct(level, totemBase, e);`
`68`	`74`	`}`
`69`	`75`	`});`
`70`	`76`	`}`
`@@ -125,10 +131,13 @@ public NourishmentRiteActor(Class<T> targetClass) {`
`125`	`131`	`}`
`126`	`132`
`127`	`133`	`@SuppressWarnings("unchecked")`
`128`		`- public final void tryAct(TotemBaseBlockEntity totemBaseBlockEntity, Mob mob) {`
	`134`	`+ public final void tryAct(ServerLevel level, TotemBaseBlockEntity totemBaseBlockEntity, Mob mob) {`
`129`	`135`	`if (targetClass.isInstance(mob)) {`
`130`	`136`	`act(totemBaseBlockEntity, (T) mob);`
`131`		`- ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT.createEntityEffect(mob, new MalumNetworkedParticleEffectColorData(SACRED_SPIRIT));`
	`137`	`+ ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT`
	`138`	`+ .createEffect(mob)`
	`139`	`+ .color(SACRED_SPIRIT)`
	`140`	`+ .spawn(level);`
`132`	`141`	`}`
`133`	`142`	`}`
`134`	`143`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,10 @@ public void doRiteEffect(TotemBaseBlockEntity totemBase, ServerLevel level) {`
`25`	`25`	`boolean canBreak = !state.isAir() && state.getDestroySpeed(level, p) != -1;`
`26`	`26`	`if (canBreak) {`
`27`	`27`	`level.destroyBlock(p, true);`
`28`		`- ParticleEffectTypeRegistry.BLOCK_RITE_EFFECT.createPositionedEffect(level, new NetworkedParticleEffectPositionData(p), new MalumNetworkedParticleEffectColorData(EARTHEN_SPIRIT));`
	`28`	`+ ParticleEffectTypeRegistry.BLOCK_RITE_EFFECT`
	`29`	`+ .createEffect(p)`
	`30`	`+ .color(EARTHEN_SPIRIT)`
	`31`	`+ .spawn(level);`
`29`	`32`	`}`
`30`	`33`	`});`
`31`	`34`	`}`
`@@ -45,7 +48,10 @@ public void doRiteEffect(TotemBaseBlockEntity totemBase, ServerLevel level) {`
`45`	`48`	`BlockState cobblestone = Blocks.COBBLESTONE.defaultBlockState();`
`46`	`49`	`level.setBlockAndUpdate(p, cobblestone);`
`47`	`50`	`level.levelEvent(2001, p, Block.getId(cobblestone));`
`48`		`- ParticleEffectTypeRegistry.BLOCK_RITE_EFFECT.createPositionedEffect(level, new NetworkedParticleEffectPositionData(p), new MalumNetworkedParticleEffectColorData(EARTHEN_SPIRIT));`
	`51`	`+ ParticleEffectTypeRegistry.BLOCK_RITE_EFFECT`
	`52`	`+ .createEffect(p)`
	`53`	`+ .color(EARTHEN_SPIRIT)`
	`54`	`+ .spawn(level);`
`49`	`55`	`}`
`50`	`56`	`});`
`51`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,11 @@ public void doRiteEffect(TotemBaseBlockEntity totemBase, ServerLevel level) {`
`74`	`74`	`if (e.canFallInLove() && e.getAge() == 0) {`
`75`	`75`	`if (level.random.nextFloat() <= 0.2f) {`
`76`	`76`	`e.setInLoveTime(600);`
`77`		`- ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT.createEntityEffect(e, new MalumNetworkedParticleEffectColorData(SACRED_SPIRIT));`
	`77`	`+`
	`78`	`+ ParticleEffectTypeRegistry.ENTITY_RITE_EFFECT`
	`79`	`+ .createEffect(e)`
	`80`	`+ .color(SACRED_SPIRIT)`
	`81`	`+ .spawn(level);`
`78`	`82`	`}`
`79`	`83`	`}`
`80`	`84`	`});`