diff --git a/src/main/java/org/betterx/betterend/blocks/CrystalMossCoverBlock.java b/src/main/java/org/betterx/betterend/blocks/CrystalMossCoverBlock.java index 9b971da8..2321a78a 100644 --- a/src/main/java/org/betterx/betterend/blocks/CrystalMossCoverBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/CrystalMossCoverBlock.java @@ -1,9 +1,9 @@ package org.betterx.betterend.blocks; import org.betterx.bclib.behaviours.BehaviourBuilders; +import org.betterx.bclib.behaviours.interfaces.BehaviourShearablePlant; import org.betterx.bclib.client.render.BCLRenderLayer; import org.betterx.bclib.interfaces.RenderLayerProvider; -import org.betterx.bclib.interfaces.tools.AddMineableShears; import org.betterx.betterend.registry.EndBlocks; import net.minecraft.core.BlockPos; @@ -24,7 +24,7 @@ import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Fluids; import net.minecraft.world.level.material.MapColor; -public class CrystalMossCoverBlock extends MultifaceBlock implements BonemealableBlock, SimpleWaterloggedBlock, RenderLayerProvider, AddMineableShears { +public class CrystalMossCoverBlock extends MultifaceBlock implements BonemealableBlock, SimpleWaterloggedBlock, RenderLayerProvider, BehaviourShearablePlant { private static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; private final MultifaceSpreader spreader = new MultifaceSpreader(this); diff --git a/src/main/java/org/betterx/betterend/blocks/TwistedUmbrellaMossTallBlock.java b/src/main/java/org/betterx/betterend/blocks/TwistedUmbrellaMossTallBlock.java index 36788839..c6fa9fcc 100644 --- a/src/main/java/org/betterx/betterend/blocks/TwistedUmbrellaMossTallBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/TwistedUmbrellaMossTallBlock.java @@ -1,5 +1,6 @@ package org.betterx.betterend.blocks; +import org.betterx.bclib.behaviours.interfaces.BehaviourPlant; import org.betterx.bclib.blocks.BaseDoublePlantBlock; import org.betterx.betterend.registry.EndBlocks; @@ -10,7 +11,7 @@ import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.state.BlockState; -public class TwistedUmbrellaMossTallBlock extends BaseDoublePlantBlock { +public class TwistedUmbrellaMossTallBlock extends BaseDoublePlantBlock implements BehaviourPlant { public TwistedUmbrellaMossTallBlock() { super(12); } diff --git a/src/main/java/org/betterx/betterend/blocks/UmbrellaMossTallBlock.java b/src/main/java/org/betterx/betterend/blocks/UmbrellaMossTallBlock.java index 4a9c8b36..55cc3a9f 100644 --- a/src/main/java/org/betterx/betterend/blocks/UmbrellaMossTallBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/UmbrellaMossTallBlock.java @@ -1,5 +1,6 @@ package org.betterx.betterend.blocks; +import org.betterx.bclib.behaviours.interfaces.BehaviourPlant; import org.betterx.bclib.blocks.BaseDoublePlantBlock; import org.betterx.betterend.registry.EndBlocks; @@ -10,7 +11,7 @@ import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.state.BlockState; -public class UmbrellaMossTallBlock extends BaseDoublePlantBlock { +public class UmbrellaMossTallBlock extends BaseDoublePlantBlock implements BehaviourPlant { public UmbrellaMossTallBlock() { super(12); } diff --git a/src/main/java/org/betterx/betterend/blocks/basis/EndPlantBlock.java b/src/main/java/org/betterx/betterend/blocks/basis/EndPlantBlock.java index 267cd115..75d4fc3e 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/EndPlantBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/EndPlantBlock.java @@ -1,5 +1,6 @@ package org.betterx.betterend.blocks.basis; +import org.betterx.bclib.behaviours.interfaces.BehaviourPlant; import org.betterx.bclib.blocks.BasePlantBlock; import org.betterx.betterend.interfaces.PottablePlant; import org.betterx.worlds.together.tag.v3.CommonBlockTags; @@ -7,7 +8,7 @@ import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -public class EndPlantBlock extends BasePlantBlock implements PottablePlant { +public class EndPlantBlock extends BasePlantBlock implements PottablePlant, BehaviourPlant { protected EndPlantBlock() { super(); } diff --git a/src/main/java/org/betterx/betterend/blocks/basis/EndWallPlantBlock.java b/src/main/java/org/betterx/betterend/blocks/basis/EndWallPlantBlock.java index c065e79d..395cf30b 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/EndWallPlantBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/EndWallPlantBlock.java @@ -1,11 +1,12 @@ package org.betterx.betterend.blocks.basis; +import org.betterx.bclib.behaviours.interfaces.BehaviourPlant; import org.betterx.bclib.blocks.BaseWallPlantBlock; import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.world.level.block.state.BlockState; -public class EndWallPlantBlock extends BaseWallPlantBlock { +public class EndWallPlantBlock extends BaseWallPlantBlock implements BehaviourPlant { public EndWallPlantBlock() { } diff --git a/src/main/java/org/betterx/betterend/blocks/basis/FurBlock.java b/src/main/java/org/betterx/betterend/blocks/basis/FurBlock.java index 4d8fcc3f..3412b3ac 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/FurBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/FurBlock.java @@ -1,10 +1,10 @@ package org.betterx.betterend.blocks.basis; import org.betterx.bclib.behaviours.BehaviourBuilders; +import org.betterx.bclib.behaviours.interfaces.BehaviourShearablePlant; import org.betterx.bclib.blocks.BaseAttachedBlock; import org.betterx.bclib.client.render.BCLRenderLayer; import org.betterx.bclib.interfaces.RenderLayerProvider; -import org.betterx.bclib.interfaces.tools.AddMineableShears; import org.betterx.bclib.items.tool.BaseShearsItem; import org.betterx.bclib.util.MHelper; import org.betterx.worlds.together.tag.v3.TagManager; @@ -31,7 +31,7 @@ import com.google.common.collect.Maps; import java.util.EnumMap; import java.util.List; -public class FurBlock extends BaseAttachedBlock implements RenderLayerProvider, AddMineableShears { +public class FurBlock extends BaseAttachedBlock implements RenderLayerProvider, BehaviourShearablePlant { private static final EnumMap BOUNDING_SHAPES = Maps.newEnumMap(Direction.class); private final ItemLike drop; private final int dropChance; diff --git a/src/main/java/org/betterx/betterend/blocks/basis/PottableCropBlock.java b/src/main/java/org/betterx/betterend/blocks/basis/PottableCropBlock.java index 5f114ec0..89ad653a 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/PottableCropBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/PottableCropBlock.java @@ -1,12 +1,13 @@ package org.betterx.betterend.blocks.basis; +import org.betterx.bclib.behaviours.interfaces.BehaviourSeed; import org.betterx.bclib.blocks.BaseCropBlock; import org.betterx.betterend.interfaces.PottablePlant; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; -public class PottableCropBlock extends BaseCropBlock implements PottablePlant { +public class PottableCropBlock extends BaseCropBlock implements PottablePlant, BehaviourSeed { private final Block[] terrain; public PottableCropBlock(Item drop, Block... terrain) { diff --git a/src/main/java/org/betterx/betterend/blocks/basis/PottableFeatureSapling.java b/src/main/java/org/betterx/betterend/blocks/basis/PottableFeatureSapling.java index 1f8f4dfd..cff9bd36 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/PottableFeatureSapling.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/PottableFeatureSapling.java @@ -1,12 +1,13 @@ package org.betterx.betterend.blocks.basis; +import org.betterx.bclib.behaviours.interfaces.BehaviourSapling; import org.betterx.bclib.blocks.FeatureSaplingBlock; import org.betterx.betterend.interfaces.PottablePlant; import net.minecraft.world.level.levelgen.feature.Feature; import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; -public abstract class PottableFeatureSapling, FC extends FeatureConfiguration> extends FeatureSaplingBlock implements PottablePlant { +public abstract class PottableFeatureSapling, FC extends FeatureConfiguration> extends FeatureSaplingBlock implements PottablePlant, BehaviourSapling { public PottableFeatureSapling(FeatureSupplier featureSupplier) { super(featureSupplier); diff --git a/src/main/java/org/betterx/betterend/tab/CreativeTabs.java b/src/main/java/org/betterx/betterend/tab/CreativeTabs.java index 8488b2bf..1e718611 100644 --- a/src/main/java/org/betterx/betterend/tab/CreativeTabs.java +++ b/src/main/java/org/betterx/betterend/tab/CreativeTabs.java @@ -12,13 +12,10 @@ public class CreativeTabs { BCLCreativeTabManager.create(BetterEnd.MOD_ID) .createTab("nature") .setPredicate(item -> BCLCreativeTab.NATURE.contains(item) -// || item == NetherItems.AGAVE_LEAF -// || item == NetherItems.BLACK_APPLE -// || item == NetherBlocks.MAGMA_FLOWER.asItem() -// || item == NetherBlocks.MAT_RUBEUS.getBlockItem(NetherSlots.CONE) -// || item == NetherBlocks.MAT_WILLOW.getBlockItem(WillowMaterial.BLOCK_TORCH) + || item == EndItems.END_LILY_LEAF + || item == EndItems.END_LILY_LEAF_DRIED ) - .setIcon(EndBlocks.FILALUX_LANTERN) + .setIcon(EndBlocks.TENANEA_FLOWERS) .build() .createBlockTab(EndBlocks.END_MYCELIUM) .build()