1147 - Initial auto mappings pass
This commit is contained in:
parent
48198dbcb3
commit
4e03ac893c
291 changed files with 3335 additions and 3504 deletions
|
@ -27,23 +27,23 @@ package techreborn.blocks.lighting;
|
|||
import javax.annotation.Nullable;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.BlockRenderLayer;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.block.Material;
|
||||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.block.state.BlockFaceShape;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.BlockItemUseContext;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.ItemPlacementContext;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.state.BooleanProperty;
|
||||
import net.minecraft.state.DirectionProperty;
|
||||
import net.minecraft.state.StateContainer;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.BlockRenderLayer;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.EnumHand;
|
||||
import net.minecraft.state.StateFactory;
|
||||
import net.minecraft.state.property.BooleanProperty;
|
||||
import net.minecraft.state.property.DirectionProperty;
|
||||
import net.minecraft.state.property.Properties;
|
||||
import net.minecraft.util.Hand;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.shapes.VoxelShape;
|
||||
import net.minecraft.world.IBlockReader;
|
||||
import net.minecraft.util.math.Direction;
|
||||
import net.minecraft.util.shape.VoxelShape;
|
||||
import net.minecraft.world.BlockView;
|
||||
import net.minecraft.world.World;
|
||||
import reborncore.api.ToolManager;
|
||||
import reborncore.client.models.ModelCompound;
|
||||
|
@ -56,7 +56,7 @@ import techreborn.tiles.lighting.TileLamp;
|
|||
|
||||
public class BlockLamp extends BaseTileBlock {
|
||||
|
||||
public static DirectionProperty FACING = BlockStateProperties.FACING;
|
||||
public static DirectionProperty FACING = Properties.FACING;
|
||||
public static BooleanProperty ACTIVE;
|
||||
protected final VoxelShape[] shape;
|
||||
|
||||
|
@ -64,8 +64,8 @@ public class BlockLamp extends BaseTileBlock {
|
|||
private int brightness;
|
||||
|
||||
public BlockLamp(int brightness, int cost, double depth, double width) {
|
||||
super(Block.Properties.create(Material.REDSTONE_LIGHT));
|
||||
this.setDefaultState(this.stateContainer.getBaseState().with(FACING, EnumFacing.NORTH).with(ACTIVE, false));
|
||||
super(Block.Settings.of(Material.REDSTONE_LAMP));
|
||||
this.setDefaultState(this.stateFactory.getDefaultState().with(FACING, Direction.NORTH).with(ACTIVE, false));
|
||||
this.shape = GenCuboidShapes(depth, width);
|
||||
this.cost = cost;
|
||||
this.brightness = brightness;
|
||||
|
@ -76,31 +76,31 @@ public class BlockLamp extends BaseTileBlock {
|
|||
private VoxelShape[] GenCuboidShapes(double depth, double width) {
|
||||
double culling = (16.0D - width) / 2 ;
|
||||
VoxelShape[] shapes = {
|
||||
Block.makeCuboidShape(culling, 16.0 - depth, culling, 16.0 - culling, 16.0D, 16.0 - culling),
|
||||
Block.makeCuboidShape(culling, 0.0D, culling, 16.0D - culling, depth, 16.0 - culling),
|
||||
Block.makeCuboidShape(culling, culling, 16.0 - depth, 16.0 - culling, 16.0 - culling, 16.0D),
|
||||
Block.makeCuboidShape(culling, culling, 0.0D, 16.0 - culling, 16.0 - culling, depth),
|
||||
Block.makeCuboidShape(16.0 - depth, culling, culling, 16.0D, 16.0 - culling, 16.0 - culling),
|
||||
Block.makeCuboidShape(0.0D, culling, culling, depth, 16.0 - culling, 16.0 - culling)
|
||||
Block.createCuboidShape(culling, 16.0 - depth, culling, 16.0 - culling, 16.0D, 16.0 - culling),
|
||||
Block.createCuboidShape(culling, 0.0D, culling, 16.0D - culling, depth, 16.0 - culling),
|
||||
Block.createCuboidShape(culling, culling, 16.0 - depth, 16.0 - culling, 16.0 - culling, 16.0D),
|
||||
Block.createCuboidShape(culling, culling, 0.0D, 16.0 - culling, 16.0 - culling, depth),
|
||||
Block.createCuboidShape(16.0 - depth, culling, culling, 16.0D, 16.0 - culling, 16.0 - culling),
|
||||
Block.createCuboidShape(0.0D, culling, culling, depth, 16.0 - culling, 16.0 - culling)
|
||||
};
|
||||
return shapes;
|
||||
}
|
||||
|
||||
public static boolean isActive(IBlockState state) {
|
||||
public static boolean isActive(BlockState state) {
|
||||
return state.get(ACTIVE);
|
||||
}
|
||||
|
||||
public static EnumFacing getFacing(IBlockState state) {
|
||||
public static Direction getFacing(BlockState state) {
|
||||
return state.get(FACING);
|
||||
}
|
||||
|
||||
public static void setFacing(EnumFacing facing, World world, BlockPos pos) {
|
||||
public static void setFacing(Direction facing, World world, BlockPos pos) {
|
||||
world.setBlockState(pos, world.getBlockState(pos).with(FACING, facing));
|
||||
}
|
||||
|
||||
public static void setActive(Boolean active, World world, BlockPos pos) {
|
||||
EnumFacing facing = (EnumFacing)world.getBlockState(pos).get(FACING);
|
||||
IBlockState state = world.getBlockState(pos).with(ACTIVE, active).with(FACING, facing);
|
||||
Direction facing = (Direction)world.getBlockState(pos).get(FACING);
|
||||
BlockState state = world.getBlockState(pos).with(ACTIVE, active).with(FACING, facing);
|
||||
world.setBlockState(pos, state, 3);
|
||||
}
|
||||
|
||||
|
@ -110,23 +110,23 @@ public class BlockLamp extends BaseTileBlock {
|
|||
|
||||
// BaseTileBlock
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(IBlockReader worldIn) {
|
||||
public BlockEntity createBlockEntity(BlockView worldIn) {
|
||||
return new TileLamp();
|
||||
}
|
||||
|
||||
// Block
|
||||
@Override
|
||||
protected void fillStateContainer(StateContainer.Builder<Block, IBlockState> builder) {
|
||||
protected void appendProperties(StateFactory.Builder<Block, BlockState> builder) {
|
||||
ACTIVE = BooleanProperty.create("active");
|
||||
builder.add(FACING, ACTIVE);
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public IBlockState getStateForPlacement(BlockItemUseContext context) {
|
||||
for (EnumFacing enumfacing : context.getNearestLookingDirections()) {
|
||||
IBlockState iblockstate = this.getDefaultState().with(FACING, enumfacing.getOpposite());
|
||||
if (iblockstate.isValidPosition(context.getWorld(), context.getPos())) {
|
||||
public BlockState getPlacementState(ItemPlacementContext context) {
|
||||
for (Direction enumfacing : context.getPlacementFacings()) {
|
||||
BlockState iblockstate = this.getDefaultState().with(FACING, enumfacing.getOpposite());
|
||||
if (iblockstate.canPlaceAt(context.getWorld(), context.getBlockPos())) {
|
||||
return iblockstate;
|
||||
}
|
||||
}
|
||||
|
@ -134,7 +134,7 @@ public class BlockLamp extends BaseTileBlock {
|
|||
}
|
||||
|
||||
@Override
|
||||
public int getLightValue(IBlockState state) {
|
||||
public int getLuminance(BlockState state) {
|
||||
return state.get(ACTIVE) ? brightness : 0;
|
||||
}
|
||||
|
||||
|
@ -144,12 +144,12 @@ public class BlockLamp extends BaseTileBlock {
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean isFullCube(IBlockState state) {
|
||||
public boolean isFullCube(BlockState state) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockFaceShape getBlockFaceShape(IBlockReader worldIn, IBlockState state, BlockPos pos, EnumFacing facing) {
|
||||
public BlockFaceShape getBlockFaceShape(BlockView worldIn, BlockState state, BlockPos pos, Direction facing) {
|
||||
// This makes only the back face of lamps connect to fences.
|
||||
if (getFacing(state).getOpposite() == facing)
|
||||
return BlockFaceShape.SOLID;
|
||||
|
@ -158,15 +158,15 @@ public class BlockLamp extends BaseTileBlock {
|
|||
}
|
||||
|
||||
@Override
|
||||
public VoxelShape getShape(IBlockState state, IBlockReader worldIn, BlockPos pos) {
|
||||
return shape[getFacing(state).getIndex()];
|
||||
public VoxelShape getShape(BlockState state, BlockView worldIn, BlockPos pos) {
|
||||
return shape[getFacing(state).getId()];
|
||||
}
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
@Override
|
||||
public boolean onBlockActivated(IBlockState state, World worldIn, BlockPos pos, EntityPlayer playerIn, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) {
|
||||
ItemStack stack = playerIn.getHeldItem(EnumHand.MAIN_HAND);
|
||||
TileEntity tileEntity = worldIn.getTileEntity(pos);
|
||||
public boolean onBlockActivated(BlockState state, World worldIn, BlockPos pos, PlayerEntity playerIn, Hand hand, Direction side, float hitX, float hitY, float hitZ) {
|
||||
ItemStack stack = playerIn.getStackInHand(Hand.MAIN_HAND);
|
||||
BlockEntity tileEntity = worldIn.getBlockEntity(pos);
|
||||
|
||||
// We extended BaseTileBlock. Thus we should always have tile entity. I hope.
|
||||
if (tileEntity == null) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue