diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index 4f528d748..c35713a85 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -20,6 +20,7 @@ import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.Texture; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.world.ClientWorld; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; @@ -38,7 +39,7 @@ public class FXSparkle extends SpriteTexturedParticle { private final boolean slowdown = true; private final IAnimatedSprite sprite; - public FXSparkle(World world, double x, double y, double z, float size, + public FXSparkle(ClientWorld world, double x, double y, double z, float size, float red, float green, float blue, int m, boolean fake, boolean noClip, boolean corrupt, IAnimatedSprite sprite) { super(world, x, y, z, 0.0D, 0.0D, 0.0D); @@ -121,7 +122,7 @@ public class FXSparkle extends SpriteTexturedParticle { for (Direction direction1 : new Direction[] { Direction.NORTH, Direction.SOUTH, Direction.WEST, Direction.EAST, Direction.UP }) { blockpos$mutable.setPos(blockpos).move(direction1); - if (!this.world.getBlockState(blockpos$mutable).isCollisionShapeOpaque(this.world, blockpos$mutable)) { + if (!this.world.getBlockState(blockpos$mutable).func_235785_r_(this.world, blockpos$mutable)) { double d1 = Vector3d.getCoordinate(direction1.getAxis()); double d2 = direction1.getAxisDirection() == Direction.AxisDirection.POSITIVE ? 1.0D - d1 : d1; if (d2 < d0) { diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index 45d399503..431db0eb4 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -18,6 +18,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.world.ClientWorld; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; @@ -29,7 +30,7 @@ public class FXWisp extends SpriteTexturedParticle { private final float moteParticleScale; private final int moteHalfLife; - public FXWisp(World world, double d, double d1, double d2, double xSpeed, double ySpeed, double zSpeed, + public FXWisp(ClientWorld world, double d, double d1, double d2, double xSpeed, double ySpeed, double zSpeed, float size, float red, float green, float blue, boolean depthTest, float maxAgeMul, boolean noClip) { super(world, d, d1, d2, 0, 0, 0); // super applies wiggle to motion so set it here instead