Fix some block methods

This commit is contained in:
Vincent Lee committed 2019-06-08 18:08:15 -07:00
1 parent c7cc76e1f3
commit ee08a279a7
33 files changed
+74 -45

No files matched your search

@@ -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);
@@ -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;
}
@@ -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;
@@ -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;
}
@@ -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);
}
}
@@ -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);
}
@@ -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;
}
@@ -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;
}
@@ -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 {
@@ -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;
}
@@ -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;
}
@@ -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;
}
@@ -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;
}
@@ -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);
}
@@ -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;
}
@@ -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;
}
@@ -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;
}
@@ -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;
}
@@ -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;
}
@@ -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;
}
@@ -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;
}
@@ -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;
}
@@ -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;
}
@@ -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;
}
@@ -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;
}
@@ -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;
}
@@ -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;
}
@@ -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;
}
@@ -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;
}
@@ -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 {
@@ -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;
}
@@ -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;
}
@@ -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;
}