Update visibility of overrided block methods

lunar-sway · Dec 8, 2024 · e631892 · e631892
1 parent dbe2796
commit e631892
Show file tree

Hide file tree

Showing 37 changed files with 100 additions and 165 deletions.
diff --git a/src/main/java/com/mraof/minestuck/block/CruxtruderLidBlock.java b/src/main/java/com/mraof/minestuck/block/CruxtruderLidBlock.java
@@ -24,7 +24,7 @@ public PushReaction getPistonPushReaction(BlockState state)
 	}
 
 	@Override
-	public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context)
+	protected VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context)
 	{
 		return SHAPE;
 	}

diff --git a/src/main/java/com/mraof/minestuck/block/CustomShapeBlock.java b/src/main/java/com/mraof/minestuck/block/CustomShapeBlock.java
@@ -54,16 +54,14 @@ public BlockState updateShape(BlockState stateIn, Direction facing, BlockState f
 		return super.updateShape(stateIn, facing, facingState, level, currentPos, facingPos);
 	}
 
-	@SuppressWarnings("deprecation")
 	@Override
-	public BlockState rotate(BlockState state, Rotation direction)
+	protected BlockState rotate(BlockState state, Rotation direction)
 	{
 		return state.setValue(FACING, direction.rotate(state.getValue(FACING)));
 	}
 
-	@SuppressWarnings("deprecation")
 	@Override
-	public BlockState mirror(BlockState state, Mirror mirrorIn)
+	protected BlockState mirror(BlockState state, Mirror mirrorIn)
 	{
 		return state.setValue(FACING, mirrorIn.mirror(state.getValue(FACING)));
 	}
@@ -75,15 +73,13 @@ protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockSt
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
-	public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context)
+	protected VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context)
 	{
 		return shape.get(state.getValue(FACING));
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
-	public FluidState getFluidState(BlockState state)
+	protected FluidState getFluidState(BlockState state)
 	{
 		return state.getValue(WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(state);
 	}

diff --git a/src/main/java/com/mraof/minestuck/block/DirectionalCustomShapeBlock.java b/src/main/java/com/mraof/minestuck/block/DirectionalCustomShapeBlock.java
@@ -44,9 +44,8 @@ public BlockState getStateForPlacement(BlockPlaceContext context)
 		return this.defaultBlockState().setValue(FACING, context.getNearestLookingDirection().getOpposite()).setValue(WATERLOGGED, iFluidState.getType() == Fluids.WATER);
 	}
 
-	@SuppressWarnings("deprecation")
 	@Override
-	public BlockState updateShape(BlockState stateIn, Direction facing, BlockState facingState, LevelAccessor level, BlockPos currentPos, BlockPos facingPos)
+	protected BlockState updateShape(BlockState stateIn, Direction facing, BlockState facingState, LevelAccessor level, BlockPos currentPos, BlockPos facingPos)
 	{
 		if(stateIn.getValue(WATERLOGGED))
 		{
@@ -75,16 +74,14 @@ public BlockState rotate(BlockState state, LevelAccessor level, BlockPos pos, Ro
 		return state.setValue(FACING, direction.rotate(state.getValue(FACING)));
 	}
 
-	@SuppressWarnings("deprecation")
 	@Override
-	public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context)
+	protected VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context)
 	{
 		return shape.get(state.getValue(FACING));
 	}
 
-	@SuppressWarnings("deprecation")
 	@Override
-	public FluidState getFluidState(BlockState state)
+	protected FluidState getFluidState(BlockState state)
 	{
 		return state.getValue(WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(state);
 	}

diff --git a/src/main/java/com/mraof/minestuck/block/FragileBlock.java b/src/main/java/com/mraof/minestuck/block/FragileBlock.java
@@ -26,16 +26,14 @@ public FragileBlock(Properties properties)
 		super(properties);
 	}
 
-	@SuppressWarnings("deprecation")
 	@Override
-	public VoxelShape getCollisionShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context)
+	protected VoxelShape getCollisionShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context)
 	{
 		return COLLISION_SHAPE;
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
-	public void entityInside(BlockState stateIn, Level level, BlockPos pos, Entity entityIn)
+	protected void entityInside(BlockState stateIn, Level level, BlockPos pos, Entity entityIn)
 	{
 		attemptBreak(level, entityIn, pos);
 	}
@@ -88,4 +86,4 @@ public boolean directionNeedsObfuscation(Level level, BlockPos pos)
 	public static boolean isSecure(BlockState state) {
 		return !state.isAir() && !state.is(BlockTags.FIRE) && !state.liquid() && !state.canBeReplaced();
 	}
-}
+}
diff --git a/src/main/java/com/mraof/minestuck/block/GateBlock.java b/src/main/java/com/mraof/minestuck/block/GateBlock.java
@@ -47,6 +47,7 @@ protected final boolean isValid(BlockPos mainPos, Level level)
 	}
 
 	@Nullable
