1 files changed, 33 insertions, 7 deletions

diff --git a/src/main/java/lv/enes/mc/eris_alchemy/block/AlchemicalChestBlock.java b/src/main/java/lv/enes/mc/eris_alchemy/block/AlchemicalChestBlock.java
index c013df6..9a3b413 100644
--- a/src/main/java/lv/enes/mc/eris_alchemy/block/AlchemicalChestBlock.java
+++ b/src/main/java/lv/enes/mc/eris_alchemy/block/AlchemicalChestBlock.java
@@ -14,6 +14,7 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.block.*;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityTicker;
@@ -22,15 +23,20 @@ import net.minecraft.world.level.block.entity.ChestBlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
+import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.state.properties.DirectionProperty;
+import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
-public class AlchemicalChestBlock extends AbstractChestBlock<AlchemicalChestBlockEntity> {
-        public static final Component CONTAINER_TITLE = Component.translatable("container.eris_alchemy.alchemical_chest");
+public class AlchemicalChestBlock extends AbstractChestBlock<AlchemicalChestBlockEntity> implements SimpleWaterloggedBlock {
         public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING;
+        public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;
+
+        public static final Component CONTAINER_TITLE = Component.translatable("container.eris_alchemy.alchemical_chest");
         public static final VoxelShape SHAPE = Block.box(1.0, 0.0, 1.0, 15.0, 14.0, 15.0);
 
         public static Container getContainer(Level world, BlockPos pos) {
@@ -44,6 +50,7 @@ public class AlchemicalChestBlock extends AbstractChestBlock<AlchemicalChestBloc
                 super(properties, () -> ErisAlchemyBlockEntities.ALCHEMICAL_CHEST);
                 registerDefaultState(getStateDefinition().any()
                                 .setValue(FACING, Direction.NORTH)
+                                .setValue(WATERLOGGED, false)
                 );
         }
 
@@ -53,15 +60,17 @@ public class AlchemicalChestBlock extends AbstractChestBlock<AlchemicalChestBloc
                 return DoubleBlockCombiner.Combiner::acceptNone;
         }
 
+        @SuppressWarnings("deprecation")
         @Override
-        protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
-                builder.add(FACING);
+        public int getAnalogOutputSignal(BlockState state, Level world, BlockPos pos) {
+                return AlchemicalChestMenu.getRedstoneSignalFromContainer(getContainer(world, pos));
         }
 
         @SuppressWarnings("deprecation")
+        @Nonnull
         @Override
-        public int getAnalogOutputSignal(BlockState state, Level world, BlockPos pos) {
-                return AlchemicalChestMenu.getRedstoneSignalFromContainer(getContainer(world, pos));
+        public FluidState getFluidState(BlockState state) {
+                return state.getValue(WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(state);
         }
 
         @Override
@@ -88,7 +97,8 @@ public class AlchemicalChestBlock extends AbstractChestBlock<AlchemicalChestBloc
         @Override
         public BlockState getStateForPlacement(BlockPlaceContext ctx) {
                 return defaultBlockState()
-                                .setValue(FACING, ctx.getHorizontalDirection().getOpposite());
+                                .setValue(FACING, ctx.getHorizontalDirection().getOpposite())
+                                .setValue(WATERLOGGED, ctx.getLevel().getFluidState(ctx.getClickedPos()).is(Fluids.WATER));
         }
 
         @Override
@@ -145,6 +155,17 @@ public class AlchemicalChestBlock extends AbstractChestBlock<AlchemicalChestBloc
         @SuppressWarnings("deprecation")
         @Nonnull
         @Override
+        public BlockState updateShape(BlockState state, Direction direction, BlockState neighborState, LevelAccessor world, BlockPos pos, BlockPos neighborPos) {
+                if (state.getValue(WATERLOGGED)) {
+                        world.scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(world));
+                }
+
+                return super.updateShape(state, direction, neighborState, world, pos, neighborPos);
+        }
+
+        @SuppressWarnings("deprecation")
+        @Nonnull
+        @Override
         public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
                 if (world.isClientSide) {
                         return InteractionResult.SUCCESS;
@@ -159,4 +180,9 @@ public class AlchemicalChestBlock extends AbstractChestBlock<AlchemicalChestBloc
 
                 return InteractionResult.CONSUME;
         }
+
+        @Override
+        protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
+                builder.add(FACING, WATERLOGGED);
+        }
 }