maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix properties being recreated for several blocks (#2238)

Browse source
This commit is contained in:
Virtuoel 2020-10-02 14:57:12 +03:00 committed by GitHub
parent 7ba962196b
commit a4bceb32a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/techreborn/blocks/lighting/LampBlock.java
View file

@ -54,8 +54,8 @@ import java.util.function.ToIntFunction;
public class LampBlock extends BaseBlockEntityProvider {
public static DirectionProperty FACING = Properties.FACING;
public static BooleanProperty ACTIVE;
public static final DirectionProperty FACING = Properties.FACING;
public static final BooleanProperty ACTIVE = BooleanProperty.of("active");
protected final VoxelShape[] shape;
private final int cost;
@ -116,7 +116,6 @@ public class LampBlock extends BaseBlockEntityProvider {
// Block
@Override
protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
ACTIVE = BooleanProperty.of("active");
builder.add(FACING, ACTIVE);
}

3
src/main/java/techreborn/blocks/machine/tier1/PlayerDetectorBlock.java
View file

@ -56,7 +56,7 @@ import techreborn.utils.MessageIDs;
public class PlayerDetectorBlock extends BlockMachineBase {
public static EnumProperty<PlayerDetectorType> TYPE;
public static final EnumProperty<PlayerDetectorType> TYPE = EnumProperty.of("type", PlayerDetectorType.class);
public PlayerDetectorBlock() {
super(Block.Settings.of(Material.METAL).strength(2f, 2f), true);
@ -143,7 +143,6 @@ public class PlayerDetectorBlock extends BlockMachineBase {
@Override
protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
TYPE = EnumProperty.of("type", PlayerDetectorType.class);
builder.add(TYPE);
}

9
src/main/java/techreborn/blocks/machine/tier1/ResinBasinBlock.java
View file

@ -26,9 +26,9 @@ import java.util.function.Supplier;
public class ResinBasinBlock extends BaseBlockEntityProvider {
public static DirectionProperty FACING = Properties.HORIZONTAL_FACING;
public static BooleanProperty POURING = BooleanProperty.of("pouring");
public static BooleanProperty FULL = BooleanProperty.of("full");
public static final DirectionProperty FACING = Properties.HORIZONTAL_FACING;
public static final BooleanProperty POURING = BooleanProperty.of("pouring");
public static final BooleanProperty FULL = BooleanProperty.of("full");
Supplier<BlockEntity> blockEntityClass;
public ResinBasinBlock(Supplier<BlockEntity> blockEntityClass) {
@ -51,9 +51,6 @@ public class ResinBasinBlock extends BaseBlockEntityProvider {
// Block
@Override
protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
FACING = DirectionProperty.of("facing", Direction.Type.HORIZONTAL);
POURING = BooleanProperty.of("pouring");
FULL = BooleanProperty.of("full");
builder.add(FACING, POURING, FULL);
}

5
src/main/java/techreborn/blocks/misc/BlockAlarm.java
View file

@ -55,8 +55,8 @@ import org.jetbrains.annotations.Nullable;
import java.util.List;
public class BlockAlarm extends BaseBlockEntityProvider {
public static DirectionProperty FACING = Properties.FACING;
public static BooleanProperty ACTIVE;
public static final DirectionProperty FACING = Properties.FACING;
public static final BooleanProperty ACTIVE = BooleanProperty.of("active");
protected final VoxelShape[] shape;
public BlockAlarm() {
@ -107,7 +107,6 @@ public class BlockAlarm extends BaseBlockEntityProvider {
// Block
@Override
protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
ACTIVE = BooleanProperty.of("active");
builder.add(FACING, ACTIVE);
}