+	@Override
 	protected BlockPos findMainComponent(BlockPos pos, Level level)
 	{
 		for(int x = -1; x <= 1; x++)
@@ -107,8 +108,7 @@ protected BlockPos findMainComponent(BlockPos pos, Level level)
 		}
 
 		@Override
-		@SuppressWarnings("deprecation")
-		public void entityInside(BlockState state, Level level, BlockPos pos, Entity entityIn)
+		protected void entityInside(BlockState state, Level level, BlockPos pos, Entity entityIn)
 		{
 			if(entityIn instanceof ServerPlayer player)
 			{
@@ -138,4 +138,4 @@ public static void placeGate(CommonLevelAccessor level, BlockPos centerPos, Gate
 			}
 		}
 	}
-}
+}
diff --git a/src/main/java/com/mraof/minestuck/block/GlowystoneWireBlock.java b/src/main/java/com/mraof/minestuck/block/GlowystoneWireBlock.java
@@ -50,7 +50,7 @@ public GlowystoneWireBlock(Properties properties)
 	}
 
 	@Override
-	public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context)
+	protected VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context)
 	{
 		return SHAPES[getAABBIndex(state)];
 	}
@@ -274,8 +274,7 @@ public void animateTick(BlockState stateIn, Level level, BlockPos pos, RandomSou
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
-	public BlockState rotate(BlockState state, Rotation rot)
+	protected BlockState rotate(BlockState state, Rotation rot)
 	{
 		switch(rot)
 		{
@@ -291,8 +290,7 @@ public BlockState rotate(BlockState state, Rotation rot)
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
-	public BlockState mirror(BlockState state, Mirror mirrorIn)
+	protected BlockState mirror(BlockState state, Mirror mirrorIn)
 	{
 		switch(mirrorIn)
 		{
@@ -310,4 +308,4 @@ protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockSt
 	{
 		builder.add(NORTH, EAST, SOUTH, WEST);
 	}
-}
+}
diff --git a/src/main/java/com/mraof/minestuck/block/GoldSeedsBlock.java b/src/main/java/com/mraof/minestuck/block/GoldSeedsBlock.java
@@ -21,23 +21,20 @@ public GoldSeedsBlock(Properties properties)
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
-	public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context)
+	protected VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context)
 	{
 		return SHAPE;
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
-	public boolean canSurvive(BlockState state, LevelReader level, BlockPos pos)
+	protected boolean canSurvive(BlockState state, LevelReader level, BlockPos pos)
 	{
 		return level.getBlockState(pos.below()).getBlock() == Blocks.FARMLAND;
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
-	public BlockState updateShape(BlockState stateIn, Direction facing, BlockState facingState, LevelAccessor level, BlockPos currentPos, BlockPos facingPos)
+	protected BlockState updateShape(BlockState stateIn, Direction facing, BlockState facingState, LevelAccessor level, BlockPos currentPos, BlockPos facingPos)
 	{
 		return !stateIn.canSurvive(level, currentPos) ? Blocks.AIR.defaultBlockState() : super.updateShape(stateIn, facing, facingState, level, currentPos, facingPos);
 	}
-}
+}
diff --git a/src/main/java/com/mraof/minestuck/block/LotusTimeCapsuleBlock.java b/src/main/java/com/mraof/minestuck/block/LotusTimeCapsuleBlock.java
@@ -30,8 +30,7 @@ public LotusTimeCapsuleBlock(LotusTimeCapsuleMultiblock machine, CustomVoxelShap
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
-	public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context)
+	protected VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context)
 	{
 		return shape.get(state.getValue(FACING));
 	}

