Fix duplicated sound and hand swing from Waterloggable

Author: NichtStudioCode

nova/src/main/kotlin/xyz/xenondevs/nova/world/block/behavior/Waterloggable.kt

@@ -1,5 +1,6 @@
 package xyz.xenondevs.nova.world.block.behavior
 
+import net.minecraft.world.level.block.state.properties.BlockStateProperties
 import org.bukkit.GameMode
 import org.bukkit.Material
 import org.bukkit.Sound
@@ -9,7 +10,9 @@ import xyz.xenondevs.nova.context.param.DefaultContextParamTypes
 import xyz.xenondevs.nova.util.BlockUtils
 import xyz.xenondevs.nova.world.BlockPos
 import xyz.xenondevs.nova.world.block.state.NovaBlockState
+import xyz.xenondevs.nova.world.block.state.model.BackingStateBlockModelProvider
 import xyz.xenondevs.nova.world.block.state.model.DisplayEntityBlockModelProvider
+import xyz.xenondevs.nova.world.block.state.model.ModelLessBlockModelProvider
 import xyz.xenondevs.nova.world.block.state.property.DefaultBlockStateProperties.WATERLOGGED
 import xyz.xenondevs.nova.world.block.tileentity.network.type.fluid.FluidType
 import xyz.xenondevs.nova.world.player.swingHandEventless
@@ -36,16 +39,20 @@ object Waterloggable : BlockBehavior {
             if (player.gameMode != GameMode.CREATIVE) {
                 Bucketable.emptyBucketInHand(player, hand)
             }
-            pos.playSound(Sound.ITEM_BUCKET_EMPTY, 1f, 1f)
-            player.swingHandEventless(hand)
+            if (hasNoWaterloggingPrediction(state)) {
+                pos.playSound(Sound.ITEM_BUCKET_EMPTY, 1f, 1f)
+                player.swingHandEventless(hand)
+            }
             return true
         } else if (isWaterlogged && itemStack.type == Material.BUCKET) {
             BlockUtils.updateBlockState(pos, state.with(WATERLOGGED, false))
             if (player.gameMode != GameMode.CREATIVE) {
                 Bucketable.fillBucketInHand(player, hand, FluidType.WATER)
             }
-            pos.playSound(Sound.ITEM_BUCKET_FILL, 1f, 1f)
-            player.swingHandEventless(hand)
+            if (hasNoWaterloggingPrediction(state)) {
+                pos.playSound(Sound.ITEM_BUCKET_FILL, 1f, 1f)
+                player.swingHandEventless(hand)
+            }
             return true
         }
 
@@ -56,4 +63,13 @@ object Waterloggable : BlockBehavior {
         (state.modelProvider as? DisplayEntityBlockModelProvider)?.updateWaterlogEntity(pos)
     }
 
+    private fun hasNoWaterloggingPrediction(state: NovaBlockState): Boolean {
+        val bs = when (val mp = state.modelProvider) {
+            is DisplayEntityBlockModelProvider -> mp.info.hitboxType
+            is BackingStateBlockModelProvider -> mp.info.vanillaBlockState
+            is ModelLessBlockModelProvider -> mp.info
+        }
+        return !bs.hasProperty(BlockStateProperties.WATERLOGGED)
+    }
+    
 }