allow disabling Rotate For Place while axis rotations are enabled to ignore needless rotation

Author: beanbag44

common/src/main/kotlin/com/lambda/config/groups/PlaceSettings.kt

@@ -30,7 +30,7 @@ class PlaceSettings(
     override val airPlace by c.setting("Air Place", AirPlaceMode.None, "Allows for placing blocks without adjacent faces") { vis() }
     override val axisRotateSetting by c.setting("Axis Rotate", true, "Overrides the Rotate For Place setting and rotates the player on each axis to air place rotational blocks") { vis() && airPlace.isEnabled() }
     override val axisRotate
-        get() = rotateForPlace && airPlace.isEnabled() && axisRotateSetting
+        get() = airPlace.isEnabled() && axisRotateSetting
     override val placeConfirmationMode by c.setting("Place Confirmation", PlaceConfirmationMode.PlaceThenAwait, "Wait for block placement confirmation") { vis() }
     override val maxPendingPlacements by c.setting("Max Pending Placements", 5, 0..30, 1, "The maximum amount of pending placements") { vis() }
     override val placementsPerTick by c.setting("Instant Places Per Tick", 1, 1..30, 1, "Maximum instant block places per tick") { vis() }

common/src/main/kotlin/com/lambda/interaction/construction/simulation/BuildSimulator.kt

@@ -60,6 +60,7 @@ import com.lambda.util.player.copyPlayer
 import com.lambda.util.player.gamemode
 import com.lambda.util.player.placementRotations
 import com.lambda.util.world.raycast.RayCastUtils.blockResult
+import net.minecraft.block.BlockState
 import net.minecraft.block.OperatorBlock
 import net.minecraft.block.pattern.CachedBlockPosition
 import net.minecraft.enchantment.Enchantments
@@ -293,10 +294,7 @@ object BuildSimulator {
                     context = checked
                 }
 
-                var resultState = blockItem.getPlacementState(context) ?: run {
-                    acc.add(PlaceResult.BlockedByEntity(pos))
-                    return@forEach
-                }
+                lateinit var resultState: BlockState
                 var rot = fakePlayer.rotation
 
                 val simulatePlaceState = placeState@ {
@@ -308,14 +306,13 @@ object BuildSimulator {
                             pos, resultState, context, (target as? TargetState.State)?.blockState
                         )
                     } else {
-                        rot = fakePlayer.rotation
                         return@placeState null
                     }
                 }
 
-                simulatePlaceState()?.let simulatePlaceState@ { placeResult ->
+                simulatePlaceState()?.let simulatePlaceState@ { basePlaceResult ->
                     if (!place.axisRotate) {
-                        acc.add(placeResult)
+                        acc.add(basePlaceResult)
                         return@forEach
                     }
                     placementRotations.forEachIndexed direction@ { index, angle ->
@@ -334,6 +331,7 @@ object BuildSimulator {
                             }
 
                             else -> {
+                                rot = fakePlayer.rotation
                                 return@simulatePlaceState
                             }
                         }

common/src/main/kotlin/com/lambda/interaction/request/placing/PlaceManager.kt

@@ -97,8 +97,7 @@ object PlaceManager : RequestHandler<PlaceRequest>(), PositionBlocking {
             currentRequest?.let { request ->
                 val notSneaking = !player.isSneaking
                 val hotbarRequest = request.hotbarConfig.request(HotbarRequest(request.placeContext.hotbarIndex))
-                val invalidRotation = request.buildConfig.placeSettings.rotateForPlace && !validRotation
-                if ((request.placeContext.sneak && notSneaking) || !hotbarRequest.done || invalidRotation)
+                if ((request.placeContext.sneak && notSneaking) || !hotbarRequest.done || !validRotation)
                     return@listen
 
                 val actionResult = placeBlock(request, Hand.MAIN_HAND)
@@ -128,7 +127,8 @@ object PlaceManager : RequestHandler<PlaceRequest>(), PositionBlocking {
                     return@onRotate
                 }
 
-                rotation = if (request.buildConfig.placeSettings.rotateForPlace)
+                val placeConfig = request.buildConfig.placeSettings
+                rotation = if (placeConfig.rotateForPlace || placeConfig.axisRotate)
                     request.rotationConfig.request(request.placeContext.rotation)
                 else null