diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index e08576a4b..58c3e5048 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -22,6 +22,7 @@ import net.minecraft.client.util.InputMappings; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraft.particles.IParticleData; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; @@ -283,5 +284,10 @@ public class ClientProxy implements IProxy { public BipedModel getEmptyModelBiped() { return EMPTY_MODEL; } + + @Override + public void addParticleForce(World world, IParticleData particleData, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed) { + world.addParticle(particleData, true, x, y, z, xSpeed, ySpeed, zSpeed); + } } diff --git a/src/main/java/vazkii/botania/common/core/proxy/IProxy.java b/src/main/java/vazkii/botania/common/core/proxy/IProxy.java index 167af02f5..5afacd618 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/IProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/IProxy.java @@ -4,6 +4,7 @@ import net.minecraft.block.Block; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraft.particles.IParticleData; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.boss.IBotaniaBoss; @@ -49,4 +50,7 @@ public interface IProxy { int getClientRenderDistance(); Object getEmptyModelBiped(); + + // Side-safe version of world.addParticle with noDistanceLimit flag set to true + default void addParticleForce(World world, IParticleData particleData, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed) {} } diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 73d0c436e..ebf9117d2 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -445,8 +445,7 @@ public class EntityManaBurst extends ThrowableEntity implements IManaBurst { if(!noParticles && shouldDoFakeParticles()) { SparkleParticleData data = SparkleParticleData.fake(0.4F * size, r, g, b, 1); - // todo 1.14 usage of client-only method - world.addParticle(data, true, posX, posY, posZ, 0, 0, 0); + Botania.proxy.addParticleForce(world, data, posX, posY, posZ, 0, 0, 0); } } else { boolean depth = !Botania.proxy.isClientPlayerWearingMonocle(); diff --git a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java index 3284fbbec..286c25ef0 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java @@ -67,15 +67,14 @@ public class EntitySignalFlare extends Entity { int g = (hex & 0xFF00) >> 8; int b = hex & 0xFF; - // todo 1.14 use of client only addParticle version for(int i = 0; i < 3; i++) { WispParticleData data = WispParticleData.wisp((float) Math.random() * 5 + 1F, r / 255F, g / 255F, b / 255F); - world.addParticle(data, true, posX, posY, posZ + 0.5, (float) (Math.random() - 0.5F), 10F * (float) Math.sqrt(256F / (256F - (float) posY)), (float) (Math.random() - 0.5F)); + Botania.proxy.addParticleForce(world, data, posX, posY, posZ + 0.5, (float) (Math.random() - 0.5F), 10F * (float) Math.sqrt(256F / (256F - (float) posY)), (float) (Math.random() - 0.5F)); } for(int i = 0; i < 4; i++) { WispParticleData data = WispParticleData.wisp((float) Math.random() * 15 + 8F, r / 255F, g / 255F, b / 255F); - world.addParticle(data, true, posX + 0.5, Math.min(256, getFiredAt() + Botania.proxy.getClientRenderDistance() * 16), posZ + 0.5, (float) (Math.random() - 0.5F) * 8F, 0F, (float) (Math.random() - 0.5F) * 8F); + Botania.proxy.addParticleForce(world, data, posX + 0.5, Math.min(256, getFiredAt() + Botania.proxy.getClientRenderDistance() * 16), posZ + 0.5, (float) (Math.random() - 0.5F) * 8F, 0F, (float) (Math.random() - 0.5F) * 8F); } } }