Merge upstream

This commit is contained in:
Vincent Lee committed 2015-11-17 01:07:15 -06:00
commit 750276db9b
100 files changed
+525 -84

No files matched your search

@@ -30,7 +30,9 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
@@ -122,6 +124,7 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable,
}
}
@Override
public void addCollisionBoxesToList(World p_149743_1_, int p_149743_2_, int p_149743_3_, int p_149743_4_, AxisAlignedBB p_149743_5_, List p_149743_6_, Entity p_149743_7_) {
float f = 1F / 16F;
setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, f, 1.0F);
@@ -136,6 +139,11 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable,
super.addCollisionBoxesToList(p_149743_1_, p_149743_2_, p_149743_3_, p_149743_4_, p_149743_5_, p_149743_6_, p_149743_7_);
setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F);
}
@Override
public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) {
return side == ForgeDirection.DOWN;
}
@Override
public boolean isOpaqueCube() {