From 66b1aa50d57822a5c93db56440bde9573b9b37eb Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 5 Dec 2023 17:31:39 +0100 Subject: [PATCH] [Change] Adopted changes in Bonemeal API --- .../bclib/api/v3/bonemeal/BonemealNyliumLike.java | 3 +-- .../bclib/api/v3/bonemeal/FeatureSpreader.java | 5 ++--- .../org/betterx/bclib/blocks/BaseAnvilBlock.java | 2 +- .../org/betterx/bclib/blocks/BaseBarrelBlock.java | 2 +- .../org/betterx/bclib/blocks/BaseBarsBlock.java | 2 +- .../betterx/bclib/blocks/BaseBlockWithEntity.java | 9 +++++++++ .../betterx/bclib/blocks/BaseBookshelfBlock.java | 2 +- .../org/betterx/bclib/blocks/BaseButtonBlock.java | 13 ++++++------- .../org/betterx/bclib/blocks/BaseChainBlock.java | 2 +- .../org/betterx/bclib/blocks/BaseChestBlock.java | 2 +- .../betterx/bclib/blocks/BaseComposterBlock.java | 2 +- .../bclib/blocks/BaseCraftingTableBlock.java | 2 +- .../org/betterx/bclib/blocks/BaseCropBlock.java | 2 +- .../org/betterx/bclib/blocks/BaseDoorBlock.java | 4 ++-- .../betterx/bclib/blocks/BaseDoublePlantBlock.java | 8 ++------ .../org/betterx/bclib/blocks/BaseFenceBlock.java | 2 +- .../org/betterx/bclib/blocks/BaseFurnaceBlock.java | 2 +- .../org/betterx/bclib/blocks/BaseGateBlock.java | 2 +- .../org/betterx/bclib/blocks/BaseGlassBlock.java | 2 +- .../org/betterx/bclib/blocks/BaseLadderBlock.java | 2 +- .../java/org/betterx/bclib/blocks/BaseOreBlock.java | 2 +- .../org/betterx/bclib/blocks/BasePathBlock.java | 2 +- .../org/betterx/bclib/blocks/BasePlantBlock.java | 2 +- .../bclib/blocks/BasePressurePlateBlock.java | 11 +++++------ .../bclib/blocks/BaseRotatedPillarBlock.java | 4 ++-- .../org/betterx/bclib/blocks/BaseSlabBlock.java | 2 +- .../org/betterx/bclib/blocks/BaseStairsBlock.java | 2 +- .../bclib/blocks/BaseStripableBarkBlock.java | 4 ++-- .../betterx/bclib/blocks/BaseStripableLogBlock.java | 2 +- .../org/betterx/bclib/blocks/BaseTerrainBlock.java | 2 +- .../org/betterx/bclib/blocks/BaseTrapdoorBlock.java | 2 +- .../bclib/blocks/BaseUnderwaterWallPlantBlock.java | 3 ++- .../org/betterx/bclib/blocks/BaseVineBlock.java | 2 +- .../org/betterx/bclib/blocks/BaseWallBlock.java | 2 +- .../bclib/blocks/BaseWeightedPlateBlock.java | 6 +++--- .../org/betterx/bclib/blocks/StalactiteBlock.java | 5 +++-- .../betterx/bclib/blocks/UnderwaterPlantBlock.java | 13 +++++++++++-- .../bclib/blocks/signs/BaseHangingSignBlock.java | 2 +- .../betterx/bclib/blocks/signs/BaseSignBlock.java | 2 +- .../blocks/signs/BaseWallHangingSignBlock.java | 2 +- .../bclib/blocks/signs/BaseWallSignBlock.java | 2 +- 41 files changed, 78 insertions(+), 66 deletions(-) diff --git a/src/main/java/org/betterx/bclib/api/v3/bonemeal/BonemealNyliumLike.java b/src/main/java/org/betterx/bclib/api/v3/bonemeal/BonemealNyliumLike.java index 7359e6ba..61c14fd2 100644 --- a/src/main/java/org/betterx/bclib/api/v3/bonemeal/BonemealNyliumLike.java +++ b/src/main/java/org/betterx/bclib/api/v3/bonemeal/BonemealNyliumLike.java @@ -20,8 +20,7 @@ public interface BonemealNyliumLike extends BonemealableBlock { default boolean isValidBonemealTarget( LevelReader blockGetter, BlockPos blockPos, - BlockState blockState, - boolean bl + BlockState blockState ) { return blockGetter.getBlockState(blockPos.above()).isAir(); } diff --git a/src/main/java/org/betterx/bclib/api/v3/bonemeal/FeatureSpreader.java b/src/main/java/org/betterx/bclib/api/v3/bonemeal/FeatureSpreader.java index cd4a9561..a08246a6 100644 --- a/src/main/java/org/betterx/bclib/api/v3/bonemeal/FeatureSpreader.java +++ b/src/main/java/org/betterx/bclib/api/v3/bonemeal/FeatureSpreader.java @@ -21,11 +21,10 @@ public class FeatureSpreader implements BonemealNyliumLike { public boolean isValidBonemealTarget( LevelReader blockGetter, BlockPos blockPos, - BlockState blockState, - boolean bl + BlockState blockState ) { return spreadableFeature != null - && BonemealNyliumLike.super.isValidBonemealTarget(blockGetter, blockPos, blockState, bl); + && BonemealNyliumLike.super.isValidBonemealTarget(blockGetter, blockPos, blockState); } @Override diff --git a/src/main/java/org/betterx/bclib/blocks/BaseAnvilBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseAnvilBlock.java index 99711c62..8301bf33 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseAnvilBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseAnvilBlock.java @@ -49,7 +49,7 @@ public abstract class BaseAnvilBlock extends AnvilBlock implements AddMineablePi public IntegerProperty durability; public BaseAnvilBlock(MapColor color) { - this(Properties.copy(Blocks.ANVIL).mapColor(color)); + this(Properties.ofFullCopy(Blocks.ANVIL).mapColor(color)); } public BaseAnvilBlock(BlockBehaviour.Properties properties) { diff --git a/src/main/java/org/betterx/bclib/blocks/BaseBarrelBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseBarrelBlock.java index 66c5fe78..56d2f3a3 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseBarrelBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseBarrelBlock.java @@ -48,7 +48,7 @@ import org.jetbrains.annotations.Nullable; public abstract class BaseBarrelBlock extends BarrelBlock implements BlockModelProvider, TagProvider, DropSelfLootProvider { BaseBarrelBlock(Block source) { - this(Properties.copy(source).noOcclusion()); + this(Properties.ofFullCopy(source).noOcclusion()); } BaseBarrelBlock(BlockBehaviour.Properties properties) { diff --git a/src/main/java/org/betterx/bclib/blocks/BaseBarsBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseBarsBlock.java index efffcbc4..c9354533 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseBarsBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseBarsBlock.java @@ -32,7 +32,7 @@ import org.jetbrains.annotations.Nullable; public abstract class BaseBarsBlock extends IronBarsBlock implements BlockModelProvider, RenderLayerProvider, BehaviourMetal { public BaseBarsBlock(Block source) { - this(Properties.copy(source).strength(5.0F, 6.0F).noOcclusion()); + this(Properties.ofFullCopy(source).strength(5.0F, 6.0F).noOcclusion()); } public BaseBarsBlock(BlockBehaviour.Properties properties) { diff --git a/src/main/java/org/betterx/bclib/blocks/BaseBlockWithEntity.java b/src/main/java/org/betterx/bclib/blocks/BaseBlockWithEntity.java index a29cbc3c..5b4f34fa 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseBlockWithEntity.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseBlockWithEntity.java @@ -2,9 +2,11 @@ package org.betterx.bclib.blocks; import org.betterx.bclib.behaviours.interfaces.BehaviourStone; +import com.mojang.serialization.MapCodec; import net.minecraft.core.BlockPos; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.BaseEntityBlock; +import net.minecraft.world.level.block.PiglinWallSkullBlock; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.storage.loot.LootParams; @@ -13,6 +15,7 @@ import java.util.Collections; import java.util.List; public abstract class BaseBlockWithEntity extends BaseEntityBlock { + protected BaseBlockWithEntity(Properties settings) { super(settings); } @@ -29,8 +32,14 @@ public abstract class BaseBlockWithEntity extends BaseEntityBlock { } public static class Stone extends BaseBlockWithEntity implements BehaviourStone { + public static final MapCodec CODEC = simpleCodec(Stone::new); public Stone(Properties settings) { super(settings); } + + @Override + protected MapCodec codec() { + return Stone.CODEC; + } } } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseBookshelfBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseBookshelfBlock.java index 5c051787..f9447bf7 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseBookshelfBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseBookshelfBlock.java @@ -31,7 +31,7 @@ import org.jetbrains.annotations.Nullable; public abstract class BaseBookshelfBlock extends BaseBlock implements TagProvider { protected BaseBookshelfBlock(Block source) { - this(Properties.copy(source)); + this(Properties.ofFullCopy(source)); } protected BaseBookshelfBlock(BlockBehaviour.Properties properties) { diff --git a/src/main/java/org/betterx/bclib/blocks/BaseButtonBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseButtonBlock.java index c3eefae8..b8655f44 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseButtonBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseButtonBlock.java @@ -37,19 +37,18 @@ import org.jetbrains.annotations.Nullable; public abstract class BaseButtonBlock extends ButtonBlock implements BlockModelProvider, TagProvider, DropSelfLootProvider { private final Block parent; - protected BaseButtonBlock(Block parent, Properties properties, boolean sensitive, BlockSetType type) { - this(parent, properties, 30, sensitive, type); + protected BaseButtonBlock(Block parent, Properties properties, BlockSetType type) { + this(parent, properties, 30, type); } protected BaseButtonBlock( Block parent, Properties properties, int ticksToStayPressed, - boolean sensitive, BlockSetType type ) { super( - properties.noCollission(), type, ticksToStayPressed, sensitive + type, ticksToStayPressed, properties.noCollission() ); this.parent = parent; } @@ -130,13 +129,13 @@ public abstract class BaseButtonBlock extends ButtonBlock implements BlockModelP public static class Metal extends BaseButtonBlock implements BehaviourMetal { public Metal(Block source, BlockSetType type) { - super(source, Properties.copy(source).noOcclusion(), false, type); + super(source, Properties.ofFullCopy(source).noOcclusion(), type); } } public static class Stone extends BaseButtonBlock implements BehaviourStone { public Stone(Block source, BlockSetType type) { - super(source, Properties.copy(source).noOcclusion(), false, type); + super(source, Properties.ofFullCopy(source).noOcclusion(), type); } @@ -150,7 +149,7 @@ public abstract class BaseButtonBlock extends ButtonBlock implements BlockModelP public static class Wood extends BaseButtonBlock implements BehaviourWood { public Wood(Block source, BlockSetType type) { - super(source, Properties.copy(source).strength(0.5F, 0.5F).noOcclusion(), true, type); + super(source, Properties.ofFullCopy(source).strength(0.5F, 0.5F).noOcclusion(), type); } @Override diff --git a/src/main/java/org/betterx/bclib/blocks/BaseChainBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseChainBlock.java index 95eaf993..30ce6280 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseChainBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseChainBlock.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable; public abstract class BaseChainBlock extends ChainBlock implements BlockModelProvider, RenderLayerProvider, DropSelfLootProvider { public BaseChainBlock(MapColor color) { - this(Properties.copy(Blocks.CHAIN).mapColor(color)); + this(Properties.ofFullCopy(Blocks.CHAIN).mapColor(color)); } public BaseChainBlock(BlockBehaviour.Properties properties) { diff --git a/src/main/java/org/betterx/bclib/blocks/BaseChestBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseChestBlock.java index b6c0655b..60c0950b 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseChestBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseChestBlock.java @@ -33,7 +33,7 @@ public abstract class BaseChestBlock extends ChestBlock implements BlockModelPro private final Block parent; protected BaseChestBlock(Block source) { - super(Properties.copy(source).noOcclusion(), () -> BaseBlockEntities.CHEST); + super(Properties.ofFullCopy(source).noOcclusion(), () -> BaseBlockEntities.CHEST); this.parent = source; } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseComposterBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseComposterBlock.java index e42c6fe5..e36d3fb0 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseComposterBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseComposterBlock.java @@ -29,7 +29,7 @@ import org.jetbrains.annotations.Nullable; public abstract class BaseComposterBlock extends ComposterBlock implements BlockModelProvider, TagProvider, DropSelfLootProvider { protected BaseComposterBlock(Block source) { - super(Properties.copy(source)); + super(Properties.ofFullCopy(source)); } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseCraftingTableBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseCraftingTableBlock.java index d83669d1..88d4837b 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseCraftingTableBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseCraftingTableBlock.java @@ -29,7 +29,7 @@ import org.jetbrains.annotations.Nullable; public abstract class BaseCraftingTableBlock extends CraftingTableBlock implements BlockModelProvider, TagProvider, DropSelfLootProvider { protected BaseCraftingTableBlock(Block source) { - this(Properties.copy(source)); + this(Properties.ofFullCopy(source)); } protected BaseCraftingTableBlock(BlockBehaviour.Properties properties) { diff --git a/src/main/java/org/betterx/bclib/blocks/BaseCropBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseCropBlock.java index de722f1c..37c5f5c4 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseCropBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseCropBlock.java @@ -88,7 +88,7 @@ public class BaseCropBlock extends BasePlantBlock implements SurvivesOnBlocks { } @Override - public boolean isValidBonemealTarget(LevelReader world, BlockPos pos, BlockState state, boolean isClient) { + public boolean isValidBonemealTarget(LevelReader world, BlockPos pos, BlockState state) { return state.getValue(AGE) < 3; } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseDoorBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseDoorBlock.java index bbbe90ae..5c89f1c1 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseDoorBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseDoorBlock.java @@ -43,11 +43,11 @@ import org.jetbrains.annotations.Nullable; public abstract class BaseDoorBlock extends DoorBlock implements RenderLayerProvider, BlockModelProvider, TagProvider { protected BaseDoorBlock(Block source, BlockSetType type) { - this(Properties.copy(source).strength(3F, 3F).noOcclusion(), type); + this(Properties.ofFullCopy(source).strength(3F, 3F).noOcclusion(), type); } protected BaseDoorBlock(BlockBehaviour.Properties properties, BlockSetType type) { - super(properties, type); + super(type, properties); } @Override diff --git a/src/main/java/org/betterx/bclib/blocks/BaseDoublePlantBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseDoublePlantBlock.java index 7434578b..5b07fcb8 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseDoublePlantBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseDoublePlantBlock.java @@ -130,13 +130,9 @@ public abstract class BaseDoublePlantBlock extends BaseBlockNotFull implements R return BCLRenderLayer.CUTOUT; } + @Override - public boolean isValidBonemealTarget( - LevelReader levelReader, - BlockPos blockPos, - BlockState blockState, - boolean isClient - ) { + public boolean isValidBonemealTarget(LevelReader levelReader, BlockPos blockPos, BlockState blockState) { return true; } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseFenceBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseFenceBlock.java index 3fbdb3ce..3a5be1e5 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseFenceBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseFenceBlock.java @@ -34,7 +34,7 @@ public abstract class BaseFenceBlock extends FenceBlock implements BlockModelPro private final Block parent; protected BaseFenceBlock(Block source) { - super(Properties.copy(source).noOcclusion()); + super(Properties.ofFullCopy(source).noOcclusion()); this.parent = source; } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseFurnaceBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseFurnaceBlock.java index e8b2da4d..c56bb43d 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseFurnaceBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseFurnaceBlock.java @@ -43,7 +43,7 @@ import org.jetbrains.annotations.Nullable; public abstract class BaseFurnaceBlock extends FurnaceBlock implements BlockModelProvider, RenderLayerProvider { public BaseFurnaceBlock(Block source) { - this(Properties.copy(source).lightLevel(state -> state.getValue(LIT) ? 13 : 0)); + this(Properties.ofFullCopy(source).lightLevel(state -> state.getValue(LIT) ? 13 : 0)); } public BaseFurnaceBlock(BlockBehaviour.Properties properties) { diff --git a/src/main/java/org/betterx/bclib/blocks/BaseGateBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseGateBlock.java index 993ad72f..44040888 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseGateBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseGateBlock.java @@ -32,7 +32,7 @@ public abstract class BaseGateBlock extends FenceGateBlock implements BlockModel private final Block parent; protected BaseGateBlock(Block source, WoodType type) { - super(Properties.copy(source).noOcclusion(), type); + super(type, Properties.ofFullCopy(source).noOcclusion()); this.parent = source; } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseGlassBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseGlassBlock.java index 531d53dc..fbe6a96c 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseGlassBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseGlassBlock.java @@ -27,7 +27,7 @@ public class BaseGlassBlock extends BaseBlockNotFull implements AddMineablePicka } public BaseGlassBlock(Block block, float resistance) { - super(Properties.copy(block) + super(Properties.ofFullCopy(block) .explosionResistance(resistance) .noOcclusion() .isSuffocating((arg1, arg2, arg3) -> false) diff --git a/src/main/java/org/betterx/bclib/blocks/BaseLadderBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseLadderBlock.java index 88f87f43..7873c893 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseLadderBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseLadderBlock.java @@ -29,7 +29,7 @@ import org.jetbrains.annotations.Nullable; public abstract class BaseLadderBlock extends LadderBlock implements RenderLayerProvider, BlockModelProvider, BehaviourClimable, DropSelfLootProvider { protected BaseLadderBlock(Block block) { - this(Properties.copy(block).noOcclusion()); + this(Properties.ofFullCopy(block).noOcclusion()); } public BaseLadderBlock(BlockBehaviour.Properties properties) { diff --git a/src/main/java/org/betterx/bclib/blocks/BaseOreBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseOreBlock.java index 723b09db..d5bdde4c 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseOreBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseOreBlock.java @@ -67,7 +67,7 @@ public class BaseOreBlock extends DropExperienceBlock implements BlockModelProvi int experience, int miningLevel ) { - super(properties, UniformInt.of(experience > 0 ? 1 : 0, experience)); + super(UniformInt.of(experience > 0 ? 1 : 0, experience), properties); this.dropItem = drop; this.minCount = minCount; this.maxCount = maxCount; diff --git a/src/main/java/org/betterx/bclib/blocks/BasePathBlock.java b/src/main/java/org/betterx/bclib/blocks/BasePathBlock.java index af5ebee2..d75a1d41 100644 --- a/src/main/java/org/betterx/bclib/blocks/BasePathBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BasePathBlock.java @@ -39,7 +39,7 @@ public abstract class BasePathBlock extends BaseBlockNotFull { private Block baseBlock; public BasePathBlock(Block source) { - super(Properties.copy(source).isValidSpawn((state, world, pos, type) -> false)); + super(Properties.ofFullCopy(source).isValidSpawn((state, world, pos, type) -> false)); this.baseBlock = Blocks.DIRT; if (source instanceof BaseTerrainBlock) { BaseTerrainBlock terrain = (BaseTerrainBlock) source; diff --git a/src/main/java/org/betterx/bclib/blocks/BasePlantBlock.java b/src/main/java/org/betterx/bclib/blocks/BasePlantBlock.java index cdc00b9a..a03cac1f 100644 --- a/src/main/java/org/betterx/bclib/blocks/BasePlantBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BasePlantBlock.java @@ -99,7 +99,7 @@ public abstract class BasePlantBlock extends BaseBlockNotFull implements RenderL } @Override - public boolean isValidBonemealTarget(LevelReader world, BlockPos pos, BlockState state, boolean isClient) { + public boolean isValidBonemealTarget(LevelReader world, BlockPos pos, BlockState state) { return true; } diff --git a/src/main/java/org/betterx/bclib/blocks/BasePressurePlateBlock.java b/src/main/java/org/betterx/bclib/blocks/BasePressurePlateBlock.java index b57949d4..0a8c5a3f 100644 --- a/src/main/java/org/betterx/bclib/blocks/BasePressurePlateBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BasePressurePlateBlock.java @@ -35,10 +35,9 @@ import org.jetbrains.annotations.Nullable; public abstract class BasePressurePlateBlock extends PressurePlateBlock implements BlockModelProvider, TagProvider, DropSelfLootProvider { private final Block parent; - protected BasePressurePlateBlock(Sensitivity rule, Block source, BlockSetType type) { + protected BasePressurePlateBlock(Block source, BlockSetType type) { super( - rule, Properties.copy(source).noCollission().noOcclusion().strength(0.5F), - type + type, Properties.ofFullCopy(source).noCollission().noOcclusion().strength(0.5F) ); this.parent = source; } @@ -83,7 +82,7 @@ public abstract class BasePressurePlateBlock extends PressurePlateBlock implemen public static class Wood extends BasePressurePlateBlock implements BehaviourWood { public Wood(Block source, BlockSetType type) { - super(Sensitivity.EVERYTHING, source, type); + super(/*Sensitivity.EVERYTHING,*/ source, type); } @Override @@ -96,13 +95,13 @@ public abstract class BasePressurePlateBlock extends PressurePlateBlock implemen public static class Stone extends BasePressurePlateBlock implements BehaviourStone { public Stone(Block source, BlockSetType type) { - super(Sensitivity.MOBS, source, type); + super(/*Sensitivity.MOBS,*/ source, type); } } public static class Metal extends BasePressurePlateBlock implements BehaviourMetal { public Metal(Block source, BlockSetType type) { - super(Sensitivity.MOBS, source, type); + super(/*Sensitivity.MOBS,*/ source, type); } } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseRotatedPillarBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseRotatedPillarBlock.java index 949c70db..8626955a 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseRotatedPillarBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseRotatedPillarBlock.java @@ -29,7 +29,7 @@ public abstract class BaseRotatedPillarBlock extends RotatedPillarBlock implemen } protected BaseRotatedPillarBlock(Block block) { - this(Properties.copy(block)); + this(Properties.ofFullCopy(block)); } @@ -71,7 +71,7 @@ public abstract class BaseRotatedPillarBlock extends RotatedPillarBlock implemen } public Wood(Block block, boolean flammable) { - this(Properties.copy(block), flammable); + this(Properties.ofFullCopy(block), flammable); } } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseSlabBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseSlabBlock.java index 1a56b308..531af45f 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseSlabBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseSlabBlock.java @@ -41,7 +41,7 @@ public abstract class BaseSlabBlock extends SlabBlock implements BlockModelProvi public final boolean fireproof; protected BaseSlabBlock(Block source, boolean fireproof) { - super(Properties.copy(source)); + super(Properties.ofFullCopy(source)); this.parent = source; this.fireproof = fireproof; } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseStairsBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseStairsBlock.java index d3d5f257..760694fb 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseStairsBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseStairsBlock.java @@ -44,7 +44,7 @@ public abstract class BaseStairsBlock extends StairBlock implements BlockModelPr public final boolean fireproof; protected BaseStairsBlock(Block source, boolean fireproof) { - super(source.defaultBlockState(), Properties.copy(source)); + super(source.defaultBlockState(), Properties.ofFullCopy(source)); this.parent = source; this.fireproof = fireproof; } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseStripableBarkBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseStripableBarkBlock.java index f3c83323..581919ff 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseStripableBarkBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseStripableBarkBlock.java @@ -69,8 +69,8 @@ public abstract class BaseStripableBarkBlock extends BaseBarkBlock { super( stripedBlock, (flammable - ? Properties.copy(stripedBlock).ignitedByLava() - : Properties.copy(stripedBlock)).mapColor(color) + ? Properties.ofFullCopy(stripedBlock).ignitedByLava() + : Properties.ofFullCopy(stripedBlock)).mapColor(color) ); this.flammable = flammable; } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java index 057f4d7f..444c3594 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java @@ -68,7 +68,7 @@ public abstract class BaseStripableLogBlock extends BaseRotatedPillarBlock { public Wood(MapColor color, Block striped, boolean flammable) { super( striped, - (flammable ? Properties.copy(striped).ignitedByLava() : Properties.copy(striped)).mapColor(color) + (flammable ? Properties.ofFullCopy(striped).ignitedByLava() : Properties.ofFullCopy(striped)).mapColor(color) ); this.flammable = flammable; } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java index 48126e01..916e6841 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java @@ -54,7 +54,7 @@ public class BaseTerrainBlock extends BaseBlock { public BaseTerrainBlock(Block baseBlock, MapColor color) { super(Properties - .copy(baseBlock) + .ofFullCopy(baseBlock) .mapColor(color) .sound(BlockSounds.TERRAIN_SOUND) .randomTicks() diff --git a/src/main/java/org/betterx/bclib/blocks/BaseTrapdoorBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseTrapdoorBlock.java index 6376c39e..02e789e4 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseTrapdoorBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseTrapdoorBlock.java @@ -41,7 +41,7 @@ import org.jetbrains.annotations.Nullable; public abstract class BaseTrapdoorBlock extends TrapDoorBlock implements RenderLayerProvider, BlockModelProvider, TagProvider, DropSelfLootProvider { protected BaseTrapdoorBlock(BlockBehaviour.Properties properties, BlockSetType type) { - super(properties, type); + super(type, properties); } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseUnderwaterWallPlantBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseUnderwaterWallPlantBlock.java index 5155c804..2503ad3b 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseUnderwaterWallPlantBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseUnderwaterWallPlantBlock.java @@ -3,6 +3,7 @@ package org.betterx.bclib.blocks; import org.betterx.bclib.behaviours.interfaces.BehaviourWaterPlant; import net.minecraft.core.BlockPos; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.LevelReader; @@ -18,7 +19,7 @@ public abstract class BaseUnderwaterWallPlantBlock extends BaseWallPlantBlock im } @Override - public boolean canPlaceLiquid(BlockGetter world, BlockPos pos, BlockState state, Fluid fluid) { + public boolean canPlaceLiquid(Player p, BlockGetter world, BlockPos pos, BlockState state, Fluid fluid) { return false; } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseVineBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseVineBlock.java index df9b5c7c..7eae46e1 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseVineBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseVineBlock.java @@ -137,7 +137,7 @@ public class BaseVineBlock extends BaseBlockNotFull implements RenderLayerProvid } @Override - public boolean isValidBonemealTarget(LevelReader world, BlockPos pos, BlockState state, boolean isClient) { + public boolean isValidBonemealTarget(LevelReader world, BlockPos pos, BlockState state) { while (world.getBlockState(pos).getBlock() == this) { pos = pos.below(); } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseWallBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseWallBlock.java index 6f0d90ae..69df534c 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseWallBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseWallBlock.java @@ -34,7 +34,7 @@ public abstract class BaseWallBlock extends WallBlock implements BlockModelProvi private final Block parent; protected BaseWallBlock(Block source) { - super(Properties.copy(source).noOcclusion()); + super(Properties.ofFullCopy(source).noOcclusion()); this.parent = source; } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseWeightedPlateBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseWeightedPlateBlock.java index 73cbdd52..a0ee5914 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseWeightedPlateBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseWeightedPlateBlock.java @@ -28,12 +28,12 @@ public class BaseWeightedPlateBlock extends WeightedPressurePlateBlock implement public BaseWeightedPlateBlock(Block source, BlockSetType type) { super( 15, - Properties.copy(source) + type, + Properties.ofFullCopy(source) .noCollission() .noOcclusion() .requiresCorrectToolForDrops() - .strength(0.5F), - type + .strength(0.5F) ); this.parent = source; } diff --git a/src/main/java/org/betterx/bclib/blocks/StalactiteBlock.java b/src/main/java/org/betterx/bclib/blocks/StalactiteBlock.java index bda014de..41e2787e 100644 --- a/src/main/java/org/betterx/bclib/blocks/StalactiteBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/StalactiteBlock.java @@ -16,6 +16,7 @@ import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; @@ -53,7 +54,7 @@ public abstract class StalactiteBlock extends BaseBlockNotFull implements Simple private static final VoxelShape[] SHAPES; public StalactiteBlock(Block source) { - this(Properties.copy(source).noOcclusion()); + this(Properties.ofFullCopy(source).noOcclusion()); } public StalactiteBlock(BlockBehaviour.Properties properties) { @@ -239,7 +240,7 @@ public abstract class StalactiteBlock extends BaseBlockNotFull implements Simple } @Override - public boolean canPlaceLiquid(BlockGetter world, BlockPos pos, BlockState state, Fluid fluid) { + public boolean canPlaceLiquid(Player player, BlockGetter world, BlockPos pos, BlockState state, Fluid fluid) { return false; } diff --git a/src/main/java/org/betterx/bclib/blocks/UnderwaterPlantBlock.java b/src/main/java/org/betterx/bclib/blocks/UnderwaterPlantBlock.java index e66f19ef..443bb8cc 100644 --- a/src/main/java/org/betterx/bclib/blocks/UnderwaterPlantBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/UnderwaterPlantBlock.java @@ -9,6 +9,7 @@ import net.minecraft.core.Direction; import net.minecraft.server.level.ServerLevel; import net.minecraft.util.RandomSource; import net.minecraft.world.entity.item.ItemEntity; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.item.enchantment.Enchantments; @@ -32,6 +33,7 @@ import net.minecraft.world.phys.shapes.VoxelShape; import com.google.common.collect.Lists; import java.util.List; +import org.jetbrains.annotations.Nullable; public abstract class UnderwaterPlantBlock extends BaseBlockNotFull implements RenderLayerProvider, BonemealableBlock, LiquidBlockContainer { private static final VoxelShape SHAPE = box(4, 0, 4, 12, 14, 12); @@ -94,7 +96,7 @@ public abstract class UnderwaterPlantBlock extends BaseBlockNotFull implements R } @Override - public boolean isValidBonemealTarget(LevelReader world, BlockPos pos, BlockState state, boolean isClient) { + public boolean isValidBonemealTarget(LevelReader world, BlockPos pos, BlockState state) { return true; } @@ -115,8 +117,15 @@ public abstract class UnderwaterPlantBlock extends BaseBlockNotFull implements R level.addFreshEntity(item); } + @Override - public boolean canPlaceLiquid(BlockGetter world, BlockPos pos, BlockState state, Fluid fluid) { + public boolean canPlaceLiquid( + @Nullable Player player, + BlockGetter world, + BlockPos pos, + BlockState state, + Fluid fluid + ) { return false; } diff --git a/src/main/java/org/betterx/bclib/blocks/signs/BaseHangingSignBlock.java b/src/main/java/org/betterx/bclib/blocks/signs/BaseHangingSignBlock.java index 8d1fbbf9..296739d3 100644 --- a/src/main/java/org/betterx/bclib/blocks/signs/BaseHangingSignBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/signs/BaseHangingSignBlock.java @@ -38,7 +38,7 @@ public abstract class BaseHangingSignBlock extends CeilingHangingSignBlock imple } protected BaseHangingSignBlock(WoodType type, MapColor color, boolean flammable, WallSignProvider provider) { - super(BehaviourBuilders.createSign(color, flammable), type); + super(type, BehaviourBuilders.createSign(color, flammable)); this.wallSign = () -> provider.create(BehaviourBuilders.createWallSign(color, this, flammable), type); } diff --git a/src/main/java/org/betterx/bclib/blocks/signs/BaseSignBlock.java b/src/main/java/org/betterx/bclib/blocks/signs/BaseSignBlock.java index 96ecab7a..2bce9dee 100644 --- a/src/main/java/org/betterx/bclib/blocks/signs/BaseSignBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/signs/BaseSignBlock.java @@ -39,7 +39,7 @@ public abstract class BaseSignBlock extends StandingSignBlock implements BlockMo } protected BaseSignBlock(WoodType type, MapColor color, boolean flammable, WallSignProvider provider) { - super(BehaviourBuilders.createSign(color, flammable), type); + super(type, BehaviourBuilders.createSign(color, flammable)); this.wallSign = () -> provider.create(BehaviourBuilders.createWallSign(color, this, flammable), type); } diff --git a/src/main/java/org/betterx/bclib/blocks/signs/BaseWallHangingSignBlock.java b/src/main/java/org/betterx/bclib/blocks/signs/BaseWallHangingSignBlock.java index 9fb84e9d..b840e0a8 100644 --- a/src/main/java/org/betterx/bclib/blocks/signs/BaseWallHangingSignBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/signs/BaseWallHangingSignBlock.java @@ -19,7 +19,7 @@ public abstract class BaseWallHangingSignBlock extends WallHangingSignBlock impl Properties properties, WoodType woodType ) { - super(properties, woodType); + super(woodType, properties); } @Override diff --git a/src/main/java/org/betterx/bclib/blocks/signs/BaseWallSignBlock.java b/src/main/java/org/betterx/bclib/blocks/signs/BaseWallSignBlock.java index 14fed92d..1a049726 100644 --- a/src/main/java/org/betterx/bclib/blocks/signs/BaseWallSignBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/signs/BaseWallSignBlock.java @@ -14,7 +14,7 @@ import java.util.List; public abstract class BaseWallSignBlock extends WallSignBlock implements TagProvider { protected BaseWallSignBlock(Properties properties, WoodType woodType) { - super(properties, woodType); + super(woodType, properties); } @Override