remove unnecessary blockstate params

Author: beanbag44

src/main/kotlin/com/lambda/interaction/construction/simulation/ISimInfo.kt

@@ -47,7 +47,7 @@ interface ISimInfo : Automated {
         if (targetState.matches(state, pos, if (!complete) preProcessing.ignore else emptySet())) return true
         else if (complete) return false
 
-        intermediaryBlockMap[targetState.getState(pos, state).block]?.let { intermediaryInfo ->
+        intermediaryBlockMap[targetState.getState(pos).block]?.let { intermediaryInfo ->
             return intermediaryInfo.isIntermediaryBlock(state)
         }
 

src/main/kotlin/com/lambda/interaction/construction/simulation/checks/BreakSim.kt

@@ -90,7 +90,7 @@ class BreakSim private constructor(simInfo: ISimInfo)
             return
         }
 
-        if (targetState.getState(pos, state).isAir && !state.fluidState.isEmpty && state.isReplaceable) {
+        if (targetState.getState(pos).isAir && !state.fluidState.isEmpty && state.isReplaceable) {
             result(BreakResult.Submerge(pos, state))
             sim(pos, state, TargetState.Solid(emptySet())) { simPlacement() }
             return

src/main/kotlin/com/lambda/interaction/construction/simulation/checks/PlaceSim.kt

@@ -121,11 +121,11 @@ class PlaceSim private constructor(simInfo: ISimInfo)
 
         val validHits = scanShape(pov, shape, pos, setOf(side), preProcessing) ?: return
 
-        selectHitPos(validHits, fakePlayer, targetState.getStack(this@PlaceSim.pos, state).blockItem, supervisorScope)
+        selectHitPos(validHits, fakePlayer, targetState.getStack(this@PlaceSim.pos).blockItem, supervisorScope)
     }
 
     private fun AutomatedSafeContext.getSwapStack(): ItemStack? {
-        val optimalStack = targetState.getStack(pos, state)
+        val optimalStack = targetState.getStack(pos)
         val stackSelection = optimalStack.item.select()
         val containerSelection = selectContainer { ofAnyType(MaterialContainer.Rank.Hotbar) }
         val container = stackSelection.containerWithMaterial(containerSelection).firstOrNull() ?: run {

src/main/kotlin/com/lambda/interaction/construction/simulation/checks/PostProcessingSim.kt

@@ -66,7 +66,7 @@ class PostProcessingSim private constructor(simInfo: ISimInfo)
     private suspend fun AutomatedSafeContext.simPostProcessing() {
         val targetState = (targetState as? TargetState.State) ?: return
 
-        intermediaryBlockMap[targetState.getState(pos, state).block]?.let { intermediaryInfo ->
+        intermediaryBlockMap[targetState.getState(pos).block]?.let { intermediaryInfo ->
             intermediaryInfo.getIntermediaryProcess(state)?.let { intermediaryBlock ->
                 simInteraction(
                     intermediaryBlock.targetBlock.defaultState,

src/main/kotlin/com/lambda/interaction/construction/verify/StateMatcher.kt

@@ -33,8 +33,8 @@ interface StateMatcher {
     ): Boolean
 
     context(automatedSafeContext: AutomatedSafeContext)
-    fun getStack(pos: BlockPos, state: BlockState): ItemStack
+    fun getStack(pos: BlockPos): ItemStack
     context(automatedSafeContext: AutomatedSafeContext)
-    fun getState(pos: BlockPos, state: BlockState): BlockState
+    fun getState(pos: BlockPos): BlockState
     fun isEmpty(): Boolean
 }

src/main/kotlin/com/lambda/interaction/construction/verify/TargetState.kt

@@ -52,10 +52,10 @@ sealed class TargetState(val type: Type) : StateMatcher {
         ) = state.isEmpty
 
         context(_: AutomatedSafeContext)
-        override fun getStack(pos: BlockPos, state: BlockState): ItemStack = ItemStack.EMPTY
+        override fun getStack(pos: BlockPos): ItemStack = ItemStack.EMPTY
 
         context(automatedSafeContext: AutomatedSafeContext)
-        override fun getState(pos: BlockPos, state: BlockState) = automatedSafeContext.blockState(pos).emptyState
+        override fun getState(pos: BlockPos) = automatedSafeContext.blockState(pos).emptyState
 
         override fun isEmpty() = true
     }
@@ -71,10 +71,10 @@ sealed class TargetState(val type: Type) : StateMatcher {
         ) = state.isAir
 
         context(_: AutomatedSafeContext)
-        override fun getStack(pos: BlockPos, state: BlockState): ItemStack = ItemStack.EMPTY
+        override fun getStack(pos: BlockPos): ItemStack = ItemStack.EMPTY
 
         context(_: AutomatedSafeContext)
-        override fun getState(pos: BlockPos, state: BlockState): BlockState = Blocks.AIR.defaultState
+        override fun getState(pos: BlockPos): BlockState = Blocks.AIR.defaultState
 
         override fun isEmpty() = true
     }
@@ -90,15 +90,15 @@ sealed class TargetState(val type: Type) : StateMatcher {
         ) = with(safeContext) { state.isSolidBlock(world, pos) && state.block !in replace }
 
         context(automatedSafeContext: AutomatedSafeContext)
-        override fun getStack(pos: BlockPos, state: BlockState) =
+        override fun getStack(pos: BlockPos) =
             with(automatedSafeContext) {
                 findDisposable()?.stacks?.firstOrNull {
                     it.item.block in inventoryConfig.disposables && it.item.block !in replace
                 } ?: ItemStack(Items.NETHERRACK)
             }
 
         context(_: AutomatedSafeContext)
-        override fun getState(pos: BlockPos, state: BlockState): BlockState = getStack(pos, state).item.block.defaultState
+        override fun getState(pos: BlockPos): BlockState = getStack(pos).item.block.defaultState
 
         override fun isEmpty() = false
     }
@@ -117,15 +117,15 @@ sealed class TargetState(val type: Type) : StateMatcher {
         }
 
         context(automatedSafeContext: AutomatedSafeContext)
-        override fun getStack(pos: BlockPos, state: BlockState) =
+        override fun getStack(pos: BlockPos) =
             with(automatedSafeContext) {
                 findDisposable()?.stacks?.firstOrNull {
                     it.item.block in inventoryConfig.disposables
                 } ?: ItemStack(Items.NETHERRACK)
             }
 
         context(_: AutomatedSafeContext)
-        override fun getState(pos: BlockPos, state: BlockState): BlockState = getStack(pos, state).item.block.defaultState
+        override fun getState(pos: BlockPos): BlockState = getStack(pos).item.block.defaultState
 
         override fun isEmpty() = false
     }
@@ -142,12 +142,12 @@ sealed class TargetState(val type: Type) : StateMatcher {
             state.matches(blockState, ignoredProperties)
 
         context(automatedSafeContext: AutomatedSafeContext)
-        override fun getStack(pos: BlockPos, state: BlockState): ItemStack =
+        override fun getStack(pos: BlockPos): ItemStack =
             intermediaryBlockMap[blockState.block]?.startBlock?.item?.defaultStack
                 ?: blockState.block.getPickStack(automatedSafeContext.world, pos, blockState, true)
 
         context(_: AutomatedSafeContext)
-        override fun getState(pos: BlockPos, state: BlockState): BlockState = blockState
+        override fun getState(pos: BlockPos): BlockState = blockState
 
         override fun isEmpty() = blockState.isEmpty
     }
@@ -163,11 +163,11 @@ sealed class TargetState(val type: Type) : StateMatcher {
         ) = state.block == block
 
         context(automatedSafeContext: AutomatedSafeContext)
-        override fun getStack(pos: BlockPos, state: BlockState): ItemStack =
+        override fun getStack(pos: BlockPos): ItemStack =
             block.getPickStack(automatedSafeContext.world, pos, block.defaultState, true)
 
         context(_: AutomatedSafeContext)
-        override fun getState(pos: BlockPos, state: BlockState): BlockState = block.defaultState
+        override fun getState(pos: BlockPos): BlockState = block.defaultState
 
         override fun isEmpty() = block.defaultState.isEmpty
     }
@@ -186,11 +186,11 @@ sealed class TargetState(val type: Type) : StateMatcher {
         ) = state.block == block
 
         context(automatedSafeContext: AutomatedSafeContext)
-        override fun getStack(pos: BlockPos, state: BlockState): ItemStack =
-            intermediaryBlockMap[getState(pos, state).block]?.startBlock?.item?.defaultStack ?: itemStack
+        override fun getStack(pos: BlockPos): ItemStack =
+            intermediaryBlockMap[getState(pos).block]?.startBlock?.item?.defaultStack ?: itemStack
 
         context(_: AutomatedSafeContext)
-        override fun getState(pos: BlockPos, state: BlockState): BlockState = block.defaultState
+        override fun getState(pos: BlockPos): BlockState = block.defaultState
 
         override fun isEmpty() = false
     }