Refactor BlockPos.blockState(world) to SafeContext.blockState(pos)

Avanatiker · Avanatiker · commit b0ccf8e8f802 · 2025-02-09T18:48:16.000+01:00
diff --git a/common/src/main/kotlin/com/lambda/graphics/renderer/esp/builders/StaticESPBuilders.kt b/common/src/main/kotlin/com/lambda/graphics/renderer/esp/builders/StaticESPBuilders.kt
@@ -37,7 +37,7 @@ fun StaticESPRenderer.ofShape(
     sides: Int = DirectionMask.ALL,
     outlineMode: DirectionMask.OutlineMode = DirectionMask.OutlineMode.OR
 ) = runSafe {
-    val shape = pos.blockState(world).getOutlineShape(world, pos)
+    val shape = blockState(pos).getOutlineShape(world, pos)
     ofShape(pos, shape, filledColor, outlineColor, sides, outlineMode)
 }
 
@@ -92,7 +92,7 @@ fun StaticESPRenderer.buildFilledShape(
     color: Color,
     sides: Int = DirectionMask.ALL,
 ) = runSafe {
-    val shape = pos.blockState(world).getOutlineShape(world, pos)
+    val shape = blockState(pos).getOutlineShape(world, pos)
     buildFilledShape(shape, color, sides)
 }
 
@@ -129,7 +129,7 @@ fun StaticESPRenderer.buildOutlineShape(
     sides: Int = DirectionMask.ALL,
     outlineMode: DirectionMask.OutlineMode = DirectionMask.OutlineMode.OR
 ) = runSafe {
-    val shape = pos.blockState(world).getOutlineShape(world, pos)
+    val shape = blockState(pos).getOutlineShape(world, pos)
     buildOutlineShape(shape, color, sides, outlineMode)
 }
 
