diff --git a/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java b/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java index 5fbcc10c3..471c4dea6 100644 --- a/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java @@ -11,8 +11,16 @@ */ package vazkii.botania.client.core.proxy; +import net.minecraft.client.Minecraft; +import net.minecraft.world.World; +import vazkii.botania.client.fx.FXSparkle; import vazkii.botania.common.core.proxy.CommonProxy; public class ClientProxy extends CommonProxy { + @Override + public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m) { + FXSparkle sparkle = new FXSparkle(world, x, y, z, size, r, g, b, m); + Minecraft.getMinecraft().effectRenderer.addEffect(sparkle); + } } diff --git a/MODSRC/vazkii/botania/client/fx/FXSparkle.java b/MODSRC/vazkii/botania/client/fx/FXSparkle.java index faff4e212..4e1a74bc4 100644 --- a/MODSRC/vazkii/botania/client/fx/FXSparkle.java +++ b/MODSRC/vazkii/botania/client/fx/FXSparkle.java @@ -29,17 +29,16 @@ public class FXSparkle extends EntityFX public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_PARTICLES); - public FXSparkle(World world, double d, double d1, double d2, float f, float f1, float f2, float f3, int m) + public FXSparkle(World world, double x, double y, double z, float size, float red, float green, float blue, int m) { - super(world, d, d1, d2, 0.0D, 0.0D, 0.0D); - if(f1 == 0.0F) f1 = 1.0F; + super(world, x, y, z, 0.0D, 0.0D, 0.0D); - particleRed = f1; - particleGreen = f2; - particleBlue = f3; + particleRed = red; + particleGreen = green; + particleBlue = blue; particleGravity=0; motionX=motionY=motionZ=0; - particleScale *= f; + particleScale *= size; particleMaxAge = 3*m; multiplier=m; noClip = false; diff --git a/MODSRC/vazkii/botania/common/block/BlockModFlower.java b/MODSRC/vazkii/botania/common/block/BlockModFlower.java index dc70880ea..8cf8cb8b5 100644 --- a/MODSRC/vazkii/botania/common/block/BlockModFlower.java +++ b/MODSRC/vazkii/botania/common/block/BlockModFlower.java @@ -12,14 +12,18 @@ package vazkii.botania.common.block; import java.util.List; +import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.passive.EntitySheep; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; +import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.common.Botania; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockModFlower; import vazkii.botania.common.lib.LibBlockIDs; @@ -37,6 +41,8 @@ public class BlockModFlower extends BlockFlower { setUnlocalizedName(LibBlockNames.FLOWER); setHardness(0F); setStepSound(soundGrassFootstep); + setBlockBounds(0.3F, 0.0F, 0.3F, 0.8F, 1, 0.8F); + setTickRandomly(true); setCreativeTab(BotaniaCreativeTab.INSTANCE); } @@ -69,4 +75,12 @@ public class BlockModFlower extends BlockFlower { public int damageDropped(int par1) { return par1; } + + @Override + public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { + int meta = par1World.getBlockMetadata(par2, par3, par4); + float[] color = EntitySheep.fleeceColorTable[meta]; + + Botania.proxy.sparkleFX(par1World, par2 + 0.3 + par5Random.nextFloat() * 0.5, par3 + 0.5 + par5Random.nextFloat() * 0.5, par4 + 0.3 + par5Random.nextFloat() * 0.5, color[0], color[1], color[2], par5Random.nextFloat(), 5); + } } diff --git a/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java b/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java index 6ce08accc..d14e7c55c 100644 --- a/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java @@ -11,6 +11,7 @@ */ package vazkii.botania.common.core.proxy; +import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; @@ -48,5 +49,8 @@ public class CommonProxy { } + public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m) { + // NO-OP + } }