diff --git a/src/main/java/com/mraof/minestuck/block/ReturnNodeBlock.java b/src/main/java/com/mraof/minestuck/block/ReturnNodeBlock.java
@@ -26,8 +26,7 @@ public ReturnNodeBlock(Properties properties)
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
-	public void entityInside(BlockState state, Level level, BlockPos pos, Entity entityIn)
+	protected void entityInside(BlockState state, Level level, BlockPos pos, Entity entityIn)
 	{
 		if(entityIn instanceof ServerPlayer player)
 		{
@@ -124,4 +123,4 @@ public static void placeReturnNode(LevelAccessor level, BlockPos nodePos, @Nulla
 			}
 		}
 	}
-}
+}
diff --git a/src/main/java/com/mraof/minestuck/block/SkaiaPortalBlock.java b/src/main/java/com/mraof/minestuck/block/SkaiaPortalBlock.java
@@ -46,15 +46,13 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state)
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
-	public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context)
+	protected VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context)
 	{
 		return SHAPE;
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
-	public void entityInside(BlockState state, Level level, BlockPos pos, Entity entityIn)
+	protected void entityInside(BlockState state, Level level, BlockPos pos, Entity entityIn)
 	{
 		if (!entityIn.isPassenger() && !entityIn.isVehicle() && !level.isClientSide && !entityIn.isOnPortalCooldown())
 		{
@@ -68,4 +66,4 @@ public ItemStack getCloneItemStack(BlockState state, HitResult target, LevelRead
 	{
 		return ItemStack.EMPTY;
 	}
-}
+}
diff --git a/src/main/java/com/mraof/minestuck/block/SpecialTNTBlock.java b/src/main/java/com/mraof/minestuck/block/SpecialTNTBlock.java
@@ -31,8 +31,7 @@ public SpecialTNTBlock(Properties builder, boolean primed, boolean unstable, boo
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
-	public void attack(BlockState state, Level level, BlockPos pos, Player player)
+	protected void attack(BlockState state, Level level, BlockPos pos, Player player)
 	{
 		if(primed)
 		{
@@ -73,13 +72,12 @@ public void wasExploded(Level level, BlockPos pos, Explosion explosionIn)
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
-	public void randomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random)
+	protected void randomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random)
 	{
 		if(unstable && random.nextDouble() < 0.1)
 		{
 			this.explode(level, pos, null);
 			level.removeBlock(pos, false);
 		}
 	}
-}
+}
diff --git a/src/main/java/com/mraof/minestuck/block/SpikeBlock.java b/src/main/java/com/mraof/minestuck/block/SpikeBlock.java
@@ -32,9 +32,8 @@ public void fallOn(Level level, BlockState state, BlockPos pos, Entity entityIn,
 	/**
 	 * Damages relevant entities as they move through the block
 	 */
-	@SuppressWarnings("deprecation")
 	@Override
-	public void entityInside(BlockState state, Level level, BlockPos pos, Entity entityIn)
+	protected void entityInside(BlockState state, Level level, BlockPos pos, Entity entityIn)
 	{
 		if(entityIn instanceof LivingEntity && entityIn.fallDistance < 1)
 		{

diff --git a/src/main/java/com/mraof/minestuck/block/StoneTabletBlock.java b/src/main/java/com/mraof/minestuck/block/StoneTabletBlock.java
@@ -51,8 +51,7 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state)
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
-	public List<ItemStack> getDrops(BlockState state, LootParams.Builder builder)
+	protected List<ItemStack> getDrops(BlockState state, LootParams.Builder builder)
 	{
 		if(builder.getOptionalParameter(LootContextParams.BLOCK_ENTITY) instanceof ItemStackBlockEntity itemBE)
 		{
@@ -81,6 +80,7 @@ protected InteractionResult useWithoutItem(BlockState state, Level level, BlockP
 		return InteractionResult.SUCCESS;
 	}
 
+	@Nullable
 	@Override
 	public BlockState getStateForPlacement(BlockPlaceContext context)
 	{

diff --git a/src/main/java/com/mraof/minestuck/block/SulfurBubbleBlock.java b/src/main/java/com/mraof/minestuck/block/SulfurBubbleBlock.java
@@ -34,7 +34,7 @@ protected boolean mayPlaceOn(BlockState state, BlockGetter level, BlockPos pos)
 	}
 
 	@Override
-	public VoxelShape getShape(BlockState pState, BlockGetter pLevel, BlockPos pPos, CollisionContext pContext)
+	protected VoxelShape getShape(BlockState pState, BlockGetter pLevel, BlockPos pPos, CollisionContext pContext)
 	{
 		Vec3 vec3 = pState.getOffset(pLevel, pPos);
 		return SHAPE.move(vec3.x, vec3.y, vec3.z);

diff --git a/src/main/java/com/mraof/minestuck/block/TrajectoryBlock.java b/src/main/java/com/mraof/minestuck/block/TrajectoryBlock.java
@@ -65,17 +65,15 @@ public void stepOn(Level level, BlockPos pos, BlockState state, Entity entityIn)
 		}
 	}
 
-	@SuppressWarnings("deprecation")
 	@Override
-	public void neighborChanged(BlockState state, Level level, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving)
+	protected void neighborChanged(BlockState state, Level level, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving)
 	{
 		super.neighborChanged(state, level, pos, blockIn, fromPos, isMoving);
 		updatePower(level, pos);
 	}
 
-	@SuppressWarnings("deprecation")
 	@Override
-	public void onPlace(BlockState state, Level level, BlockPos pos, BlockState oldState, boolean isMoving)
+	protected void onPlace(BlockState state, Level level, BlockPos pos, BlockState oldState, boolean isMoving)
 	{
 		super.onPlace(state, level, pos, oldState, isMoving);
 		updatePower(level, pos);
@@ -129,4 +127,4 @@ protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockSt
 		builder.add(POWER);
 		builder.add(POWERED);
 	}
-}
+}
diff --git a/src/main/java/com/mraof/minestuck/block/machine/AlchemiterBlock.java b/src/main/java/com/mraof/minestuck/block/machine/AlchemiterBlock.java
@@ -137,12 +137,10 @@ public Pad(AlchemiterMultiblock machine, CustomVoxelShape emptyShape, CustomVoxe
 		}
 
 		@Override
-		public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context)
+		protected VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context)
 		{
 			if(state.getValue(DOWEL).equals(EnumDowelType.NONE))
-			{
 				return super.getShape(state, worldIn, pos, context);
-			}
 
 			return dowelShape.get(state.getValue(FACING));
 		}

