1 files changed, 3 insertions, 193 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 1d8698a..d50ee77 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
@@ -4,144 +4,23 @@ import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import lv.enes.mc.eris_alchemy.ErisAlchemyRegistry;
 import lv.enes.mc.eris_alchemy.block.entity.AlchemicalChestBlockEntity;
-import lv.enes.mc.eris_alchemy.menu.AlchemicalChestMenu;
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
 import net.minecraft.network.chat.Component;
-import net.minecraft.world.*;
-import net.minecraft.world.entity.monster.piglin.PiglinAi;
-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;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-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>
-                implements SimpleWaterloggedBlock
+public class AlchemicalChestBlock extends ChestLikeBlock<AlchemicalChestBlockEntity>
 {
-        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) {
-                if (world.getBlockEntity(pos) instanceof AlchemicalChestBlockEntity container) {
-                        return container;
-                }
-                return null;
-        }
 
         public AlchemicalChestBlock(Properties properties) {
                 super(properties, () -> ErisAlchemyRegistry.BlockEntities.ALCHEMICAL_CHEST);
-                registerDefaultState(getStateDefinition().any()
-                                .setValue(FACING, Direction.NORTH)
-                                .setValue(WATERLOGGED, false)
-                );
-        }
-
-        @Nonnull
-        @Override
-        public DoubleBlockCombiner.NeighborCombineResult<? extends ChestBlockEntity> combine(
-                        BlockState state,
-                        Level world,
-                        BlockPos pos,
-                        boolean ignoreBlocked
-        ) {
-                return DoubleBlockCombiner.Combiner::acceptNone;
-        }
-
-        @SuppressWarnings("deprecation")
-        @Override
-        public int getAnalogOutputSignal(BlockState state, Level world, BlockPos pos) {
-                return AlchemicalChestMenu.getRedstoneSignalFromContainer(getContainer(world, pos));
-        }
-
-        @SuppressWarnings("deprecation")
-        @Nonnull
-        @Override
-        public FluidState getFluidState(BlockState state) {
-                return state.getValue(WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(state);
-        }
-
-        @Override
-        public MenuProvider getMenuProvider(BlockState state, Level world, BlockPos pos) {
-                if (world.getBlockEntity(pos) instanceof AlchemicalChestBlockEntity entity) {
-                        return new SimpleMenuProvider(entity, CONTAINER_TITLE);
-                }
-                return null;
         }
 
-        @Nonnull
         @Override
-        public RenderShape getRenderShape(BlockState state) {
-                return RenderShape.ENTITYBLOCK_ANIMATED;
-        }
-
-        @SuppressWarnings("deprecation")
         @Nonnull
-        @Override
-        public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext ctx) {
-                return SHAPE;
-        }
-
-        @Override
-        public BlockState getStateForPlacement(BlockPlaceContext ctx) {
-                return defaultBlockState()
-                                .setValue(FACING, ctx.getHorizontalDirection().getOpposite())
-                                .setValue(WATERLOGGED, ctx.getLevel().getFluidState(ctx.getClickedPos()).is(Fluids.WATER));
-        }
-
-        @Override
-        public <T extends BlockEntity> BlockEntityTicker<T> getTicker(
-                        Level ignoredWorld,
-                        BlockState ignoredState,
-                        BlockEntityType<T> type
-        ) {
-                return createTickerHelper(
-                                type,
-                                blockEntityType.get(),
-                                (world, pos, state, entity) -> entity.tick(world, pos, state)
-                );
-        }
-
-        @SuppressWarnings("deprecation")
-        @Override
-        public boolean hasAnalogOutputSignal(BlockState state) {
-                return true;
-        }
-
-        @SuppressWarnings("deprecation")
-        @Override
-        public boolean isPathfindable(BlockState state, BlockGetter world, BlockPos pos, PathComputationType type) {
-                return false;
-        }
-
-        @SuppressWarnings("deprecation")
-        @Nonnull
-        @Override
-        public BlockState mirror(BlockState state, Mirror mirror) {
-                return state.rotate(mirror.getRotation(state.getValue(FACING)));
+        protected Component getContainerTitle() {
+                return CONTAINER_TITLE;
         }
 
         @Nullable
@@ -149,73 +28,4 @@ public class AlchemicalChestBlock
         public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
                 return new AlchemicalChestBlockEntity(pos, state);
         }
-
-        @SuppressWarnings("deprecation")
-        @Override
-        public void onRemove(BlockState state, Level world, BlockPos pos, BlockState newState, boolean moved) {
-                if (!state.is(newState.getBlock())) {
-                        var entity = world.getBlockEntity(pos);
-                        if (entity instanceof Container container) {
-                                Containers.dropContents(world, pos, container);
-                                world.updateNeighbourForOutputSignal(pos, this);
-                        }
-
-                        super.onRemove(state, world, pos, newState, moved);
-                }
-        }
-
-        @SuppressWarnings("deprecation")
-        @Nonnull
-        @Override
-        public BlockState rotate(BlockState state, Rotation rotation) {
-                return state.setValue(FACING, rotation.rotate(state.getValue(FACING)));
-        }
-
-        @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;
-                }
-
-                var provider = getMenuProvider(state, world, pos);
-                if (provider != null) {
-                        player.openMenu(provider);
-                        // TODO: player.awardStat(getOpenChestStat);
-                        PiglinAi.angerNearbyPiglins(player, true);
-                }
-
-                return InteractionResult.CONSUME;
-        }
-
-        @Override
-        protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
-                builder.add(FACING, WATERLOGGED);
-        }
 }