Make desertShrubs check for waterlogged blocks instead of just water blocks (#1388)

src/main/java/carpet/helpers/BlockSaplingHelper.java

@@ -1,22 +0,0 @@
-package carpet.helpers;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.level.material.Material;
-
-public class BlockSaplingHelper
-{
-    // Added code for checking water for dead shrub rule
-    public static boolean hasWater(LevelAccessor worldIn, BlockPos pos)
-    {
-        for (BlockPos blockpos$mutableblockpos : BlockPos.betweenClosed(pos.offset(-4, -4, -4), pos.offset(4, 1, 4)))
-        {
-            if (worldIn.getBlockState(blockpos$mutableblockpos).getMaterial() == Material.WATER)
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-}

src/main/java/carpet/mixins/SaplingBlock_desertShrubsMixin.java

@@ -1,9 +1,8 @@
 package carpet.mixins;
 
 import carpet.CarpetSettings;
-import carpet.helpers.BlockSaplingHelper;
-import net.minecraft.tags.BiomeTags;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -11,6 +10,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import java.util.Random;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.tags.BiomeTags;
+import net.minecraft.tags.FluidTags;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.SaplingBlock;
 import net.minecraft.world.level.block.state.BlockState;
@@ -21,12 +24,26 @@ public abstract class SaplingBlock_desertShrubsMixin
     @Inject(method = "advanceTree", at = @At(value = "INVOKE", shift = At.Shift.BEFORE,
             target = "Lnet/minecraft/world/level/block/grower/AbstractTreeGrower;growTree(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/chunk/ChunkGenerator;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Ljava/util/Random;)Z"),
             cancellable = true)
-    private void onGenerate(ServerLevel serverWorld_1, BlockPos blockPos_1, BlockState blockState_1, Random random_1, CallbackInfo ci)
+    private void onGenerate(ServerLevel level, BlockPos pos, BlockState blockState, Random random, CallbackInfo ci)
     {
-        if(CarpetSettings.desertShrubs && serverWorld_1.getBiome(blockPos_1).is(BiomeTags.HAS_DESERT_PYRAMID) && !BlockSaplingHelper.hasWater(serverWorld_1, blockPos_1))
+        if (CarpetSettings.desertShrubs && level.getBiome(pos).is(BiomeTags.HAS_DESERT_PYRAMID) && !nearWater(level, pos))
         {
-            serverWorld_1.setBlock(blockPos_1, Blocks.DEAD_BUSH.defaultBlockState(), 3);
+            level.setBlock(pos, Blocks.DEAD_BUSH.defaultBlockState(), Block.UPDATE_ALL);
             ci.cancel();
         }
     }
+
+    @Unique
+    private static boolean nearWater(LevelAccessor level, BlockPos pos)
+    {
+        for (BlockPos blockPos : BlockPos.betweenClosed(pos.offset(-4, -4, -4), pos.offset(4, 1, 4)))
+        {
+            if (level.getFluidState(blockPos).is(FluidTags.WATER))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }