From 32fe7f6ce307f97b66afda75bf87bb143b32fcd2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 24 Dec 2015 15:05:52 -0600 Subject: [PATCH] Fix landing and break particles in specail flowers --- .../common/block/BlockSpecialFlower.java | 46 +++++++++++++++++-- .../botania/blockstates/specialFlower.json | 8 +--- 2 files changed, 43 insertions(+), 11 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 1020c9b4a..a6ac0aeb9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -17,28 +17,35 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.ITileEntityProvider; +import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.particle.EffectRenderer; +import net.minecraft.client.particle.EntityDiggingFX; import net.minecraft.client.renderer.block.statemap.DefaultStateMapper; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.RegistrySimple; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraft.world.WorldServer; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.property.ExtendedBlockState; @@ -208,11 +215,6 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid return true; } - @Override - public int getRenderType() { - return 3; - } - @Override public EnumWorldBlockLayer getBlockLayer() { return EnumWorldBlockLayer.CUTOUT; @@ -332,4 +334,38 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid ((TileSpecialFlower) world.getTileEntity(pos)).renderHUD(mc, res); } + @Override + public boolean addLandingEffects(net.minecraft.world.WorldServer worldObj, BlockPos blockPosition, IBlockState iblockstate, EntityLivingBase entity, int numberOfParticles) { + float f = (float) MathHelper.ceiling_float_int(entity.fallDistance - 3.0F); + double d0 = (double)Math.min(0.2F + f / 15.0F, 10.0F); + if (d0 > 2.5D) { + d0 = 2.5D; + } + int i = (int)(150.0D * d0); + worldObj.spawnParticle(EnumParticleTypes.BLOCK_DUST, entity.posX, entity.posY, entity.posZ, i, 0.0D, 0.0D, 0.0D, 0.15000000596046448D, Block.getStateId(Blocks.waterlily.getDefaultState())); + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean addDestroyEffects(World world, BlockPos pos, EffectRenderer effectRenderer) { + if (world.getBlockState(pos).getBlock() == this) { + int i = 4; + EntityDiggingFX.Factory factory = new EntityDiggingFX.Factory(); + for (int j = 0; j < i; ++j) { + for (int k = 0; k < i; ++k) { + for (int l = 0; l < i; ++l) { + double d0 = (double)pos.getX() + ((double)j + 0.5D) / (double)i; + double d1 = (double)pos.getY() + ((double)k + 0.5D) / (double)i; + double d2 = (double)pos.getZ() + ((double)l + 0.5D) / (double)i; + effectRenderer.addEffect(factory.getEntityFX(-1, world, d0, d1, d2, d0 - (double)pos.getX() - 0.5D, d1 - (double)pos.getY() - 0.5D, d2 - (double)pos.getZ() - 0.5D, Block.getStateId(Blocks.waterlily.getDefaultState()))); + } + } + } + return true; + } else { + return false; + } + } + } diff --git a/src/main/resources/assets/botania/blockstates/specialFlower.json b/src/main/resources/assets/botania/blockstates/specialFlower.json index 3a011d524..8ed1128f1 100644 --- a/src/main/resources/assets/botania/blockstates/specialFlower.json +++ b/src/main/resources/assets/botania/blockstates/specialFlower.json @@ -6,14 +6,10 @@ }, "variants": { "normal": [{ - "custom": { - "base": "botania:flower#color=white" - } + "custom": { "base": "minecraft:poppy" } }], "inventory": [{ - "custom": { - "base": "minecraft:poppy" - } + "custom": { "base": "minecraft:poppy" } }] } } \ No newline at end of file