From 2f878800ca253b3254bc64ad19660ea831454ccf Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 17 May 2023 14:49:32 +0200 Subject: [PATCH] Changes to `color`-Methods --- .../java/org/betterx/bclib/blocks/BaseAnvilBlock.java | 2 +- .../java/org/betterx/bclib/blocks/BaseChainBlock.java | 2 +- .../java/org/betterx/bclib/blocks/BaseLeavesBlock.java | 10 +++------- .../betterx/bclib/blocks/BaseStripableLogBlock.java | 2 +- .../org/betterx/bclib/blocks/BaseTerrainBlock.java | 2 +- .../org/betterx/bclib/blocks/StripableBarkBlock.java | 2 +- .../org/betterx/bclib/blocks/TripleTerrainBlock.java | 2 +- 7 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/betterx/bclib/blocks/BaseAnvilBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseAnvilBlock.java index 5b56756e..91632a6b 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseAnvilBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseAnvilBlock.java @@ -43,7 +43,7 @@ public abstract class BaseAnvilBlock extends AnvilBlock implements BlockModelPro public IntegerProperty durability; public BaseAnvilBlock(MapColor color) { - this(Properties.copy(Blocks.ANVIL).color(color)); + this(Properties.copy(Blocks.ANVIL).mapColor(color)); } public BaseAnvilBlock(BlockBehaviour.Properties properties) { diff --git a/src/main/java/org/betterx/bclib/blocks/BaseChainBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseChainBlock.java index 490c1604..45fdc7aa 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseChainBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseChainBlock.java @@ -30,7 +30,7 @@ import org.jetbrains.annotations.Nullable; public class BaseChainBlock extends ChainBlock implements BlockModelProvider, RenderLayerProvider { public BaseChainBlock(MapColor color) { - this(Properties.copy(Blocks.CHAIN).color(color)); + this(Properties.copy(Blocks.CHAIN).mapColor(color)); } public BaseChainBlock(BlockBehaviour.Properties properties) { diff --git a/src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java index 402a985d..e488ace6 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java @@ -1,6 +1,7 @@ package org.betterx.bclib.blocks; import org.betterx.bclib.client.render.BCLRenderLayer; +import org.betterx.bclib.complexmaterials.BehaviourBuilders; import org.betterx.bclib.interfaces.BlockModelProvider; import org.betterx.bclib.interfaces.RenderLayerProvider; import org.betterx.bclib.interfaces.TagProvider; @@ -38,13 +39,8 @@ public class BaseLeavesBlock extends LeavesBlock implements BlockModelProvider, protected final Block sapling; private static BlockBehaviour.Properties makeLeaves(MapColor color) { - return BlockBehaviour.Properties - .copy(Blocks.OAK_LEAVES) - .color(color) - //.requiresTool() - .isValidSpawn((state, world, pos, type) -> false) - .isSuffocating((state, world, pos) -> false) - .isViewBlocking((state, world, pos) -> false); + return BehaviourBuilders.createLeaves(color) + .copy(Blocks.OAK_LEAVES); } public BaseLeavesBlock( diff --git a/src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java index e9753188..cf839bb7 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java @@ -22,7 +22,7 @@ public class BaseStripableLogBlock extends BaseRotatedPillarBlock { private final Block striped; public BaseStripableLogBlock(MapColor color, Block striped) { - super(Properties.copy(striped).color(color)); + super(Properties.copy(striped).mapColor(color)); this.striped = striped; } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java index 81a0ae55..48126e01 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java @@ -55,7 +55,7 @@ public class BaseTerrainBlock extends BaseBlock { public BaseTerrainBlock(Block baseBlock, MapColor color) { super(Properties .copy(baseBlock) - .color(color) + .mapColor(color) .sound(BlockSounds.TERRAIN_SOUND) .randomTicks() ); diff --git a/src/main/java/org/betterx/bclib/blocks/StripableBarkBlock.java b/src/main/java/org/betterx/bclib/blocks/StripableBarkBlock.java index ccb38229..c0896dbb 100644 --- a/src/main/java/org/betterx/bclib/blocks/StripableBarkBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/StripableBarkBlock.java @@ -21,7 +21,7 @@ public class StripableBarkBlock extends BaseBarkBlock { private final Block striped; public StripableBarkBlock(MapColor color, Block striped) { - super(Properties.copy(striped).color(color)); + super(Properties.copy(striped).mapColor(color)); this.striped = striped; } diff --git a/src/main/java/org/betterx/bclib/blocks/TripleTerrainBlock.java b/src/main/java/org/betterx/bclib/blocks/TripleTerrainBlock.java index 70b4404a..a0502851 100644 --- a/src/main/java/org/betterx/bclib/blocks/TripleTerrainBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/TripleTerrainBlock.java @@ -44,7 +44,7 @@ public class TripleTerrainBlock extends BaseTerrainBlock { public static final EnumProperty SHAPE = BlockProperties.TRIPLE_SHAPE; public TripleTerrainBlock(Block baseBlock) { - super(baseBlock, baseBlock.defaultMaterialColor()); + super(baseBlock, baseBlock.defaultMapColor()); this.registerDefaultState(defaultBlockState().setValue(SHAPE, TripleShape.BOTTOM)); }