Fix access levels of various methods that are now protected instead of public

pupnewfster · pupnewfster · commit 114d94bcc484 · 2024-06-04T17:25:25.000-05:00
diff --git a/src/additions/java/mekanism/additions/common/block/plastic/BlockPlasticTransparent.java b/src/additions/java/mekanism/additions/common/block/plastic/BlockPlasticTransparent.java
@@ -33,7 +33,7 @@ protected boolean useShapeForLightOcclusion(@NotNull BlockState state) {
     }
 
     @Override
-    public boolean propagatesSkylightDown(@NotNull BlockState state, @NotNull BlockGetter reader, @NotNull BlockPos pos) {
+    protected boolean propagatesSkylightDown(@NotNull BlockState state, @NotNull BlockGetter reader, @NotNull BlockPos pos) {
         return true;
     }
 
diff --git a/src/additions/java/mekanism/additions/common/block/plastic/BlockPlasticTransparentSlab.java b/src/additions/java/mekanism/additions/common/block/plastic/BlockPlasticTransparentSlab.java
@@ -28,7 +28,7 @@ protected boolean useShapeForLightOcclusion(@NotNull BlockState state) {
     }
 
     @Override
-    public boolean propagatesSkylightDown(@NotNull BlockState state, @NotNull BlockGetter reader, @NotNull BlockPos pos) {
+    protected boolean propagatesSkylightDown(@NotNull BlockState state, @NotNull BlockGetter reader, @NotNull BlockPos pos) {
         return true;
     }
 
diff --git a/src/additions/java/mekanism/additions/common/block/plastic/BlockPlasticTransparentStairs.java b/src/additions/java/mekanism/additions/common/block/plastic/BlockPlasticTransparentStairs.java
@@ -29,7 +29,7 @@ protected boolean useShapeForLightOcclusion(@NotNull BlockState state) {
     }
 
     @Override
-    public boolean propagatesSkylightDown(@NotNull BlockState state, @NotNull BlockGetter reader, @NotNull BlockPos pos) {
+    protected boolean propagatesSkylightDown(@NotNull BlockState state, @NotNull BlockGetter reader, @NotNull BlockPos pos) {
         return true;
     }
 
diff --git a/src/generators/java/mekanism/generators/common/block/fusion/BlockLaserFocusMatrix.java b/src/generators/java/mekanism/generators/common/block/fusion/BlockLaserFocusMatrix.java
@@ -48,7 +48,7 @@ protected float getShadeBrightness(@NotNull BlockState state, @NotNull BlockGett
     }
 
     @Override
-    public boolean propagatesSkylightDown(@NotNull BlockState state, @NotNull BlockGetter reader, @NotNull BlockPos pos) {
+    protected boolean propagatesSkylightDown(@NotNull BlockState state, @NotNull BlockGetter reader, @NotNull BlockPos pos) {
         return true;
     }
 
diff --git a/src/generators/java/mekanism/generators/common/block/turbine/BlockTurbineRotor.java b/src/generators/java/mekanism/generators/common/block/turbine/BlockTurbineRotor.java
@@ -27,7 +27,7 @@ public BlockTurbineRotor() {
 
     @NotNull
     @Override
-    public ItemInteractionResult useItemOn(@NotNull ItemStack stack, @NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @NotNull Player player,
+    protected ItemInteractionResult useItemOn(@NotNull ItemStack stack, @NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @NotNull Player player,
           @NotNull InteractionHand hand, @NotNull BlockHitResult hit) {
         TileEntityTurbineRotor tile = WorldUtils.getTileEntity(TileEntityTurbineRotor.class, world, pos);
         if (tile == null) {
diff --git a/src/main/java/mekanism/common/block/BlockBounding.java b/src/main/java/mekanism/common/block/BlockBounding.java
@@ -92,7 +92,7 @@ protected boolean canBeReplaced(@NotNull BlockState state, @NotNull Fluid fluid)
 
     @NotNull
     @Override
-    public InteractionResult useWithoutItem(@NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @NotNull Player player, @NotNull BlockHitResult hit) {
+    protected InteractionResult useWithoutItem(@NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @NotNull Player player, @NotNull BlockHitResult hit) {
         BlockPos mainPos = getMainBlockPos(world, pos);
         if (mainPos == null) {
             return InteractionResult.FAIL;
@@ -104,7 +104,7 @@ public InteractionResult useWithoutItem(@NotNull BlockState state, @NotNull Leve
 
     @NotNull
     @Override
-    public ItemInteractionResult useItemOn(@NotNull ItemStack stack, @NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @NotNull Player player,
+    protected ItemInteractionResult useItemOn(@NotNull ItemStack stack, @NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @NotNull Player player,
           @NotNull InteractionHand hand, @NotNull BlockHitResult hit) {
         BlockPos mainPos = getMainBlockPos(world, pos);
         if (mainPos == null) {
diff --git a/src/main/java/mekanism/common/block/BlockRadioactiveWasteBarrel.java b/src/main/java/mekanism/common/block/BlockRadioactiveWasteBarrel.java
@@ -27,7 +27,7 @@ public BlockRadioactiveWasteBarrel() {
 
     @NotNull
     @Override
-    public InteractionResult useWithoutItem(@NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @NotNull Player player, @NotNull BlockHitResult hit) {
+    protected InteractionResult useWithoutItem(@NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @NotNull Player player, @NotNull BlockHitResult hit) {
         if (!player.isShiftKeyDown()) {
             return InteractionResult.PASS;
         }
diff --git a/src/main/java/mekanism/common/block/basic/BlockBin.java b/src/main/java/mekanism/common/block/basic/BlockBin.java
@@ -72,7 +72,7 @@ protected void attack(@NotNull BlockState state, @NotNull Level world, @NotNull
 
     @NotNull
     @Override
-    public ItemInteractionResult useItemOn(@NotNull ItemStack stack, @NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @NotNull Player player,
+    protected ItemInteractionResult useItemOn(@NotNull ItemStack stack, @NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @NotNull Player player,
           @NotNull InteractionHand hand, @NotNull BlockHitResult hit) {
         if (stack.isEmpty()) {
             return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
diff --git a/src/main/java/mekanism/common/block/basic/BlockFluidTank.java b/src/main/java/mekanism/common/block/basic/BlockFluidTank.java
@@ -45,7 +45,7 @@ public int getLightEmission(BlockState state, BlockGetter world, BlockPos pos) {
 
     @NotNull
     @Override
-    public ItemInteractionResult useItemOn(@NotNull ItemStack stack, @NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @NotNull Player player,
+    protected ItemInteractionResult useItemOn(@NotNull ItemStack stack, @NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @NotNull Player player,
           @NotNull InteractionHand hand, @NotNull BlockHitResult hit) {
         if (stack.isEmpty()) {
             return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
diff --git a/src/main/java/mekanism/common/block/basic/BlockLogisticalSorter.java b/src/main/java/mekanism/common/block/basic/BlockLogisticalSorter.java
@@ -60,7 +60,7 @@ public BlockState getStateForPlacement(@NotNull BlockPlaceContext context) {
 
     @NotNull
     @Override
-    public ItemInteractionResult useItemOn(@NotNull ItemStack stack, @NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @NotNull Player player,
+    protected ItemInteractionResult useItemOn(@NotNull ItemStack stack, @NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @NotNull Player player,
           @NotNull InteractionHand hand, @NotNull BlockHitResult hit) {
         if (stack.isEmpty()) {
             return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
diff --git a/src/main/java/mekanism/common/block/basic/BlockStructuralGlass.java b/src/main/java/mekanism/common/block/basic/BlockStructuralGlass.java
@@ -24,7 +24,7 @@ public BlockStructuralGlass(BlockTypeTile<TILE> type) {
 
     @NotNull
     @Override
-    public ItemInteractionResult useItemOn(@NotNull ItemStack stack, @NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @NotNull Player player,
+    protected ItemInteractionResult useItemOn(@NotNull ItemStack stack, @NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @NotNull Player player,
           @NotNull InteractionHand hand, @NotNull BlockHitResult hit) {
         TileEntityStructuralMultiblock tile = WorldUtils.getTileEntity(TileEntityStructuralMultiblock.class, world, pos);
         if (tile == null) {
diff --git a/src/main/java/mekanism/common/block/prefab/BlockBase.java b/src/main/java/mekanism/common/block/prefab/BlockBase.java
@@ -131,7 +131,7 @@ protected VoxelShape getShape(@NotNull BlockState state, @NotNull BlockGetter wo
 
     @NotNull
     @Override
-    public ItemInteractionResult useItemOn(@NotNull ItemStack stack, @NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @NotNull Player player,
+    protected ItemInteractionResult useItemOn(@NotNull ItemStack stack, @NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @NotNull Player player,
           @NotNull InteractionHand hand, @NotNull BlockHitResult hit) {
         if (player.isShiftKeyDown() && MekanismUtils.canUseAsWrench(stack)) {
             //Note: We don't handle checking if it is radioactive here, as the assumption is it doesn't have a tile so won't have that information
diff --git a/src/main/java/mekanism/common/block/prefab/BlockBasicMultiblock.java b/src/main/java/mekanism/common/block/prefab/BlockBasicMultiblock.java
@@ -30,7 +30,7 @@ public BlockBasicMultiblock(BlockTypeTile<TILE> type, BlockBehaviour.Properties
 
     @NotNull
     @Override
-    public ItemInteractionResult useItemOn(@NotNull ItemStack stack, @NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @NotNull Player player,
+    protected ItemInteractionResult useItemOn(@NotNull ItemStack stack, @NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @NotNull Player player,
           @NotNull InteractionHand hand, @NotNull BlockHitResult hit) {
         TileEntityMultiblock<?> tile = WorldUtils.getTileEntity(TileEntityMultiblock.class, world, pos);
         if (tile == null) {
diff --git a/src/main/java/mekanism/common/block/prefab/BlockTile.java b/src/main/java/mekanism/common/block/prefab/BlockTile.java
@@ -49,7 +49,7 @@ public TileEntityTypeRegistryObject<TILE> getTileType() {
 
     @NotNull
     @Override
-    public ItemInteractionResult useItemOn(@NotNull ItemStack stack, @NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @NotNull Player player,
+    protected ItemInteractionResult useItemOn(@NotNull ItemStack stack, @NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @NotNull Player player,
           @NotNull InteractionHand hand, @NotNull BlockHitResult hit) {
         TileEntityMekanism tile = WorldUtils.getTileEntity(TileEntityMekanism.class, world, pos);
         if (tile == null) {
diff --git a/src/main/java/mekanism/common/block/prefab/BlockTileGlass.java b/src/main/java/mekanism/common/block/prefab/BlockTileGlass.java
@@ -40,7 +40,7 @@ protected float getShadeBrightness(@NotNull BlockState state, @NotNull BlockGett
     }
 
     @Override
-    public boolean propagatesSkylightDown(@NotNull BlockState state, @NotNull BlockGetter reader, @NotNull BlockPos pos) {
+    protected boolean propagatesSkylightDown(@NotNull BlockState state, @NotNull BlockGetter reader, @NotNull BlockPos pos) {
         return true;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ protected boolean useShapeForLightOcclusion(@NotNull BlockState state) {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`@Override`
`36`		`- public boolean propagatesSkylightDown(@NotNull BlockState state, @NotNull BlockGetter reader, @NotNull BlockPos pos) {`
	`36`	`+ protected boolean propagatesSkylightDown(@NotNull BlockState state, @NotNull BlockGetter reader, @NotNull BlockPos pos) {`
`37`	`37`	`return true;`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ protected boolean useShapeForLightOcclusion(@NotNull BlockState state) {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`@Override`
`31`		`- public boolean propagatesSkylightDown(@NotNull BlockState state, @NotNull BlockGetter reader, @NotNull BlockPos pos) {`
	`31`	`+ protected boolean propagatesSkylightDown(@NotNull BlockState state, @NotNull BlockGetter reader, @NotNull BlockPos pos) {`
`32`	`32`	`return true;`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ protected boolean useShapeForLightOcclusion(@NotNull BlockState state) {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`@Override`
`32`		`- public boolean propagatesSkylightDown(@NotNull BlockState state, @NotNull BlockGetter reader, @NotNull BlockPos pos) {`
	`32`	`+ protected boolean propagatesSkylightDown(@NotNull BlockState state, @NotNull BlockGetter reader, @NotNull BlockPos pos) {`
`33`	`33`	`return true;`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ protected float getShadeBrightness(@NotNull BlockState state, @NotNull BlockGett`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`@Override`
`51`		`- public boolean propagatesSkylightDown(@NotNull BlockState state, @NotNull BlockGetter reader, @NotNull BlockPos pos) {`
	`51`	`+ protected boolean propagatesSkylightDown(@NotNull BlockState state, @NotNull BlockGetter reader, @NotNull BlockPos pos) {`
`52`	`52`	`return true;`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public BlockRadioactiveWasteBarrel() {`
`27`	`27`
`28`	`28`	`@NotNull`
`29`	`29`	`@Override`
`30`		`- public InteractionResult useWithoutItem(@NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @NotNull Player player, @NotNull BlockHitResult hit) {`
	`30`	`+ protected InteractionResult useWithoutItem(@NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @NotNull Player player, @NotNull BlockHitResult hit) {`
`31`	`31`	`if (!player.isShiftKeyDown()) {`
`32`	`32`	`return InteractionResult.PASS;`
`33`	`33`	`}`