From 5dc95864a6c32f2ae358478e794e1f87aef527c1 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sun, 1 May 2016 01:08:05 +0200 Subject: [PATCH] Fix cocoon bounding boxs --- .../lepidopterology/blocks/BlockCocoon.java | 2 +- .../blocks/BlockSolidCocoon.java | 26 ++----------------- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/src/main/java/forestry/lepidopterology/blocks/BlockCocoon.java b/src/main/java/forestry/lepidopterology/blocks/BlockCocoon.java index 574d06af3..a6afd6815 100644 --- a/src/main/java/forestry/lepidopterology/blocks/BlockCocoon.java +++ b/src/main/java/forestry/lepidopterology/blocks/BlockCocoon.java @@ -124,7 +124,7 @@ public class BlockCocoon extends Block implements ITileEntityProvider, IStateMap @Override public AxisAlignedBB getCollisionBoundingBox(World world, BlockPos pos, IBlockState state) { - setBlockBounds(0, 0, 0, 1, 1, 1); + setBlockBounds(0.3125F, 0.3125F, 0.3125F, 0.6875F, 1F, 0.6875F); return super.getCollisionBoundingBox(world, pos, state); } diff --git a/src/main/java/forestry/lepidopterology/blocks/BlockSolidCocoon.java b/src/main/java/forestry/lepidopterology/blocks/BlockSolidCocoon.java index d0d3c9933..19cf41891 100644 --- a/src/main/java/forestry/lepidopterology/blocks/BlockSolidCocoon.java +++ b/src/main/java/forestry/lepidopterology/blocks/BlockSolidCocoon.java @@ -125,35 +125,13 @@ public class BlockSolidCocoon extends Block implements ITileEntityProvider, ISta @Override public AxisAlignedBB getSelectedBoundingBox(World world, BlockPos pos) { - TileCocoon cocoon = TileUtil.getTile(world, pos, TileCocoon.class); - if(cocoon != null){ - if(cocoon.getAge() == 0){ - setBlockBounds(0.375F, 0.5F, 0.4375F, 0.5625F, 1F, 0.6875F); - }else if(cocoon.getAge() == 1){ - setBlockBounds(0.34375F, 0.375F, 0.40625F, 0.59375F, 1F, 0.71875F); - }else if(cocoon.getAge() == 2){ - setBlockBounds(0.34375F, 0.25F, 0.28125F, 0.71875F, 1F, 0.71875F); - }else{ - setBlockBounds(0, 0, 0, 1, 1, 1); - } - } + setBlockBounds(0.3125F, 0.3125F, 0.3125F, 0.6875F, 1F, 0.6875F); return super.getSelectedBoundingBox(world, pos); } @Override public AxisAlignedBB getCollisionBoundingBox(World world, BlockPos pos, IBlockState state) { - TileCocoon cocoon = TileUtil.getTile(world, pos, TileCocoon.class); - if(cocoon != null){ - if(cocoon.getAge() == 0){ - setBlockBounds(0.375F, 0.5F, 0.4375F, 0.5625F, 1F, 0.6875F); - }else if(cocoon.getAge() == 1){ - setBlockBounds(0.34375F, 0.375F, 0.40625F, 0.59375F, 1F, 0.71875F); - }else if(cocoon.getAge() == 2){ - setBlockBounds(0.34375F, 0.25F, 0.28125F, 0.71875F, 1F, 0.71875F); - }else{ - setBlockBounds(0, 0, 0, 1, 1, 1); - } - } + setBlockBounds(0.3125F, 0.3125F, 0.3125F, 0.6875F, 1F, 0.6875F); return super.getCollisionBoundingBox(world, pos, state); }