1.14.2
This commit is contained in:
parent
4479116d1c
commit
f8f20ce6ba
81 changed files with 280 additions and 434 deletions
|
@ -113,14 +113,14 @@ public class BlockAlarm extends BaseTileBlock {
|
|||
// Block
|
||||
@Override
|
||||
protected void appendProperties(StateFactory.Builder<Block, BlockState> builder) {
|
||||
ACTIVE = BooleanProperty.create("active");
|
||||
ACTIVE = BooleanProperty.of("active");
|
||||
builder.add(FACING, ACTIVE);
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public BlockState getPlacementState(ItemPlacementContext context) {
|
||||
for (Direction enumfacing : context.getPlacementFacings()) {
|
||||
for (Direction enumfacing : context.getPlacementDirections()) {
|
||||
BlockState iblockstate = this.getDefaultState().with(FACING, enumfacing.getOpposite());
|
||||
if (iblockstate.canPlaceAt(context.getWorld(), context.getBlockPos())) {
|
||||
return iblockstate;
|
||||
|
|
|
@ -49,7 +49,7 @@ import techreborn.entities.EntityNukePrimed;
|
|||
* Created by Mark on 13/03/2016.
|
||||
*/
|
||||
public class BlockNuke extends BaseBlock {
|
||||
public static BooleanProperty OVERLAY = BooleanProperty.create("overlay");
|
||||
public static BooleanProperty OVERLAY = BooleanProperty.of("overlay");
|
||||
|
||||
public BlockNuke() {
|
||||
super(Block.Settings.of(Material.TNT));
|
||||
|
|
|
@ -63,8 +63,8 @@ import java.util.function.Consumer;
|
|||
*/
|
||||
public class BlockRubberLog extends LogBlock {
|
||||
|
||||
public static DirectionProperty SAP_SIDE = Properties.FACING_HORIZONTAL;
|
||||
public static BooleanProperty HAS_SAP = BooleanProperty.create("hassap");
|
||||
public static DirectionProperty SAP_SIDE = Properties.HORIZONTAL_FACING;
|
||||
public static BooleanProperty HAS_SAP = BooleanProperty.of("hassap");
|
||||
|
||||
public BlockRubberLog() {
|
||||
super(MaterialColor.SPRUCE, FabricBlockSettings.of(Material.WOOD, MaterialColor.BROWN).strength(2.0F, 2f).sounds(BlockSoundGroup.WOOD).ticksRandomly().build());
|
||||
|
@ -142,7 +142,7 @@ public class BlockRubberLog extends LogBlock {
|
|||
|
||||
ExternalPowerSystems.requestEnergyFromArmor(capEnergy, playerIn);
|
||||
} else {
|
||||
playerIn.getStackInHand(Hand.MAIN_HAND).applyDamage(1, playerIn, playerEntity -> {});
|
||||
playerIn.getStackInHand(Hand.MAIN_HAND).damage(1, playerIn, playerEntity -> {});
|
||||
}
|
||||
if (!playerIn.inventory.insertStack(TRContent.Parts.SAP.getStack())) {
|
||||
WorldUtils.dropItem(TRContent.Parts.SAP.getStack(), worldIn, pos.offset(hitResult.getSide()));
|
||||
|
|
|
@ -55,12 +55,12 @@ import javax.annotation.Nullable;
|
|||
@RebornRegister(TechReborn.MOD_ID)
|
||||
public class BlockCable extends BlockWithEntity {
|
||||
|
||||
public static final BooleanProperty EAST = BooleanProperty.create("east");
|
||||
public static final BooleanProperty WEST = BooleanProperty.create("west");
|
||||
public static final BooleanProperty NORTH = BooleanProperty.create("north");
|
||||
public static final BooleanProperty SOUTH = BooleanProperty.create("south");
|
||||
public static final BooleanProperty UP = BooleanProperty.create("up");
|
||||
public static final BooleanProperty DOWN = BooleanProperty.create("down");
|
||||
public static final BooleanProperty EAST = BooleanProperty.of("east");
|
||||
public static final BooleanProperty WEST = BooleanProperty.of("west");
|
||||
public static final BooleanProperty NORTH = BooleanProperty.of("north");
|
||||
public static final BooleanProperty SOUTH = BooleanProperty.of("south");
|
||||
public static final BooleanProperty UP = BooleanProperty.of("up");
|
||||
public static final BooleanProperty DOWN = BooleanProperty.of("down");
|
||||
|
||||
@ConfigRegistry(config = "misc", category = "cable", key = "uninsulatedElectrocutionDamage", comment = "When true an uninsulated cable will cause damage to entities")
|
||||
public static boolean uninsulatedElectrocutionDamage = true;
|
||||
|
|
|
@ -67,7 +67,7 @@ public class BlockFusionControlComputer extends BlockMachineBase {
|
|||
if(worldIn.isAir(coil) && !tileFusionControlComputer.isCoil(coil)){
|
||||
worldIn.setBlockState(coil, TRContent.Machine.FUSION_COIL.block.getDefaultState());
|
||||
if(!playerIn.isCreative()){
|
||||
playerIn.getStackInHand(hand).subtractAmount(1);
|
||||
playerIn.getStackInHand(hand).decrement(1);
|
||||
}
|
||||
placed = true;
|
||||
}
|
||||
|
|
|
@ -117,14 +117,14 @@ public class BlockLamp extends BaseTileBlock {
|
|||
// Block
|
||||
@Override
|
||||
protected void appendProperties(StateFactory.Builder<Block, BlockState> builder) {
|
||||
ACTIVE = BooleanProperty.create("active");
|
||||
ACTIVE = BooleanProperty.of("active");
|
||||
builder.add(FACING, ACTIVE);
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public BlockState getPlacementState(ItemPlacementContext context) {
|
||||
for (Direction enumfacing : context.getPlacementFacings()) {
|
||||
for (Direction enumfacing : context.getPlacementDirections()) {
|
||||
BlockState iblockstate = this.getDefaultState().with(FACING, enumfacing.getOpposite());
|
||||
if (iblockstate.canPlaceAt(context.getWorld(), context.getBlockPos())) {
|
||||
return iblockstate;
|
||||
|
|
|
@ -48,7 +48,7 @@ public class BlockDistillationTower extends BlockMachineBase {
|
|||
|
||||
@Override
|
||||
public IMachineGuiHandler getGui() {
|
||||
return EGui.EnvTypeILLATION_TOWER;
|
||||
return EGui.DISTILLATION_TOWER;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue