From 8f09bc403d6746eadc798ec2afbd6696ac64e675 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 20 Sep 2017 08:06:06 -0500 Subject: [PATCH] Fix #2365 --- .../vazkii/botania/common/block/BlockAnimatedTorch.java | 7 +++++++ .../java/vazkii/botania/common/block/BlockAvatar.java | 7 +++++++ .../java/vazkii/botania/common/block/BlockCocoon.java | 7 +++++++ .../java/vazkii/botania/common/block/BlockEnderEye.java | 7 +++++++ .../java/vazkii/botania/common/block/BlockFakeAir.java | 8 ++++++++ .../botania/common/block/BlockFloatingSpecialFlower.java | 7 +++++++ .../java/vazkii/botania/common/block/BlockForestEye.java | 8 ++++++++ .../java/vazkii/botania/common/block/BlockHourglass.java | 7 +++++++ .../vazkii/botania/common/block/BlockIncensePlate.java | 7 +++++++ .../vazkii/botania/common/block/BlockLightLauncher.java | 7 +++++++ .../java/vazkii/botania/common/block/BlockLightRelay.java | 7 +++++++ src/main/java/vazkii/botania/common/block/BlockPylon.java | 8 ++++++++ .../vazkii/botania/common/block/BlockSparkChanger.java | 7 +++++++ .../vazkii/botania/common/block/BlockTeruTeruBozu.java | 7 +++++++ .../java/vazkii/botania/common/block/BlockTinyPlanet.java | 8 ++++++++ .../common/block/corporea/BlockCorporeaCrystalCube.java | 7 +++++++ .../vazkii/botania/common/block/mana/BlockBellows.java | 7 +++++++ .../vazkii/botania/common/block/mana/BlockBrewery.java | 7 +++++++ .../vazkii/botania/common/block/mana/BlockForestDrum.java | 8 ++++++++ .../java/vazkii/botania/common/block/mana/BlockPool.java | 7 +++++++ .../java/vazkii/botania/common/block/mana/BlockPrism.java | 7 +++++++ .../java/vazkii/botania/common/block/mana/BlockPump.java | 7 +++++++ .../vazkii/botania/common/block/mana/BlockRuneAltar.java | 7 +++++++ .../botania/common/block/mana/BlockSpawnerClaw.java | 8 ++++++++ .../vazkii/botania/common/block/mana/BlockSpreader.java | 7 +++++++ .../vazkii/botania/common/block/mana/BlockTerraPlate.java | 7 +++++++ 26 files changed, 188 insertions(+) diff --git a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java index f2df5f130..ed1e355cc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java +++ b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -137,6 +138,12 @@ public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrig return true; } + @Nonnull + @Override + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + return BlockFaceShape.UNDEFINED; + } + @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.animatedTorch; diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 9b266b63d..1e0fd8aec 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.statemap.StateMap; @@ -143,6 +144,12 @@ public class BlockAvatar extends BlockMod implements ILexiconable { return new TileAvatar(); } + @Nonnull + @Override + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + return BlockFaceShape.UNDEFINED; + } + @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.avatar; diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index 88f8eed69..84877e90e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -123,4 +124,10 @@ public class BlockCocoon extends BlockMod implements ILexiconable { return LexiconData.cocoon; } + @Nonnull + @Override + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + return side.getAxis() == EnumFacing.Axis.Y ? BlockFaceShape.CENTER_BIG : BlockFaceShape.MIDDLE_POLE_THICK; + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index ba34afc6c..acc96161d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -83,4 +84,10 @@ public class BlockEnderEye extends BlockMod implements ILexiconable { return LexiconData.enderEyeBlock; } + @Nonnull + @Override + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + return BlockFaceShape.UNDEFINED; + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index 3cc9942cc..48b6d87ab 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; @@ -19,6 +20,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; @@ -134,4 +136,10 @@ public class BlockFakeAir extends BlockMod { return new TileFakeAir(); } + @Nonnull + @Override + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + return BlockFaceShape.UNDEFINED; + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index c78fdd3c8..561e64ebe 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block; import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -200,4 +201,10 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return ((TileSpecialFlower) world.getTileEntity(pos)).getEntry(); } + + @Nonnull + @Override + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + return BlockFaceShape.UNDEFINED; + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockForestEye.java b/src/main/java/vazkii/botania/common/block/BlockForestEye.java index a25d8a025..71bcd7953 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -12,10 +12,12 @@ package vazkii.botania.common.block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -82,4 +84,10 @@ public class BlockForestEye extends BlockMod implements ILexiconable { return LexiconData.forestEye; } + @Nonnull + @Override + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + return BlockFaceShape.UNDEFINED; + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 0d9db9ea1..a2c189a32 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -207,4 +208,10 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, ModelHandler.registerCustomItemblock(this, "hovering_hourglass"); } + @Nonnull + @Override + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + return BlockFaceShape.UNDEFINED; + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index dda533be2..226234cbb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; @@ -152,4 +153,10 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { return LexiconData.incense; } + @Nonnull + @Override + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + return BlockFaceShape.UNDEFINED; + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index 2a57ea97b..663d640a8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -128,4 +129,10 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { return LexiconData.luminizerTransport; } + @Nonnull + @Override + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + return side == EnumFacing.DOWN ? BlockFaceShape.SOLID : BlockFaceShape.UNDEFINED; + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 4d46853c2..a50bf0dbc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -184,4 +185,10 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable ModelHandler.registerBlockToState(this, i++, getDefaultState().withProperty(BotaniaStateProps.LUMINIZER_VARIANT, v)); } + @Nonnull + @Override + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + return BlockFaceShape.UNDEFINED; + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 0aa3138d8..f549e396d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -20,6 +21,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -146,4 +148,10 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi String[] names = { "mana", "natura", "gaia" }; ModelHandler.registerCustomItemblock(this, names.length, i -> "pylon_" + names[i]); } + + @Nonnull + @Override + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + return BlockFaceShape.UNDEFINED; + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index 136360c62..c4bbc0682 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -160,4 +161,10 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { return LexiconData.sparkChanger; } + @Nonnull + @Override + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + return side == EnumFacing.DOWN ? BlockFaceShape.SOLID : BlockFaceShape.UNDEFINED; + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index 91757bde2..164598091 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -144,6 +145,12 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { return LexiconData.teruTeruBozu; } + @Nonnull + @Override + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + return BlockFaceShape.UNDEFINED; + } + @SideOnly(Side.CLIENT) @Override public void registerModels() { diff --git a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java index 29e24baac..31f3d107a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java @@ -12,10 +12,12 @@ package vazkii.botania.common.block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -76,4 +78,10 @@ public class BlockTinyPlanet extends BlockMod implements ILexiconable, IManaColl public boolean isGhost(IBlockState state, World world, BlockPos pos) { return true; } + + @Nonnull + @Override + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + return BlockFaceShape.UNDEFINED; + } } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java index de236913c..8b0e0cd8e 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.corporea; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -130,6 +131,12 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi return ((TileCorporeaCrystalCube) world.getTileEntity(pos)).compValue; } + @Nonnull + @Override + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + return BlockFaceShape.UNDEFINED; + } + @SideOnly(Side.CLIENT) @Override public void registerModels() { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java index c2701d9c0..5771f6003 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.statemap.StateMap; @@ -132,4 +133,10 @@ public class BlockBellows extends BlockMod implements ILexiconable { ModelHandler.registerCustomItemblock(this, "bellows"); } + @Nonnull + @Override + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + return BlockFaceShape.UNDEFINED; + } + } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java index 09ee00c58..b37002d14 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -162,4 +163,10 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { ModelHandler.registerCustomItemblock(this, "brewery"); } + @Nonnull + @Override + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + return BlockFaceShape.UNDEFINED; + } + } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java index 4092ec68f..9b00d6948 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -22,6 +23,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.NonNullList; import net.minecraft.util.SoundCategory; @@ -191,4 +193,10 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona ModelHandler.registerBlockToState(this, DrumVariant.values().length); } + @Nonnull + @Override + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + return BlockFaceShape.UNDEFINED; + } + } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index bd7014f5f..2aaa3e844 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -230,4 +231,10 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.COLOR).build()); ModelHandler.registerBlockToState(this, PoolVariant.values().length); } + + @Nonnull + @Override + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + return side == EnumFacing.DOWN ? BlockFaceShape.SOLID : BlockFaceShape.UNDEFINED; + } } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index 8cfc6fa42..f0d6b04d9 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -182,4 +183,10 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, public boolean isGhost(IBlockState state, World world, BlockPos pos) { return true; } + + @Nonnull + @Override + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + return side.getAxis() == EnumFacing.Axis.Y ? BlockFaceShape.CENTER_BIG : BlockFaceShape.MIDDLE_POLE_THICK; + } } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java index 6cbab9b42..808587ca1 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; @@ -136,4 +137,10 @@ public class BlockPump extends BlockMod implements ILexiconable { public void registerModels() { ModelHandler.registerInventoryVariant(this); } + + @Nonnull + @Override + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + return BlockFaceShape.UNDEFINED; + } } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java index ce381b360..f26eb3870 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -133,4 +134,10 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable return LexiconData.runicAltar; } + @Nonnull + @Override + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + return side == EnumFacing.DOWN ? BlockFaceShape.SOLID : BlockFaceShape.UNDEFINED; + } + } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java index 544b219fb..3f87c051d 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -11,12 +11,14 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -78,4 +80,10 @@ public class BlockSpawnerClaw extends BlockMod implements ILexiconable { return LexiconData.spawnerClaw; } + @Nonnull + @Override + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + return BlockFaceShape.UNDEFINED; + } + } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index 4acc07320..b06e57a19 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -29,6 +30,7 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -233,4 +235,9 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex ModelHandler.registerBlockToState(this, SpreaderVariant.values().length); } + @Nonnull + @Override + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + return BlockFaceShape.UNDEFINED; + } } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java index c45f9d34a..4d355590e 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -116,4 +117,10 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable { return val; } + @Nonnull + @Override + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + return side == EnumFacing.DOWN ? BlockFaceShape.SOLID : BlockFaceShape.UNDEFINED; + } + }