diff --git a/src/main/java/de/ellpeck/naturesaura/packet/PacketParticles.java b/src/main/java/de/ellpeck/naturesaura/packet/PacketParticles.java index be9bb9d9..c396006d 100644 --- a/src/main/java/de/ellpeck/naturesaura/packet/PacketParticles.java +++ b/src/main/java/de/ellpeck/naturesaura/packet/PacketParticles.java @@ -279,7 +279,7 @@ public class PacketParticles implements IMessage { world.rand.nextGaussian() * 0.01F, world.rand.nextFloat() * 0.04F + 0.02F, world.rand.nextGaussian() * 0.01F, - 0x5ccc30, 1F + world.rand.nextFloat() * 1.5F, 40, 0F, false, true); + 0xd13308, 1F + world.rand.nextFloat() * 1.5F, 40, 0F, false, true); break; case 17: // Animal generator consuming boolean child = message.data[0] > 0; diff --git a/src/main/java/de/ellpeck/naturesaura/particles/ParticleMagic.java b/src/main/java/de/ellpeck/naturesaura/particles/ParticleMagic.java index cd925247..69d19aff 100644 --- a/src/main/java/de/ellpeck/naturesaura/particles/ParticleMagic.java +++ b/src/main/java/de/ellpeck/naturesaura/particles/ParticleMagic.java @@ -48,15 +48,15 @@ public class ParticleMagic extends Particle { this.prevPosZ = this.posZ; this.particleAge++; - if (this.particleAge >= this.particleMaxAge) { + if (this.particleAge > this.particleMaxAge) { this.setExpired(); } else { this.motionY -= 0.04D * (double) this.particleGravity; this.move(this.motionX, this.motionY, this.motionZ); float lifeRatio = (float) this.particleAge / (float) this.particleMaxAge; - if (this.fade) - this.particleAlpha = 1F - lifeRatio * 0.75F; + if (this.fade && lifeRatio > 0.75F) + this.particleAlpha = 1F - (lifeRatio - 0.75F) / 0.25F; if (lifeRatio <= 0.25F) this.particleScale = this.desiredScale * (lifeRatio / 0.25F); else if (this.fade) diff --git a/src/main/resources/assets/naturesaura/textures/blocks/animal_generator.png b/src/main/resources/assets/naturesaura/textures/blocks/animal_generator.png index 74c81ad4..7370a5f7 100644 Binary files a/src/main/resources/assets/naturesaura/textures/blocks/animal_generator.png and b/src/main/resources/assets/naturesaura/textures/blocks/animal_generator.png differ diff --git a/src/main/resources/assets/naturesaura/textures/blocks/animal_generator_bottom.png b/src/main/resources/assets/naturesaura/textures/blocks/animal_generator_bottom.png index 694b638d..588a0b7e 100644 Binary files a/src/main/resources/assets/naturesaura/textures/blocks/animal_generator_bottom.png and b/src/main/resources/assets/naturesaura/textures/blocks/animal_generator_bottom.png differ diff --git a/src/main/resources/assets/naturesaura/textures/blocks/animal_generator_top.png b/src/main/resources/assets/naturesaura/textures/blocks/animal_generator_top.png index 4ccb8244..ba9154d6 100644 Binary files a/src/main/resources/assets/naturesaura/textures/blocks/animal_generator_top.png and b/src/main/resources/assets/naturesaura/textures/blocks/animal_generator_top.png differ diff --git a/src/main/resources/assets/naturesaura/textures/blocks/end_flower.png b/src/main/resources/assets/naturesaura/textures/blocks/end_flower.png index 7732a7b6..6f3a7228 100644 Binary files a/src/main/resources/assets/naturesaura/textures/blocks/end_flower.png and b/src/main/resources/assets/naturesaura/textures/blocks/end_flower.png differ diff --git a/src/main/resources/assets/naturesaura/textures/blocks/infused_brick.png b/src/main/resources/assets/naturesaura/textures/blocks/infused_brick.png index c03c7fe6..17088b35 100644 Binary files a/src/main/resources/assets/naturesaura/textures/blocks/infused_brick.png and b/src/main/resources/assets/naturesaura/textures/blocks/infused_brick.png differ diff --git a/src/main/resources/assets/naturesaura/textures/blocks/infused_stone.png b/src/main/resources/assets/naturesaura/textures/blocks/infused_stone.png index 6a7032dc..0c790365 100644 Binary files a/src/main/resources/assets/naturesaura/textures/blocks/infused_stone.png and b/src/main/resources/assets/naturesaura/textures/blocks/infused_stone.png differ diff --git a/src/main/resources/assets/naturesaura/textures/blocks/pickup_stopper.png b/src/main/resources/assets/naturesaura/textures/blocks/pickup_stopper.png index c4110419..74958630 100644 Binary files a/src/main/resources/assets/naturesaura/textures/blocks/pickup_stopper.png and b/src/main/resources/assets/naturesaura/textures/blocks/pickup_stopper.png differ diff --git a/src/main/resources/assets/naturesaura/textures/blocks/pickup_stopper_top.png b/src/main/resources/assets/naturesaura/textures/blocks/pickup_stopper_top.png index 2f91924f..d3a7c75f 100644 Binary files a/src/main/resources/assets/naturesaura/textures/blocks/pickup_stopper_top.png and b/src/main/resources/assets/naturesaura/textures/blocks/pickup_stopper_top.png differ