From 741258d1da92ecbec7d0e540b2b3381d858b85ac Mon Sep 17 00:00:00 2001 From: Sergeant Acoustic Date: Fri, 20 Feb 2026 15:22:18 +0000 Subject: [PATCH] Revert modified plush models They caused a major client/server incompatibility between different versions This reverts commit 1aa1f89dccee399ef5d01749d871d35d4d8fa51a. --- .../patience/mc_rebalance/PlushBlock.java | 40 ++----------------- 1 file changed, 4 insertions(+), 36 deletions(-) diff --git a/src/main/java/xyz/nearmisses/patience/mc_rebalance/PlushBlock.java b/src/main/java/xyz/nearmisses/patience/mc_rebalance/PlushBlock.java index e8a7aec..33f6c55 100644 --- a/src/main/java/xyz/nearmisses/patience/mc_rebalance/PlushBlock.java +++ b/src/main/java/xyz/nearmisses/patience/mc_rebalance/PlushBlock.java @@ -1,65 +1,33 @@ package xyz.nearmisses.patience.mc_rebalance; -import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.SimpleWaterloggedBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.HorizontalDirectionalBlock; -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.item.context.BlockPlaceContext; -import net.minecraft.world.level.material.FluidState; -import net.minecraft.world.level.material.Fluids; -import net.minecraft.world.phys.shapes.CollisionContext; -import net.minecraft.world.phys.shapes.VoxelShape; //import net.minecraft.world.level.block.state.properties.BlockStateProperties; //import net.minecraft.world.level.block.state.properties.EnumProperty; -public class PlushBlock extends Block implements SimpleWaterloggedBlock { +public class PlushBlock extends Block { public static final DirectionProperty FACING = HorizontalDirectionalBlock.FACING; - public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; // private static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING; //public static final EnumProperty FACING = BlockStateProperties.FACING; public PlushBlock(Block.Properties properties) { super(properties); - this.registerDefaultState(this.stateDefinition.any().setValue(FACING, Direction.NORTH).setValue(WATERLOGGED, false)); + this.registerDefaultState(this.stateDefinition.any().setValue(FACING, Direction.NORTH)); } @Override protected void createBlockStateDefinition(StateDefinition.Builder builder) { - builder.add(FACING, WATERLOGGED); + builder.add(FACING); } - @Override - public FluidState getFluidState(BlockState pState) { - return pState.getValue(WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(pState); - } - @Override public BlockState getStateForPlacement(BlockPlaceContext context) { - BlockPos blockPos = context.getClickedPos(); - FluidState fluidState = context.getLevel().getFluidState(blockPos); - return this.defaultBlockState().setValue(FACING, context.getHorizontalDirection().getOpposite()).setValue(WATERLOGGED, fluidState.getType() == Fluids.WATER); + return this.defaultBlockState().setValue(FACING, context.getHorizontalDirection().getOpposite()); } - - @Override - public VoxelShape getShape(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos, CollisionContext collisionContext) { - return Block.box(3.0, 0.0, 3.0, 13.0, 15.0, 13.0); - } - - @Override - public BlockState updateShape(BlockState pState, Direction pFacing, BlockState pFacingState, LevelAccessor pLevel, BlockPos pCurrentPos, BlockPos pFacingPos) { - if (pState.getValue(WATERLOGGED)) { - pLevel.scheduleTick(pCurrentPos, Fluids.WATER, Fluids.WATER.getTickDelay(pLevel)); - } - - return super.updateShape(pState, pFacing, pFacingState, pLevel, pCurrentPos, pFacingPos); - } }