diff --git a/common/src/main/kotlin/com/lambda/interaction/blockplace/PlaceFinder.kt b/common/src/main/kotlin/com/lambda/interaction/blockplace/PlaceFinder.kt
@@ -86,7 +86,7 @@ class PlaceFinder(
         val distSq = eyes distSq hitVec
 
         if (distSq > rangeSq) return null
-        if (clickPos.blockState(world).isClickable) return null
+        if (blockState(clickPos).isClickable) return null
 
         if (visibleCheck) {
             val box = Box(clickPos)
diff --git a/common/src/main/kotlin/com/lambda/interaction/construction/context/PlaceContext.kt b/common/src/main/kotlin/com/lambda/interaction/construction/context/PlaceContext.kt
@@ -95,7 +95,7 @@ data class PlaceContext(
 
     override fun SafeContext.buildRenderer() {
         withState(expectedState, expectedPos, baseColor, DirectionMask.ALL.exclude(result.side.opposite))
-        withState(result.blockPos.blockState(world), result.blockPos, sideColor, result.side)
+        withState(blockState(result.blockPos), result.blockPos, sideColor, result.side)
     }
 
     override fun shouldRotate(config: BuildConfig) = config.rotateForPlace
diff --git a/common/src/main/kotlin/com/lambda/interaction/construction/result/BuildResult.kt b/common/src/main/kotlin/com/lambda/interaction/construction/result/BuildResult.kt
@@ -209,7 +209,7 @@ abstract class BuildResult : ComparableResult<Rank>, Nameable {
             .transfer(MainHandContainer, inventory) ?: MaterialContainer.FailureTask("Couldn't find ${neededItem.name.string} anywhere.")
 
         override fun SafeContext.buildRenderer() {
-            if (blockPos.blockState(world).isAir) {
+            if (blockState(blockPos).isAir) {
                 withBox(Box(blockPos), color)
             } else {
                 withPos(blockPos, color)
@@ -246,7 +246,7 @@ abstract class BuildResult : ComparableResult<Rank>, Nameable {
                 .transfer(MainHandContainer, inventory) ?: MaterialContainer.FailureTask("Couldn't find ${neededStack.item.name.string} anywhere.")
 
         override fun SafeContext.buildRenderer() {
-            if (blockPos.blockState(world).isAir) {
+            if (blockState(blockPos).isAir) {
                 withBox(Box(blockPos), color)
             } else {
                 withPos(blockPos, color)
diff --git a/common/src/main/kotlin/com/lambda/interaction/construction/result/Drawable.kt b/common/src/main/kotlin/com/lambda/interaction/construction/result/Drawable.kt
@@ -51,7 +51,7 @@ interface Drawable {
     }
 
     fun SafeContext.withPos(blockPos: BlockPos, color: Color, mask: Int = DirectionMask.ALL) {
-        val shape = blockPos.blockState(world).getOutlineShape(world, blockPos)
+        val shape = blockState(blockPos).getOutlineShape(world, blockPos)
         withShape(shape, blockPos, color, mask)
     }
 
diff --git a/common/src/main/kotlin/com/lambda/interaction/construction/simulation/BuildSimulator.kt b/common/src/main/kotlin/com/lambda/interaction/construction/simulation/BuildSimulator.kt
@@ -100,7 +100,7 @@ object BuildSimulator {
             return BuildResult.ChunkNotLoaded(pos)
         }
 
-        val state = pos.blockState(world)
+        val state = blockState(pos)
 
         /* block is already in the correct state */
         if (target.matches(state, pos, world)) {
@@ -144,7 +144,7 @@ object BuildSimulator {
         inventory: InventoryConfig
     ): Set<BuildResult> {
         val acc = mutableSetOf<BuildResult>()
-        val targetPosState = pos.blockState(world)
+        val targetPosState = blockState(pos)
 
         if (target.isAir() || !targetPosState.isReplaceable) return acc
 
@@ -154,7 +154,7 @@ object BuildSimulator {
             val hitPos = if (targetPosState.isAir || targetPosState.isLiquid) pos.offset(neighbor) else pos
             val hitSide = neighbor.opposite
 
-            val voxelShape = hitPos.blockState(world).getOutlineShape(world, hitPos)
+            val voxelShape = blockState(hitPos).getOutlineShape(world, hitPos)
             if (voxelShape.isEmpty) return@forEach
 
             val boxes = voxelShape.boundingBoxes.map { it.offset(hitPos) }
@@ -278,7 +278,7 @@ object BuildSimulator {
                 }
 
                 val blockHit = checkedResult.blockResult ?: return@forEach
-                val hitBlock = blockHit.blockPos.blockState(world).block
+                val hitBlock = blockState(blockHit.blockPos).block
                 val shouldSneak = hitBlock::class in BlockUtils.interactionClasses
 
                 val primeDirection =
@@ -290,7 +290,7 @@ object BuildSimulator {
                     RotationRequest(lookAt(checkedHit.targetRotation, 0.001), rotation),
                     eye.distanceTo(blockHit.pos),
                     resultState,
-                    blockHit.blockPos.blockState(world),
+                    blockState(blockHit.blockPos),
                     Hand.MAIN_HAND,
                     context.blockPos,
                     target,
@@ -326,7 +326,7 @@ object BuildSimulator {
         build: BuildConfig
     ): Set<BuildResult> {
         val acc = mutableSetOf<BuildResult>()
-        val state = pos.blockState(world)
+        val state = blockState(pos)
 
         /* is a block that will be destroyed by breaking adjacent blocks */
         if (build.breakWeakBlocks && state.block.hardness == 0f && !state.isAir) {
@@ -339,7 +339,7 @@ object BuildSimulator {
         val aabb = Box(pBox.minX, pBox.minY - 1.0E-6, pBox.minZ, pBox.maxX, pBox.minY, pBox.maxZ)
         world.findSupportingBlockPos(player, aabb).orElse(null)?.let { support ->
             if (support != pos) return@let
-            val belowSupport = support.down().blockState(world)
+            val belowSupport = blockState(support.down())
             if (belowSupport.isSolidSurface(world, support, player, Direction.UP)) return@let
             acc.add(BreakResult.PlayerOnTop(pos, state))
             return acc
@@ -354,14 +354,14 @@ object BuildSimulator {
         }
 
         val adjacentLiquids = Direction.entries.filter {
-            it != Direction.DOWN && !pos.offset(it).blockState(world).fluidState.isEmpty
+            it != Direction.DOWN && !blockState(pos.offset(it)).fluidState.isEmpty
         }.map { pos.offset(it) }
 
         /* block has liquids next to it that will leak when broken */
         if (adjacentLiquids.isNotEmpty()) {
             acc.add(BreakResult.BlockedByLiquid(pos, state))
             adjacentLiquids.forEach { liquidPos ->
-                val submerge = if (liquidPos.blockState(world).isReplaceable) {
+                val submerge = if (blockState(liquidPos).isReplaceable) {
                     checkPlaceResults(liquidPos, TargetState.Solid, eye, interact, rotation, inventory)
                 } else {
                     checkBreakResults(liquidPos, eye, interact, rotation, inventory, build)
diff --git a/common/src/main/kotlin/com/lambda/interaction/construction/simulation/Simulation.kt b/common/src/main/kotlin/com/lambda/interaction/construction/simulation/Simulation.kt
@@ -58,7 +58,7 @@ data class Simulation(
         runSafe {
             if (isOutOfBounds && isTooFar) return@getOrPut emptySet()
             val blockPos = pos.toBlockPos()
-            val isWalkable = blockPos.down().blockState(world).isSideSolidFullSquare(world, blockPos, Direction.UP)
+            val isWalkable = blockState(blockPos.down()).isSideSolidFullSquare(world, blockPos, Direction.UP)
             if (!isWalkable) return@getOrPut emptySet()
             if (!playerFitsIn(blockPos)) return@getOrPut emptySet()
         }
diff --git a/common/src/main/kotlin/com/lambda/interaction/construction/verify/TargetState.kt b/common/src/main/kotlin/com/lambda/interaction/construction/verify/TargetState.kt
@@ -65,7 +65,7 @@ sealed class TargetState(val type: Type) : StateMatcher {
         override fun toString() = "Support for ${direction.name}"
 
         override fun matches(state: BlockState, pos: BlockPos, world: ClientWorld) =
-            pos.offset(direction).blockState(world).isSolidBlock(world, pos.offset(direction))
+            world.getBlockState(pos.offset(direction)).isSolidBlock(world, pos.offset(direction))
                     || state.isSolidBlock(world, pos)
 
         override fun getStack(world: ClientWorld, pos: BlockPos) =
diff --git a/common/src/main/kotlin/com/lambda/interaction/material/container/ContainerManager.kt b/common/src/main/kotlin/com/lambda/interaction/material/container/ContainerManager.kt
@@ -57,7 +57,7 @@ object ContainerManager : Loadable {
 
     init {
         listen<PlayerEvent.Interact.Block> {
-            lastInteractedBlockEntity = it.blockHitResult.blockPos.blockEntity(world)
+            lastInteractedBlockEntity = blockEntity(it.blockHitResult.blockPos)
         }
 
         listen<InventoryEvent.Close> { event ->
diff --git a/common/src/main/kotlin/com/lambda/interaction/request/rotation/visibilty/RequestedHit.kt b/common/src/main/kotlin/com/lambda/interaction/request/rotation/visibilty/RequestedHit.kt
@@ -104,7 +104,7 @@ abstract class RequestedHit {
         override val reach: Double
     ) : RequestedHit() {
         override fun getBoundingBoxes(): List<Box> = runSafe {
-            val state = blockPos.blockState(world)
+            val state = blockState(blockPos)
             val voxelShape = state.getOutlineShape(world, blockPos)
             voxelShape.boundingBoxes.map { it.offset(blockPos) }
         } ?: listOf(Box(blockPos))
diff --git a/common/src/main/kotlin/com/lambda/module/modules/combat/CrystalAura.kt b/common/src/main/kotlin/com/lambda/module/modules/combat/CrystalAura.kt
@@ -335,7 +335,7 @@ object CrystalAura : Module(
             target: LivingEntity
         ): Opportunity? {
             // Check if crystals could be placed on the base block
-            val state = pos.blockState(world)
+            val state = blockState(pos)
             val isOfBlock = state.isOf(Blocks.OBSIDIAN) || state.isOf(Blocks.BEDROCK)
             if (!isOfBlock) return null
 
diff --git a/common/src/main/kotlin/com/lambda/module/modules/player/Nuker.kt b/common/src/main/kotlin/com/lambda/module/modules/player/Nuker.kt
@@ -49,8 +49,8 @@ object Nuker : Module(
                         .map { it.blockPos }
                         .filter { !world.isAir(it) }
                         .filter { !flatten || it.y >= player.blockPos.y }
-                        .filter { !onlyBreakInstant || it.blockState(world).getHardness(world, it) <= 1 }
-                        .filter { it.blockState(world).getHardness(world, it) >= 0 }
+                        .filter { !onlyBreakInstant || blockState(it).getHardness(world, it) <= 1 }
+                        .filter { blockState(it).getHardness(world, it) >= 0 }
                         .associateWith { TargetState.Air }
 
                     if (fillFloor) {
diff --git a/common/src/main/kotlin/com/lambda/module/modules/player/PacketMine.kt b/common/src/main/kotlin/com/lambda/module/modules/player/PacketMine.kt
@@ -349,7 +349,7 @@ object PacketMine : Module(
 
                     mineTicks++
 
-                    val activeState = pos.blockState(world)
+                    val activeState = blockState(pos)
                     state = activeState
 
                     val empty = isStateEmpty(activeState)
@@ -517,7 +517,7 @@ object PacketMine : Module(
         listen<WorldEvent.BlockUpdate.Client> {
             currentMiningBlock.forEach { ctx ->
                 ctx?.apply {
-                    if (it.pos != pos || !isStateBroken(pos.blockState(world), it.newState)) return@forEach
+                    if (it.pos != pos || !isStateBroken(blockState(pos), it.newState)) return@forEach
 
                     if (breakType.isPrimary()) {
                         runHandlers(ProgressStage.PacketReceiveBreak, pos, lastValidBestTool)
@@ -596,7 +596,7 @@ object PacketMine : Module(
             if (renderQueueMode.isEnabled()) {
                 blockQueue.forEach { pos ->
                     var boxes = if (renderQueueMode == RenderQueueMode.Shape) {
-                        pos.blockState(world).getOutlineShape(world, pos).boundingBoxes
+                        blockState(pos).getOutlineShape(world, pos).boundingBoxes
                     } else {
                         listOf(Box(0.0, 0.0, 0.0, 1.0, 1.0, 1.0))
                     }
@@ -668,7 +668,7 @@ object PacketMine : Module(
     }
 
     private fun SafeContext.startBreaking(pos: BlockPos) {
-        val state = pos.blockState(world)
+        val state = blockState(pos)
         val bestTool = getBestTool(state, pos)
         if (!isStateEmpty(state)) lastNonEmptyState = state
 
diff --git a/common/src/main/kotlin/com/lambda/util/BlockUtils.kt b/common/src/main/kotlin/com/lambda/util/BlockUtils.kt
@@ -84,7 +84,6 @@ import net.minecraft.fluid.FluidState
 import net.minecraft.fluid.Fluids
 import net.minecraft.item.Item
 import net.minecraft.util.math.*
-import net.minecraft.world.BlockView
 
 object BlockUtils {
 
@@ -215,9 +214,10 @@ object BlockUtils {
         Fluids.EMPTY,
     )
 
-    fun BlockPos.blockState(world: BlockView): BlockState = world.getBlockState(this)
-    fun BlockPos.fluidState(world: BlockView): FluidState = world.getFluidState(this)
-    fun BlockPos.blockEntity(world: BlockView) = world.getBlockEntity(this)
+    fun SafeContext.blockState(pos: BlockPos): BlockState = world.getBlockState(pos)
+    fun SafeContext.fluidState(pos: BlockPos): FluidState = world.getFluidState(pos)
+    fun SafeContext.blockEntity(pos: BlockPos) = world.getBlockEntity(pos)
+
     fun SafeContext.instantBreakable(blockState: BlockState, blockPos: BlockPos): Boolean {
         val ticksNeeded = 1 / blockState.calcBlockBreakingDelta(player, world, blockPos)
         return (ticksNeeded <= 1 && ticksNeeded != 0f) || player.isCreative
diff --git a/common/src/main/kotlin/com/lambda/util/player/prediction/PredictionEntity.kt b/common/src/main/kotlin/com/lambda/util/player/prediction/PredictionEntity.kt
@@ -143,7 +143,7 @@ class PredictionEntity(val player: ClientPlayerEntity) {
             else -> 0.08
         }
 
-        val slipperiness = velocityAffectingPos.blockState(world).block.slipperiness.toDouble()
+        val slipperiness = blockState(velocityAffectingPos).block.slipperiness.toDouble()
         var friction = 0.91
 
         if (isOnGround) {
@@ -202,8 +202,8 @@ class PredictionEntity(val player: ClientPlayerEntity) {
         }
 
         val velocityMultiplier = run {
-            val f = position.flooredPos.blockState(world).block.velocityMultiplier.toDouble()
-            val g = velocityAffectingPos.blockState(world).block.velocityMultiplier.toDouble()
+            val f = blockState(position.flooredPos).block.velocityMultiplier.toDouble()
+            val g = blockState(velocityAffectingPos).block.velocityMultiplier.toDouble()
             if (f == 1.0) g else f
         }
 
@@ -226,8 +226,8 @@ class PredictionEntity(val player: ClientPlayerEntity) {
 
         /** @see net.minecraft.entity.Entity.getJumpVelocityMultiplier */
         val jumpHeight = run {
-            val f = position.flooredPos.blockState(world).block.jumpVelocityMultiplier.toDouble()
-            val g = velocityAffectingPos.blockState(world).block.jumpVelocityMultiplier.toDouble()
+            val f = blockState(position.flooredPos).block.jumpVelocityMultiplier.toDouble()
+            val g = blockState(velocityAffectingPos).block.jumpVelocityMultiplier.toDouble()
             if (f == 1.0) g else f
         } * 0.42 + player.jumpBoostVelocityModifier
 

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ data class PlaceContext(`
`95`	`95`
`96`	`96`	`override fun SafeContext.buildRenderer() {`
`97`	`97`	`withState(expectedState, expectedPos, baseColor, DirectionMask.ALL.exclude(result.side.opposite))`
`98`		`- withState(result.blockPos.blockState(world), result.blockPos, sideColor, result.side)`
	`98`	`+ withState(blockState(result.blockPos), result.blockPos, sideColor, result.side)`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`override fun shouldRotate(config: BuildConfig) = config.rotateForPlace`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ interface Drawable {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`fun SafeContext.withPos(blockPos: BlockPos, color: Color, mask: Int = DirectionMask.ALL) {`
`54`		`- val shape = blockPos.blockState(world).getOutlineShape(world, blockPos)`
	`54`	`+ val shape = blockState(blockPos).getOutlineShape(world, blockPos)`
`55`	`55`	`withShape(shape, blockPos, color, mask)`
`56`	`56`	`}`
`57`	`57`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ data class Simulation(`
`58`	`58`	`runSafe {`
`59`	`59`	`if (isOutOfBounds && isTooFar) return@getOrPut emptySet()`
`60`	`60`	`val blockPos = pos.toBlockPos()`
`61`		`- val isWalkable = blockPos.down().blockState(world).isSideSolidFullSquare(world, blockPos, Direction.UP)`
	`61`	`+ val isWalkable = blockState(blockPos.down()).isSideSolidFullSquare(world, blockPos, Direction.UP)`
`62`	`62`	`if (!isWalkable) return@getOrPut emptySet()`
`63`	`63`	`if (!playerFitsIn(blockPos)) return@getOrPut emptySet()`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ object ContainerManager : Loadable {`
`57`	`57`
`58`	`58`	`init {`
`59`	`59`	`listen<PlayerEvent.Interact.Block> {`
`60`		`- lastInteractedBlockEntity = it.blockHitResult.blockPos.blockEntity(world)`
	`60`	`+ lastInteractedBlockEntity = blockEntity(it.blockHitResult.blockPos)`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`listen<InventoryEvent.Close> { event ->`