Fix glass particles when breaking egg, closes #51

Author: Hantonik

Common/src/main/java/hantonik/fbp/mixin/MixinParticleEngine.java

@@ -159,16 +159,16 @@ private <T extends ParticleOptions> void makeParticle(T options, double x, doubl
         }
 
         if (callback.getReturnValue() instanceof BreakingItemParticle original) {
-            if (options.getType() == ParticleTypes.ITEM_SNOWBALL || (options instanceof ItemParticleOption data && data.getItem().is(Items.SNOWBALL))) {
+            if (options.getType() == ParticleTypes.ITEM_SNOWBALL || options instanceof ItemParticleOption data && data.getItem().is(Items.SNOWBALL)) {
                 if (FancyBlockParticles.CONFIG.misc.isFancySnowballParticles() && FancyBlockParticles.CONFIG.isBlockParticlesEnabled(Blocks.SNOW))
                     callback.setReturnValue(new FBPTerrainParticle.Provider(BlockPos.containing(x, y, z), FBPConstants.RANDOM.nextFloat(0.35F, 0.6F) * FancyBlockParticles.CONFIG.misc.getSnowballParticleSizeMultiplier(), null, null, original.rCol, original.gCol, original.bCol).createParticle(new BlockParticleOption(ParticleTypes.BLOCK, Blocks.SNOW_BLOCK.defaultBlockState()), this.level, x, y, z, 0.0D, 0.0D, 0.0D));
-            } else if (options.getType() == ParticleTypes.ITEM_SLIME || (options instanceof ItemParticleOption data && data.getItem().is(Items.SLIME_BALL))) {
+            } else if (options.getType() == ParticleTypes.ITEM_SLIME || options instanceof ItemParticleOption data && data.getItem().is(Items.SLIME_BALL)) {
                 if (FancyBlockParticles.CONFIG.misc.isFancySlimeParticles() && FancyBlockParticles.CONFIG.isBlockParticlesEnabled(Blocks.SLIME_BLOCK))
                     callback.setReturnValue(new FBPTerrainParticle.Provider(BlockPos.containing(x, y, z), FBPConstants.RANDOM.nextFloat(0.35F, 0.6F) * FancyBlockParticles.CONFIG.misc.getSlimeParticleSizeMultiplier(), null, null, original.rCol, original.gCol, original.bCol).createParticle(new BlockParticleOption(ParticleTypes.BLOCK, Blocks.SLIME_BLOCK.defaultBlockState()), this.level, x, y, z, 0.0D, 0.0D, 0.0D));
-            } else if (options.getType() == ParticleTypes.ITEM || (options instanceof ItemParticleOption data && data.getItem().is(Items.SPLASH_POTION))) {
-                if (FancyBlockParticles.CONFIG.misc.isFancyBreakingSplashPotionParticles() && FancyBlockParticles.CONFIG.isBlockParticlesEnabled(Blocks.GLASS))
-                    callback.setReturnValue(new FBPTerrainParticle.Provider(BlockPos.containing(x, y, z), FBPConstants.RANDOM.nextFloat(0.5F, 0.75F) * FancyBlockParticles.CONFIG.misc.getBreakingSplashPotionParticleSizeMultiplier(), null, null, original.rCol, original.gCol, original.bCol).createParticle(new BlockParticleOption(ParticleTypes.BLOCK, Blocks.GLASS.defaultBlockState()), this.level, x, y, z, xd, yd, zd));
-            }
+            } else if (options.getType() == ParticleTypes.ITEM)
+                if (options instanceof ItemParticleOption data && data.getItem().is(Items.SPLASH_POTION))
+                    if (FancyBlockParticles.CONFIG.misc.isFancyBreakingSplashPotionParticles() && FancyBlockParticles.CONFIG.isBlockParticlesEnabled(Blocks.GLASS))
+                        callback.setReturnValue(new FBPTerrainParticle.Provider(BlockPos.containing(x, y, z), FBPConstants.RANDOM.nextFloat(0.5F, 0.75F) * FancyBlockParticles.CONFIG.misc.getBreakingSplashPotionParticleSizeMultiplier(), null, null, original.rCol, original.gCol, original.bCol).createParticle(new BlockParticleOption(ParticleTypes.BLOCK, Blocks.GLASS.defaultBlockState()), this.level, x, y, z, xd, yd, zd));
         }
 
         if (FancyBlockParticles.CONFIG.terrain.isFancyFallingDustParticles() && !(callback.getReturnValue() instanceof FBPTerrainParticle)) {

update.json

@@ -2,10 +2,11 @@
   "homepage": "https://www.curseforge.com/minecraft/mc-mods/fbp-renewed",
 
   "promos": {
-    "1.20.1-latest": "20.1.4.0"
+    "1.20.1-latest": "20.1.4.1"
   },
 
   "1.20.1": {
+    "20.1.4.1": "Fix glass particles when breaking egg",
     "20.1.4.0": "Fix particle spawning on Freeze effect. Add Fancy snowflake particles. Add Fancy breaking bottle particles",
     "20.1.3.0": "Compatible with Iris. Disable mod on dedicated server. Add Fancy falling dust particles",
     "20.1.2.1": "Fix crash with Productive Bees mod",