Skip to content

Commit 8dad01e

Browse files
committed
fixed break manager rotations
1 parent df78c77 commit 8dad01e

File tree

5 files changed

+7
-13
lines changed

5 files changed

+7
-13
lines changed

common/src/main/kotlin/com/lambda/interaction/construction/context/BreakContext.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import com.lambda.context.SafeContext
2222
import com.lambda.graphics.renderer.esp.DirectionMask
2323
import com.lambda.graphics.renderer.esp.DirectionMask.exclude
2424
import com.lambda.interaction.construction.verify.TargetState
25-
import com.lambda.interaction.request.rotation.RotationRequest
25+
import com.lambda.interaction.request.rotation.visibilty.RotationTarget
2626
import com.lambda.util.world.raycast.RayCastUtils.distanceTo
2727
import net.minecraft.block.BlockState
2828
import net.minecraft.client.network.ClientPlayerInteractionManager
@@ -38,7 +38,7 @@ import java.awt.Color
3838
data class BreakContext(
3939
override val pov: Vec3d,
4040
override val result: BlockHitResult,
41-
override val rotation: RotationRequest,
41+
val rotation: RotationTarget,
4242
override var checkedState: BlockState,
4343
override val targetState: TargetState,
4444
override var hotbarIndex: Int,
@@ -64,7 +64,7 @@ data class BreakContext(
6464
override fun compareTo(other: BuildContext): Int {
6565
return when (other) {
6666
is BreakContext -> compareBy<BreakContext> {
67-
it.rotation.target.angleDistance
67+
it.rotation.angleDistance
6868
}.compare(this, other)
6969

7070
else -> 1

common/src/main/kotlin/com/lambda/interaction/construction/context/BuildContext.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import com.lambda.config.groups.BuildConfig
2121
import com.lambda.interaction.construction.result.Drawable
2222
import com.lambda.interaction.construction.verify.TargetState
2323
import com.lambda.interaction.material.container.MaterialContainer
24-
import com.lambda.interaction.request.rotation.RotationRequest
2524
import net.minecraft.block.BlockState
2625
import net.minecraft.item.ItemStack
2726
import net.minecraft.util.hit.BlockHitResult
@@ -37,7 +36,6 @@ interface BuildContext : Comparable<BuildContext>, Drawable {
3736
val expectedPos: BlockPos
3837
val checkedState: BlockState
3938
val hotbarIndex: Int
40-
val rotation: RotationRequest
4139

4240
fun shouldRotate(config: BuildConfig): Boolean
4341

common/src/main/kotlin/com/lambda/interaction/construction/context/PlaceContext.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import java.awt.Color
3535
data class PlaceContext(
3636
override val pov: Vec3d,
3737
override val result: BlockHitResult,
38-
override val rotation: RotationRequest,
38+
val rotation: RotationRequest,
3939
override val distance: Double,
4040
override val expectedState: BlockState,
4141
override val checkedState: BlockState,

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -457,13 +457,10 @@ object BuildSimulator {
457457
/* the player is buried inside the block */
458458
if (boxes.any { it.contains(eye) }) {
459459
currentCast?.blockResult?.let { blockHit ->
460-
val rotationRequest = RotationRequest(
461-
lookAtBlock(pos, config = interact), rotation
462-
)
463460
val breakContext = BreakContext(
464461
eye,
465462
blockHit,
466-
rotationRequest,
463+
lookAtBlock(pos, config = interact),
467464
state,
468465
targetState,
469466
player.inventory.selectedSlot,
@@ -511,11 +508,10 @@ object BuildSimulator {
511508
val bestHit = interact.pointSelection.select(validHits) ?: return acc
512509
val blockHit = bestHit.hit.blockResult ?: return acc
513510
val target = lookAt(bestHit.targetRotation, 0.001)
514-
val request = RotationRequest(target, rotation)
515511
val instant = instantBreakable(state, pos, build.breakSettings.breakThreshold)
516512

517513
val breakContext = BreakContext(
518-
eye, blockHit, request, state, targetState, player.inventory.selectedSlot, instant
514+
eye, blockHit, target, state, targetState, player.inventory.selectedSlot, instant
519515
)
520516

521517
if (gamemode.isCreative) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ object BreakManager : RequestHandler<BreakRequest>(), PositionBlocking {
267267
.filterNotNull()
268268
.firstOrNull { it.breakConfig.rotateForBreak }
269269
?.let { info ->
270-
info.rotationConfig.request(info.context.rotation)
270+
info.rotationConfig.request(RotationRequest(info.context.rotation, info.rotationConfig))
271271
}
272272
}
273273

0 commit comments

Comments
 (0)