use isEmpty over isAir to account for waterloggable blocks

Author: beanbag44

common/src/main/kotlin/com/lambda/interaction/request/breaking/BreakManager.kt

@@ -37,17 +37,18 @@ import com.lambda.interaction.request.breaking.BreakManager.activeRequest
 import com.lambda.interaction.request.breaking.BreakManager.processRequest
 import com.lambda.interaction.request.breaking.BreakType.Primary
 import com.lambda.interaction.request.breaking.BreakType.ReBreak
-import com.lambda.interaction.request.breaking.BrokenBlockHandler.brokenState
 import com.lambda.interaction.request.breaking.BrokenBlockHandler.destroyBlock
-import com.lambda.interaction.request.breaking.BrokenBlockHandler.isBroken
 import com.lambda.interaction.request.breaking.BrokenBlockHandler.pendingBreaks
 import com.lambda.interaction.request.breaking.BrokenBlockHandler.setPendingConfigs
 import com.lambda.interaction.request.breaking.BrokenBlockHandler.startPending
 import com.lambda.interaction.request.placing.PlaceManager
 import com.lambda.interaction.request.rotation.RotationRequest
 import com.lambda.threading.runSafe
 import com.lambda.util.BlockUtils.blockState
+import com.lambda.util.BlockUtils.brokenState
 import com.lambda.util.BlockUtils.calcItemBlockBreakingDelta
+import com.lambda.util.BlockUtils.isBroken
+import com.lambda.util.BlockUtils.isEmpty
 import com.lambda.util.Communication.warn
 import com.lambda.util.item.ItemUtils.block
 import com.lambda.util.player.gamemode
@@ -309,7 +310,7 @@ object BreakManager : RequestHandler<BreakRequest>(
                 }
         }
 
-        return !blockState(ctx.expectedPos).isAir
+        return !blockState(ctx.expectedPos).isEmpty
     }
 
     /**
@@ -553,7 +554,7 @@ object BreakManager : RequestHandler<BreakRequest>(
         }
 
         val blockState = blockState(ctx.expectedPos)
-        if (blockState.isAir) {
+        if (blockState.isEmpty) {
             info.nullify()
             info.internalOnCancel()
             return false
@@ -644,13 +645,13 @@ object BreakManager : RequestHandler<BreakRequest>(
         lastPosStarted = ctx.expectedPos
 
         val blockState = blockState(ctx.expectedPos)
-        val notAir = !blockState.isAir
-        if (notAir && info.breakingTicks == 0) {
+        val notEmpty = !blockState.isEmpty
+        if (notEmpty && info.breakingTicks == 0) {
             blockState.onBlockBreakStart(world, ctx.expectedPos, player)
         }
 
         val breakDelta = blockState.calcBlockBreakingDelta(player, world, ctx.expectedPos)
-        if (notAir && breakDelta >= info.getBreakThreshold()) {
+        if (notEmpty && breakDelta >= info.getBreakThreshold()) {
             onBlockBreak(info)
         } else {
             info.apply {

common/src/main/kotlin/com/lambda/interaction/request/breaking/BrokenBlockHandler.kt

@@ -29,7 +29,9 @@ import com.lambda.interaction.request.breaking.BreakManager.lastPosStarted
 import com.lambda.interaction.request.breaking.BreakManager.matchesBlockItem
 import com.lambda.interaction.request.breaking.ReBreakManager.reBreak
 import com.lambda.module.modules.client.TaskFlowModule
+import com.lambda.util.BlockUtils.brokenState
 import com.lambda.util.BlockUtils.fluidState
+import com.lambda.util.BlockUtils.isBroken
 import com.lambda.util.BlockUtils.matches
 import com.lambda.util.Communication.info
 import com.lambda.util.Communication.warn
@@ -184,8 +186,4 @@ object BrokenBlockHandler {
 
         return setState
     }
-
-    val BlockState.isEmpty get() = matches(fluidState.blockState)
-    val BlockState.brokenState: BlockState get() = fluidState.blockState
-    fun isBroken(oldState: BlockState, newState: BlockState) = !oldState.isEmpty && oldState.brokenState.matches(newState)
 }

common/src/main/kotlin/com/lambda/interaction/request/breaking/ReBreakManager.kt

@@ -23,8 +23,8 @@ import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.event.listener.UnsafeListener.Companion.listenUnsafe
 import com.lambda.interaction.construction.context.BreakContext
 import com.lambda.interaction.request.breaking.BrokenBlockHandler.destroyBlock
-import com.lambda.interaction.request.breaking.BrokenBlockHandler.isEmpty
 import com.lambda.threading.runSafe
+import com.lambda.util.BlockUtils.isEmpty
 import com.lambda.util.player.swingHand
 import net.minecraft.util.Hand
 

common/src/main/kotlin/com/lambda/util/BlockUtils.kt

@@ -309,4 +309,8 @@ object BlockUtils {
 
         return speedMultiplier
     }
+
+    val BlockState.isEmpty get() = matches(fluidState.blockState)
+    val BlockState.brokenState: BlockState get() = fluidState.blockState
+    fun isBroken(oldState: BlockState, newState: BlockState) = !oldState.isEmpty && oldState.brokenState.matches(newState)
 }