From ee08a279a779754981677bb833c9aa4918c13372 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 8 Jun 2019 18:08:15 -0700 Subject: [PATCH] Fix some block methods --- .../java/vazkii/botania/common/block/BlockAltar.java | 6 ++++-- .../botania/common/block/BlockAnimatedTorch.java | 3 ++- .../java/vazkii/botania/common/block/BlockAvatar.java | 3 ++- .../java/vazkii/botania/common/block/BlockCocoon.java | 3 ++- .../vazkii/botania/common/block/BlockFelPumpkin.java | 7 ++++--- .../common/block/BlockFloatingSpecialFlower.java | 8 +++----- .../vazkii/botania/common/block/BlockForestEye.java | 3 ++- .../vazkii/botania/common/block/BlockHourglass.java | 3 ++- .../botania/common/block/BlockIncensePlate.java | 3 ++- .../botania/common/block/BlockLightLauncher.java | 3 ++- .../vazkii/botania/common/block/BlockLightRelay.java | 3 ++- .../java/vazkii/botania/common/block/BlockPylon.java | 3 ++- .../botania/common/block/BlockSparkChanger.java | 3 ++- .../botania/common/block/BlockSpecialFlower.java | 11 +++++------ .../botania/common/block/BlockTeruTeruBozu.java | 3 ++- .../vazkii/botania/common/block/BlockTinyPlanet.java | 3 ++- .../block/corporea/BlockCorporeaCrystalCube.java | 3 ++- .../botania/common/block/decor/BlockBuriedPetals.java | 3 ++- .../common/block/decor/BlockFloatingFlower.java | 3 ++- .../botania/common/block/decor/BlockManaFlame.java | 3 ++- .../botania/common/block/decor/BlockModMushroom.java | 3 ++- .../botania/common/block/decor/BlockStarfield.java | 3 ++- .../botania/common/block/decor/BlockTinyPotato.java | 3 ++- .../botania/common/block/mana/BlockBellows.java | 3 ++- .../botania/common/block/mana/BlockBrewery.java | 3 ++- .../botania/common/block/mana/BlockDistributor.java | 3 ++- .../botania/common/block/mana/BlockForestDrum.java | 3 ++- .../vazkii/botania/common/block/mana/BlockPool.java | 3 ++- .../vazkii/botania/common/block/mana/BlockPrism.java | 3 ++- .../vazkii/botania/common/block/mana/BlockPump.java | 3 ++- .../botania/common/block/mana/BlockRuneAltar.java | 3 ++- .../botania/common/block/mana/BlockSpawnerClaw.java | 3 ++- .../botania/common/block/mana/BlockTerraPlate.java | 3 ++- 33 files changed, 74 insertions(+), 45 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index fbcf12c36..3b4b4a0e8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -33,9 +33,11 @@ import net.minecraft.util.IItemProvider; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.util.math.shapes.VoxelShapes; import net.minecraft.world.IBlockReader; +import net.minecraft.world.IEnviromentBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; import net.minecraftforge.common.util.LazyOptional; @@ -95,7 +97,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { return SHAPE; } @@ -126,7 +128,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { } @Override - public int getLightValue(@Nonnull BlockState state, IWorldReader world, @Nonnull BlockPos pos) { + public int getLightValue(@Nonnull BlockState state, IEnviromentBlockReader world, @Nonnull BlockPos pos) { if(world.getBlockState(pos).getBlock() != this) return world.getBlockState(pos).getLightValue(world, pos); TileAltar tile = (TileAltar) world.getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java index 075a50328..13ac708cf 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java +++ b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java @@ -24,6 +24,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorld; @@ -124,7 +125,7 @@ public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrig @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { return SHAPE; } diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index d0937eaab..13bf6e220 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -23,6 +23,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; @@ -51,7 +52,7 @@ public class BlockAvatar extends BlockMod implements ILexiconable { @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { if(state.get(BotaniaStateProps.CARDINALS).getAxis() == Direction.Axis.X) return X_AABB; else return Z_AABB; diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index c90cf7847..86f9fb2c0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -30,6 +30,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; @@ -53,7 +54,7 @@ public class BlockCocoon extends BlockMod implements ILexiconable { @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { return SHAPE; } diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index 922c81c0f..85a4bc219 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -16,6 +16,7 @@ import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.BlockState; import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.SpawnReason; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.monster.BlazeEntity; import net.minecraft.entity.player.PlayerEntity; @@ -62,8 +63,8 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { } @Override - public void onBlockAdded(BlockState state, World world, BlockPos pos, BlockState oldState) { - super.onBlockAdded(state, world, pos, oldState); + public void onBlockAdded(BlockState state, World world, BlockPos pos, BlockState oldState, boolean isMoving) { + super.onBlockAdded(state, world, pos, oldState, isMoving); if(!world.isRemote && world.getBlockState(pos.down()).getBlock() == Blocks.IRON_BARS && world.getBlockState(pos.down(2)).getBlock() == Blocks.IRON_BARS) { world.setBlockState(pos, Blocks.AIR.getDefaultState()); @@ -72,7 +73,7 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { BlazeEntity blaze = new BlazeEntity(world); blaze.setLocationAndAngles(pos.getX() + 0.5D, pos.getY() - 1.95D, pos.getZ() + 0.5D, 0.0F, 0.0F); blaze.deathLootTable = LOOT_TABLE; - blaze.onInitialSpawn(world.getDifficultyForLocation(pos), null, null); + blaze.onInitialSpawn(world, world.getDifficultyForLocation(pos), SpawnReason.EVENT, null, null); world.spawnEntity(blaze); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index cadb0a167..fa489d9c8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -29,6 +29,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; +import net.minecraft.world.IEnviromentBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; @@ -55,10 +56,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public int getLightValue(@Nonnull BlockState state, IWorldReader world, @Nonnull BlockPos pos) { - if(world.getBlockState(pos).getBlock() != this) - return world.getBlockState(pos).getLightValue(world, pos); - + public int getLightValue(@Nonnull BlockState state, IEnviromentBlockReader world, @Nonnull BlockPos pos) { TileEntity tile = world.getTileEntity(pos); return tile instanceof TileEntitySpecialFlower ? ((TileEntitySpecialFlower) tile).getLightValue() : lightValue; } @@ -142,7 +140,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public void onBlockAdded(BlockState state, World world, BlockPos pos, BlockState oldState) { + public void onBlockAdded(BlockState state, World world, BlockPos pos, BlockState oldState, boolean isMoving) { ((TileEntitySpecialFlower) world.getTileEntity(pos)).onBlockAdded(world, pos, state); } diff --git a/src/main/java/vazkii/botania/common/block/BlockForestEye.java b/src/main/java/vazkii/botania/common/block/BlockForestEye.java index 39b47e877..c6ce0bfd1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -16,6 +16,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; @@ -36,7 +37,7 @@ public class BlockForestEye extends BlockMod implements ILexiconable { @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { return SHAPE; } diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 5a16144ad..3f450b662 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -26,6 +26,7 @@ import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.util.text.TranslationTextComponent; @@ -67,7 +68,7 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { return SHAPE; } diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 82dede89d..696a42997 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -26,6 +26,7 @@ import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; @@ -104,7 +105,7 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { if(state.get(BotaniaStateProps.CARDINALS).getAxis() == Direction.Axis.X) { return X_SHAPE; } else { diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index dd3ec27c5..d0cfc61ef 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -23,6 +23,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.IBlockReader; @@ -48,7 +49,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { return SHAPE; } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index a22783fdc..b45d8862e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -22,6 +22,7 @@ import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; @@ -51,7 +52,7 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { return SHAPE; } diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 819f2e1f4..abb9441d2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -18,6 +18,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.block.BlockRenderType; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; @@ -46,7 +47,7 @@ public class BlockPylon extends BlockMod implements ILexiconable { @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { return SHAPE; } diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index 2c0a870b8..f08f0f1c8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -24,6 +24,7 @@ import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; @@ -51,7 +52,7 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { return SHAPE; } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index f00175554..1ed9bc950 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -33,8 +33,10 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; +import net.minecraft.world.IEnviromentBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; @@ -62,16 +64,13 @@ public class BlockSpecialFlower extends FlowerBlock implements ISpecialFlower, I @Nonnull @Override - public VoxelShape getShape(BlockState state, @Nonnull IBlockReader world, @Nonnull BlockPos pos) { + public VoxelShape getShape(BlockState state, @Nonnull IBlockReader world, @Nonnull BlockPos pos, ISelectionContext ctx) { Vec3d shift = state.getOffset(world, pos); return SHAPE.withOffset(shift.x, shift.y, shift.z); } @Override - public int getLightValue(@Nonnull BlockState state, IWorldReader world, @Nonnull BlockPos pos) { - if(world.getBlockState(pos).getBlock() != this) - return world.getBlockState(pos).getLightValue(world, pos); - + public int getLightValue(@Nonnull BlockState state, IEnviromentBlockReader world, @Nonnull BlockPos pos) { return world.getTileEntity(pos) == null ? 0 : ((TileEntitySpecialFlower) world.getTileEntity(pos)).getLightValue(); } @@ -176,7 +175,7 @@ public class BlockSpecialFlower extends FlowerBlock implements ISpecialFlower, I } @Override - public void onBlockAdded(BlockState state, World world, BlockPos pos, BlockState oldState) { + public void onBlockAdded(BlockState state, World world, BlockPos pos, BlockState oldState, boolean isMoving) { ((TileEntitySpecialFlower) world.getTileEntity(pos)).onBlockAdded(world, pos, state); } diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index 9cc168033..b0a41887c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -28,6 +28,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; @@ -49,7 +50,7 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { return SHAPE; } diff --git a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java index 572c66b42..8dce75036 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java @@ -21,6 +21,7 @@ import net.minecraft.util.Direction; import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.IBlockReader; @@ -44,7 +45,7 @@ public class BlockTinyPlanet extends BlockMod implements ILexiconable, IManaColl @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { return AABB; } 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 4ffb4ecc9..57f0c3a47 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -23,6 +23,7 @@ import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.util.text.TranslationTextComponent; @@ -54,7 +55,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { return SHAPE; } 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 c226b1c1d..c258bb7ab 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -19,6 +19,7 @@ import net.minecraft.block.BlockRenderType; import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; @@ -49,7 +50,7 @@ public class BlockBuriedPetals extends BlockModFlower { @Nonnull @Override - public VoxelShape getShape(BlockState state, @Nonnull IBlockReader world, @Nonnull BlockPos pos) { + public VoxelShape getShape(BlockState state, @Nonnull IBlockReader world, @Nonnull BlockPos pos, ISelectionContext ctx) { return SHAPE; } 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 22bd3894e..ea8238218 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -30,6 +30,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; @@ -65,7 +66,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable { @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { return SHAPE; } 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 56c130f93..327c6aaee 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -25,6 +25,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; @@ -49,7 +50,7 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { return SHAPE; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java index 6e19ad2e0..f737ff682 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -20,6 +20,7 @@ import net.minecraft.item.DyeColor; import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; @@ -49,7 +50,7 @@ public class BlockModMushroom extends MushroomBlock implements IHornHarvestable, @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { return SHAPE; } 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 73ab47261..0b81ae17c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -21,6 +21,7 @@ import net.minecraft.util.Direction; import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; @@ -44,7 +45,7 @@ public class BlockStarfield extends BlockMod implements ILexiconable { @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { return SHAPE; } 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 cc9908467..21fdb7455 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -31,6 +31,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.util.text.ITextComponent; import net.minecraft.world.IBlockReader; @@ -72,7 +73,7 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { return SHAPE; } 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 756fe5600..a6d05c0d9 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -28,6 +28,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; @@ -57,7 +58,7 @@ public class BlockBellows extends BlockMod implements ILexiconable { @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { return SHAPE; } 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 ed84e2cdf..6eea65d34 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -21,6 +21,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; @@ -54,7 +55,7 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { return SHAPE; } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java index 00a8c8993..9318534f3 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -20,6 +20,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; @@ -42,7 +43,7 @@ public class BlockDistributor extends BlockMod implements ILexiconable { @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { return SHAPE; } 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 fbd6eb4ed..620fe7998 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -24,6 +24,7 @@ import net.minecraft.util.Direction; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; @@ -61,7 +62,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { return SHAPE; } 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 eaffe31a9..fab5e0ae9 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -30,6 +30,7 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.util.math.shapes.VoxelShapes; import net.minecraft.world.IBlockReader; @@ -70,7 +71,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { return REAL_SHAPE; } 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 1ca25a313..600d11520 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -24,6 +24,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; @@ -57,7 +58,7 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { return SHAPE; } 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 107a625c1..3813fa69e 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -22,6 +22,7 @@ import net.minecraft.util.Direction; import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; @@ -58,7 +59,7 @@ public class BlockPump extends BlockMod implements ILexiconable { @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { if(state.get(BotaniaStateProps.CARDINALS).getAxis() == Direction.Axis.X) { return X_SHAPE; } else { 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 cf5c11e9f..c81b19613 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -23,6 +23,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; @@ -49,7 +50,7 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { return SHAPE; } 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 3badc716f..9a8b4a21f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -19,6 +19,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; @@ -40,7 +41,7 @@ public class BlockSpawnerClaw extends BlockMod implements ILexiconable { @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { return SHAPE; } 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 7aeeda339..3154d10f9 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -27,6 +27,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.IBlockReader; @@ -52,7 +53,7 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable { @Nonnull @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos) { + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext ctx) { return SHAPE; }