bug: Fixed some waterloggable blocks not becoming waterlogged when pl…

…aced in water
rbasamoyai · Dec 30, 2024 · ad7734c · ad7734c
1 parent f9fbf6e
commit ad7734c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -54,6 +54,7 @@ and freedom tastes of reality..."* \
 - Fixed Quick-Firing Breech smoke on assembled cannons not persisting
 - Fixed Quick-Firing Breech side lever not actually ejecting the contents
 - Fixed Quick-Firing Breech accepting input from the sides
+- Fixed some waterloggable blocks not becoming waterlogged when placed in water
 
 ## [5.7.2] - 2024-12-18
 

diff --git a/src/main/java/rbasamoyai/createbigcannons/cannons/autocannon/AutocannonBaseBlock.java b/src/main/java/rbasamoyai/createbigcannons/cannons/autocannon/AutocannonBaseBlock.java
@@ -5,7 +5,11 @@
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.level.block.*;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.DirectionalBlock;
+import net.minecraft.world.level.block.Mirror;
+import net.minecraft.world.level.block.Rotation;
+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.state.properties.BlockStateProperties;
@@ -42,7 +46,9 @@ public void onRemove(BlockState state, Level level, BlockPos pos, BlockState new
 
     @Override
     public BlockState getStateForPlacement(BlockPlaceContext context) {
-        return this.defaultBlockState().setValue(FACING, context.getNearestLookingDirection().getOpposite());
+		boolean waterlogged = context.getLevel().getFluidState(context.getClickedPos()).getType() == Fluids.WATER;
+        return this.defaultBlockState().setValue(FACING, context.getNearestLookingDirection().getOpposite())
+			.setValue(BlockStateProperties.WATERLOGGED, waterlogged);
     }
 
     @Override public BlockState rotate(BlockState state, Rotation rotation) { return state.setValue(FACING, rotation.rotate(state.getValue(FACING))); }

diff --git a/...ai/createbigcannons/munitions/autocannon/ammo_container/AutocannonAmmoContainerBlock.java b/...ai/createbigcannons/munitions/autocannon/ammo_container/AutocannonAmmoContainerBlock.java
@@ -63,7 +63,9 @@ protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockSt
 	@Override
 	@Nullable
 	public BlockState getStateForPlacement(BlockPlaceContext context) {
-		return this.defaultBlockState().setValue(AXIS, context.getHorizontalDirection().getAxis());
+		boolean waterlogged = context.getLevel().getFluidState(context.getClickedPos()).getType() == Fluids.WATER;
+		return this.defaultBlockState().setValue(AXIS, context.getHorizontalDirection().getAxis())
+			.setValue(WATERLOGGED, waterlogged);
 	}
 
 	@Override