diff --git a/src/main/java/com/mraof/minestuck/block/machine/ComputerBlock.java b/src/main/java/com/mraof/minestuck/block/machine/ComputerBlock.java
@@ -194,8 +194,7 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state)
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
-	public void onRemove(BlockState state, Level level, BlockPos pos, BlockState newState, boolean isMoving)
+	protected void onRemove(BlockState state, Level level, BlockPos pos, BlockState newState, boolean isMoving)
 	{
 		if(!newState.is(state.getBlock()))
 			dropItems(level, pos.getX(), pos.getY(), pos.getZ(), state);
@@ -224,8 +223,7 @@ private void dropItems(Level level, int x, int y, int z, BlockState state)
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
-	public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context)
+	protected VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context)
 	{
 		if(state.getValue(STATE) == State.OFF)
 			return shapeOff.get(state.getValue(FACING));

diff --git a/src/main/java/com/mraof/minestuck/block/machine/GristCollectorBlock.java b/src/main/java/com/mraof/minestuck/block/machine/GristCollectorBlock.java
@@ -85,17 +85,15 @@ public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level level, Block
 		return !level.isClientSide ? BlockUtil.checkTypeForTicker(placedType, MSBlockEntityTypes.GRIST_COLLECTOR.get(), GristCollectorBlockEntity::serverTick) : null;
 	}
 
-	@SuppressWarnings("deprecation")
 	@Override
-	public void neighborChanged(BlockState state, Level level, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving)
+	protected void neighborChanged(BlockState state, Level level, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving)
 	{
 		super.neighborChanged(state, level, pos, blockIn, fromPos, isMoving);
 		updatePower(level, pos);
 	}
 
-	@SuppressWarnings("deprecation")
 	@Override
-	public void onPlace(BlockState state, Level level, BlockPos pos, BlockState oldState, boolean isMoving)
+	protected void onPlace(BlockState state, Level level, BlockPos pos, BlockState oldState, boolean isMoving)
 	{
 		super.onPlace(state, level, pos, oldState, isMoving);
 		updatePower(level, pos);