This commit is contained in:
modmuss50 2020-03-25 19:36:02 +00:00
parent 8679c9398f
commit 11290e89e7
28 changed files with 63 additions and 53 deletions

View file

@ -27,7 +27,6 @@ package techreborn.blocks.cable;
import net.minecraft.block.*;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityContext;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.fluid.Fluid;
@ -212,7 +211,7 @@ public class CableBlock extends BlockWithEntity implements Waterloggable {
}
@Override
public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, EntityContext entityContext) {
public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext shapeContext) {
if (state.get(COVERED)) {
return VoxelShapes.fullCube();
}

View file

@ -27,7 +27,6 @@ package techreborn.blocks.lighting;
import net.fabricmc.fabric.api.block.FabricBlockSettings;
import net.minecraft.block.*;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.entity.EntityContext;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemPlacementContext;
import net.minecraft.item.ItemStack;
@ -85,7 +84,7 @@ public class BlockLamp extends BaseBlockEntityProvider {
}
@Override
public VoxelShape getOutlineShape(BlockState blockState, BlockView blockView, BlockPos blockPos, EntityContext entityContext) {
public VoxelShape getOutlineShape(BlockState blockState, BlockView blockView, BlockPos blockPos, ShapeContext shapeContext) {
return shape[blockState.get(FACING).ordinal()];
}

View file

@ -28,9 +28,9 @@ import net.minecraft.block.Block;
import net.minecraft.block.BlockRenderType;
import net.minecraft.block.BlockState;
import net.minecraft.block.Material;
import net.minecraft.block.ShapeContext;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.client.item.TooltipContext;
import net.minecraft.entity.EntityContext;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemPlacementContext;
import net.minecraft.item.ItemStack;
@ -159,7 +159,7 @@ public class BlockAlarm extends BaseBlockEntityProvider {
@Override
public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, EntityContext entityContext) {
public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext shapeContext) {
return shape[getFacing(state).ordinal()];
}

View file

@ -71,7 +71,7 @@ public class BlockRubberLog extends PillarBlock {
public static BooleanProperty HAS_SAP = BooleanProperty.of("hassap");
public BlockRubberLog() {
super(Settings.method_26240(Material.WOOD, (blockState) -> MaterialColor.SPRUCE)
super(Settings.of(Material.WOOD, (blockState) -> MaterialColor.SPRUCE)
.strength(2.0F, 2f)
.sounds(BlockSoundGroup.WOOD)
.ticksRandomly());