From 3d7c9e8b945de497cc86ab2d66625f95c76053f1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 5 Aug 2016 20:21:50 -0500 Subject: [PATCH] Update forge, remove some unneeded particle methods --- build.properties | 2 +- .../common/block/BlockSpecialFlower.java | 39 ------------------ .../block/decor/BlockFloatingFlower.java | 41 ------------------- 3 files changed, 1 insertion(+), 81 deletions(-) diff --git a/build.properties b/build.properties index 1fafe8ac4..066331106 100644 --- a/build.properties +++ b/build.properties @@ -4,6 +4,6 @@ version=r1.8 dir_output=../Build Output/Botania/ dir_repo=./ mc_version=1.10.2 -forge_version=12.18.1.2044 +forge_version=12.18.1.2046 build_number=316 mod_name=Botania diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 723966808..7c0f54500 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block; -import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.SoundType; import net.minecraft.block.properties.IProperty; @@ -18,8 +17,6 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.particle.ParticleManager; -import net.minecraft.client.particle.ParticleDigging; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -32,11 +29,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; -import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -346,40 +341,6 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I ((TileSpecialFlower) world.getTileEntity(pos)).renderHUD(mc, res); } - @Override - public boolean addLandingEffects(IBlockState state, 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, ParticleManager effectRenderer) { - if (world.getBlockState(pos).getBlock() == this) { - int i = 4; - ParticleDigging.Factory factory = new ParticleDigging.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; - } - } - @Override public void register() { GameRegistry.register(this); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index a345e1402..bdbaff08f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -10,19 +10,14 @@ */ package vazkii.botania.common.block.decor; -import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.particle.ParticleManager; -import net.minecraft.client.particle.ParticleDigging; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; @@ -31,10 +26,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; -import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; @@ -130,40 +123,6 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu return state; } - @Override - public boolean addLandingEffects(IBlockState state, 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.DIRT.getDefaultState())); - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public boolean addDestroyEffects(World world, BlockPos pos, ParticleManager effectRenderer) { - if (world.getBlockState(pos).getBlock() == this) { - int i = 4; - ParticleDigging.Factory factory = new ParticleDigging.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.DIRT.getDefaultState()))); - } - } - } - return true; - } else { - return false; - } - } - @Override public void registerItemForm() { GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());