From c482d36227d0fcd16faad88ba4effa7037c79d32 Mon Sep 17 00:00:00 2001 From: Forstride Date: Fri, 12 Feb 2016 20:22:25 -0500 Subject: [PATCH] Made BOP lilypads non-collidable --- .../java/biomesoplenty/common/block/BlockBOPLilypad.java | 9 +++++++++ src/main/resources/assets/biomesoplenty/lang/en_US.lang | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java b/src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java index 40febd48a..5215d5447 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java @@ -18,11 +18,13 @@ import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemBlock; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.IStringSerializable; import net.minecraft.world.ColorizerFoliage; import net.minecraft.world.ColorizerGrass; import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; import net.minecraft.world.biome.BiomeColorHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -98,6 +100,13 @@ public class BlockBOPLilypad extends BlockLilyPad implements IBOPBlock return net.minecraftforge.common.EnumPlantType.Water; } + // no collision box - you can walk straight through them + @Override + public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state) + { + return null; + } + @Override @SideOnly(Side.CLIENT) public int getBlockColor() diff --git a/src/main/resources/assets/biomesoplenty/lang/en_US.lang b/src/main/resources/assets/biomesoplenty/lang/en_US.lang index 6a2306be7..0936d6a91 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_US.lang +++ b/src/main/resources/assets/biomesoplenty/lang/en_US.lang @@ -305,7 +305,7 @@ tile.leaves_2.pink_cherry_leaves.name=Pink Cherry Leaves tile.leaves_2.white_cherry_leaves.name=White Cherry Leaves tile.leaves_2.maple_leaves.name=Maple Leaves tile.leaves_3.hellbark_leaves.name=Hellbark Leaves -tile.leaves_3.flowering_leaves.name=Flowering Leaves +tile.leaves_3.flowering_leaves.name=Flowering Oak Leaves tile.leaves_3.jacaranda_leaves.name=Jacaranda Leaves tile.leaves_3.sacred_oak_leaves.name=Sacred Oak Leaves tile.leaves_4.mangrove_leaves.name=Mangrove Leaves