diff --git a/src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java index eabab5d4..0386550b 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java @@ -37,6 +37,15 @@ import java.util.function.Consumer; public class BaseLeavesBlock extends LeavesBlock implements BlockModelProvider, RenderLayerProvider, TagProvider, AddMineableShears, AddMineableHoe { protected final Block sapling; + public BaseLeavesBlock( + Block sapling, + BlockBehaviour.Properties properties + ) { + super(properties); + this.sapling = sapling; + } + + @Deprecated(forRemoval = true) public BaseLeavesBlock( Block sapling, MapColor color, @@ -46,6 +55,7 @@ public class BaseLeavesBlock extends LeavesBlock implements BlockModelProvider, this.sapling = sapling; } + @Deprecated(forRemoval = true) public BaseLeavesBlock( Block sapling, MapColor color, @@ -59,11 +69,13 @@ public class BaseLeavesBlock extends LeavesBlock implements BlockModelProvider, this.sapling = sapling; } + @Deprecated(forRemoval = true) public BaseLeavesBlock(Block sapling, MapColor color) { super(BehaviourBuilders.createLeaves(color, true)); this.sapling = sapling; } + @Deprecated(forRemoval = true) public BaseLeavesBlock(Block sapling, MapColor color, int light) { super(BehaviourBuilders.createLeaves(color, true).lightLevel(state -> light)); this.sapling = sapling; diff --git a/src/main/java/org/betterx/bclib/complexmaterials/BehaviourBuilders.java b/src/main/java/org/betterx/bclib/complexmaterials/BehaviourBuilders.java index eeaabbc7..0a9cb431 100644 --- a/src/main/java/org/betterx/bclib/complexmaterials/BehaviourBuilders.java +++ b/src/main/java/org/betterx/bclib/complexmaterials/BehaviourBuilders.java @@ -79,6 +79,33 @@ public class BehaviourBuilders { return p; } + public static BlockBehaviour.Properties createCactus(MapColor color, boolean flammable) { + final BlockBehaviour.Properties p = BlockBehaviour.Properties + .of() + .mapColor(color) + .randomTicks() + .strength(0.4F) + .sound(SoundType.WOOL) + .pushReaction(PushReaction.DESTROY) + .noOcclusion(); + if (flammable) { + p.ignitedByLava(); + } + return p; + } + + public static BlockBehaviour.Properties createMetal() { + return createMetal(MapColor.METAL); + } + + public static BlockBehaviour.Properties createMetal(MapColor color) { + return BlockBehaviour.Properties.of() + .mapColor(color) + .instrument(NoteBlockInstrument.IRON_XYLOPHONE) + .strength(5.0F, 6.0F) + .sound(SoundType.METAL); + } + public static BlockBehaviour.Properties createStone() { return createStone(MapColor.STONE); }