From 0e3c5949a183d4780934528ad996d643750423a7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 8 Jun 2019 01:19:50 -0700 Subject: [PATCH] Remove blockfaceshape --- .../botania/common/block/BlockAnimatedTorch.java | 7 ------- .../java/vazkii/botania/common/block/BlockAvatar.java | 7 ------- .../java/vazkii/botania/common/block/BlockCocoon.java | 8 -------- .../vazkii/botania/common/block/BlockEnderEye.java | 7 ------- .../vazkii/botania/common/block/BlockFakeAir.java | 1 - .../vazkii/botania/common/block/BlockForestEye.java | 7 ------- .../vazkii/botania/common/block/BlockHourglass.java | 7 ------- .../botania/common/block/BlockIncensePlate.java | 7 ------- .../botania/common/block/BlockLightLauncher.java | 7 ------- .../vazkii/botania/common/block/BlockLightRelay.java | 7 ------- .../java/vazkii/botania/common/block/BlockPylon.java | 7 ------- .../botania/common/block/BlockSparkChanger.java | 7 ------- .../botania/common/block/BlockTeruTeruBozu.java | 7 ------- .../vazkii/botania/common/block/BlockTinyPlanet.java | 7 ------- .../block/corporea/BlockCorporeaCrystalCube.java | 7 ------- .../botania/common/block/decor/BlockBuriedPetals.java | 11 ++--------- .../common/block/decor/BlockFloatingFlower.java | 7 ------- .../botania/common/block/decor/BlockManaFlame.java | 7 ------- .../botania/common/block/decor/BlockStarfield.java | 7 ------- .../botania/common/block/decor/BlockTinyPotato.java | 7 ------- .../botania/common/block/mana/BlockBellows.java | 7 ------- .../botania/common/block/mana/BlockBrewery.java | 7 ------- .../botania/common/block/mana/BlockForestDrum.java | 7 ------- .../vazkii/botania/common/block/mana/BlockPool.java | 7 ------- .../vazkii/botania/common/block/mana/BlockPrism.java | 7 ------- .../vazkii/botania/common/block/mana/BlockPump.java | 7 ------- .../botania/common/block/mana/BlockRuneAltar.java | 7 ------- .../botania/common/block/mana/BlockSpawnerClaw.java | 7 ------- .../botania/common/block/mana/BlockSpreader.java | 7 ------- .../botania/common/block/mana/BlockTerraPlate.java | 7 ------- .../botania/common/item/rod/ItemExchangeRod.java | 1 - 31 files changed, 2 insertions(+), 208 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java index 584d3319d..075a50328 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java +++ b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java @@ -11,7 +11,6 @@ package vazkii.botania.common.block; import net.minecraft.block.BlockState; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.entity.LivingEntity; @@ -139,12 +138,6 @@ public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrig return true; } - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) { - return BlockFaceShape.UNDEFINED; - } - @Override public void onPlayerDestroy(IWorld world, BlockPos pos, BlockState state) { // TE is already gone so best we can do is just notify everyone diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 676170a64..d0937eaab 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.ItemStack; @@ -117,12 +116,6 @@ public class BlockAvatar extends BlockMod implements ILexiconable { return new TileAvatar(); } - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) { - return BlockFaceShape.UNDEFINED; - } - @Override public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity 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 15a8aaf27..c90cf7847 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -12,7 +12,6 @@ package vazkii.botania.common.block; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.item.ItemEntity; @@ -138,11 +137,4 @@ public class BlockCocoon extends BlockMod implements ILexiconable { public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { return LexiconData.cocoon; } - - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) { - return side.getAxis() == Direction.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 8a32d8263..41eab42cd 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -14,7 +14,6 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity; @@ -75,12 +74,6 @@ public class BlockEnderEye extends BlockMod implements ILexiconable { return LexiconData.enderEyeBlock; } - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) { - return BlockFaceShape.UNDEFINED; - } - @Override public void animateTick(BlockState state, World world, BlockPos pos, Random rand) { if(state.get(BotaniaStateProps.POWERED)) { diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index 144488a44..ebe69889e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -16,7 +16,6 @@ import net.minecraft.block.AirBlock; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.block.Blocks; diff --git a/src/main/java/vazkii/botania/common/block/BlockForestEye.java b/src/main/java/vazkii/botania/common/block/BlockForestEye.java index ecd6a5c29..39b47e877 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -11,7 +11,6 @@ package vazkii.botania.common.block; import net.minecraft.block.BlockState; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -73,10 +72,4 @@ public class BlockForestEye extends BlockMod implements ILexiconable { return LexiconData.forestEye; } - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction 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 fc3a9f6f7..5a16144ad 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -12,7 +12,6 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.BlockRenderType; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.PlayerEntity; @@ -187,10 +186,4 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, return LexiconData.hourglass; } - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction 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 b93c8ceb7..82dede89d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -12,7 +12,6 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity; @@ -134,10 +133,4 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { return LexiconData.incense; } - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction 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 d7b1a869c..dd3ec27c5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -12,7 +12,6 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; @@ -105,10 +104,4 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { return LexiconData.luminizerTransport; } - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) { - return side == Direction.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 6237166d3..a22783fdc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -12,7 +12,6 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -130,10 +129,4 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable return LexiconData.luminizerTransport; } - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction 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 226274417..819f2e1f4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -12,7 +12,6 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -86,10 +85,4 @@ public class BlockPylon extends BlockMod implements ILexiconable { public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { return variant == Variant.MANA ? LexiconData.pylon : variant == Variant.NATURA ? LexiconData.alfhomancyIntro : LexiconData.gaiaRitual; } - - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction 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 eb555b179..2c0a870b8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -14,7 +14,6 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity; @@ -139,10 +138,4 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { return LexiconData.sparkChanger; } - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) { - return side == Direction.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 8cb99bbc1..9cc168033 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block; import net.minecraft.block.BlockRenderType; import net.minecraft.block.Blocks; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.item.ItemEntity; @@ -141,10 +140,4 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { return LexiconData.teruTeruBozu; } - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) { - return BlockFaceShape.UNDEFINED; - } - } diff --git a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java index 96931dcc8..572c66b42 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block; import net.minecraft.block.BlockState; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -74,10 +73,4 @@ public class BlockTinyPlanet extends BlockMod implements ILexiconable, IManaColl public boolean isGhost(BlockState state, World world, BlockPos pos) { return true; } - - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction 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 97c5c976d..4ffb4ecc9 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -14,7 +14,6 @@ import net.minecraft.block.Block; import javax.annotation.Nonnull; import net.minecraft.block.BlockState; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity; @@ -113,10 +112,4 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi public int getComparatorInputOverride(BlockState state, World world, BlockPos pos) { return ((TileCorporeaCrystalCube) world.getTileEntity(pos)).getComparatorValue(); } - - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) { - return BlockFaceShape.UNDEFINED; - } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 15213f059..c226b1c1d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -12,7 +12,6 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.BlockState; import net.minecraft.item.DyeColor; import net.minecraft.item.Item; @@ -44,8 +43,8 @@ public class BlockBuriedPetals extends BlockModFlower { @Nonnull @Override @OnlyIn(Dist.CLIENT) - public Block.EnumOffsetType getOffsetType() { - return Block.EnumOffsetType.NONE; + public Block.OffsetType getOffsetType() { + return Block.OffsetType.NONE; } @Nonnull @@ -80,10 +79,4 @@ public class BlockBuriedPetals extends BlockModFlower { return BlockRenderType.INVISIBLE; } - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) { - return BlockFaceShape.UNDEFINED; - } - } 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 3ed627d51..22bd3894e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -14,7 +14,6 @@ import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.DyeColor; @@ -143,10 +142,4 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable { public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { return LexiconData.shinyFlowers; } - - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) { - return BlockFaceShape.UNDEFINED; - } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java index 2dfd0f171..56c130f93 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -11,7 +11,6 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.BlockState; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity; @@ -102,10 +101,4 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { return LexiconData.lenses; } - - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) { - return BlockFaceShape.UNDEFINED; - } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java index 38199be4d..73ab47261 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -11,7 +11,6 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.BlockState; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity; @@ -77,10 +76,4 @@ public class BlockStarfield extends BlockMod implements ILexiconable { return LexiconData.starfield; } - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) { - return side == Direction.DOWN ? BlockFaceShape.SOLID : BlockFaceShape.UNDEFINED; - } - } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java index b73348360..cc9908467 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.Block; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.BlockState; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -157,10 +156,4 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { return LexiconData.tinyPotato; } - - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) { - return BlockFaceShape.UNDEFINED; - } } 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 16e48660d..756fe5600 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.Block; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.BlockState; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -101,10 +100,4 @@ public class BlockBellows extends BlockMod implements ILexiconable { return LexiconData.bellows; } - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction 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 a460e7a1c..ed84e2cdf 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.Block; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -129,10 +128,4 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { ((TileBrewery) world.getTileEntity(pos)).renderHUD(mc); } - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction 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 e5b2f91d5..fbd6eb4ed 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -12,7 +12,6 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.entity.MobEntity; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.passive.CowEntity; @@ -146,10 +145,4 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona } } - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction 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 5b687abd1..eaffe31a9 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -12,7 +12,6 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; @@ -158,10 +157,4 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { return variant == Variant.FABULOUS ? LexiconData.rainbowRod : LexiconData.pool; } - - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) { - return side == Direction.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 f3f54f8cb..1ca25a313 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -11,7 +11,6 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.Block; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity; @@ -152,10 +151,4 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, public boolean isGhost(BlockState state, World world, BlockPos pos) { return true; } - - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) { - return side.getAxis() == Direction.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 7569e1bca..107a625c1 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -11,7 +11,6 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.Block; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity; @@ -98,10 +97,4 @@ public class BlockPump extends BlockMod implements ILexiconable { public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { return new TilePump(); } - - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction 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 194490977..cf5c11e9f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -12,7 +12,6 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity; @@ -128,10 +127,4 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable return LexiconData.runicAltar; } - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) { - return side == Direction.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 922b828f6..3badc716f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block.mana; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.block.Blocks; @@ -72,10 +71,4 @@ public class BlockSpawnerClaw extends BlockMod implements ILexiconable { return LexiconData.spawnerClaw; } - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction 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 ccc6b1154..3eb16ec50 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -16,7 +16,6 @@ import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.entity.LivingEntity; @@ -216,10 +215,4 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex public List getWireframeAABB(World world, BlockPos pos) { return ImmutableList.of(new AxisAlignedBB(pos).shrink(1.0/16.0)); } - - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction 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 d8ffc040e..7aeeda339 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.BlockState; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.BlockState; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.item.ItemEntity; @@ -117,10 +116,4 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable { return val; } - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) { - return side == Direction.DOWN ? BlockFaceShape.SOLID : BlockFaceShape.UNDEFINED; - } - } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java index 54f8b443f..eb862c1fd 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -13,7 +13,6 @@ package vazkii.botania.common.item.rod; import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity;