Skip to content

Commit 2787e2d

Browse files
beanbag44beanbag44
committed
Merge branch '1.21.5' into feature/manager-loggers
# Conflicts: # src/main/kotlin/com/lambda/interaction/request/breaking/BreakManager.kt
2 parents 859e0d2 + df30395 commit 2787e2d

File tree

4 files changed

+33
-35
lines changed

4 files changed

+33
-35
lines changed

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

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -553,8 +553,8 @@ object BreakManager : RequestHandler<BreakRequest>(
553553
}
554554

555555
logger.debug("Transforming ${primaryInfo.type} to $Secondary")
556-
primaryInfo.stopBreakPacket(world, interaction)
557556
secondaryBreak = primaryInfo.apply { type = Secondary }
557+
secondaryBreak?.stopBreakPacket(world, interaction)
558558
return@let
559559
}
560560

@@ -751,12 +751,8 @@ object BreakManager : RequestHandler<BreakRequest>(
751751
}
752752

753753
info.breakingTicks++
754-
val progress = blockState.calcBreakDelta(
755-
player,
756-
world,
757-
ctx.blockPos,
758-
config
759-
) * (info.breakingTicks - config.fudgeFactor)
754+
val breakDelta = blockState.calcBreakDelta(player, world, ctx.blockPos, config)
755+
val progress = breakDelta * (info.breakingTicks - config.fudgeFactor)
760756
logger.debug("${info.type} progress: $progress, breaking ticks: ${info.breakingTicks}, ${info.context.cachedState}")
761757

762758
if (config.sounds) {
@@ -785,7 +781,7 @@ object BreakManager : RequestHandler<BreakRequest>(
785781
}
786782

787783
val swing = config.swing
788-
if (progress >= info.getBreakThreshold() && info.swapInfo.canCompleteBreak) {
784+
if (progress >= info.getBreakThreshold() && info.swapInfo.validSwap) {
789785
logger.success("Breaking $info")
790786
if (info.type == Primary) {
791787
onBlockBreak(info)
@@ -862,8 +858,11 @@ object BreakManager : RequestHandler<BreakRequest>(
862858
}
863859

864860
val progress = blockState.calcBreakDelta(player, world, ctx.blockPos, info.breakConfig)
865-
info.vanillaInstantBreakable = progress >= 1 && info.swapInfo.canCompleteBreak
866-
if (progress >= info.getBreakThreshold() && info.swapInfo.canCompleteBreak) {
861+
862+
val instantBreakable = progress >= info.getBreakThreshold() && info.swapInfo.validSwap
863+
info.vanillaInstantBreakable = progress >= 1 && info.swapInfo.validSwap
864+
865+
if (instantBreakable) {
867866
logger.success("Instantly breaking ${info.type} $blockState")
868867
onBlockBreak(info)
869868
if (!info.vanillaInstantBreakable) breakCooldown = info.breakConfig.breakDelay
@@ -885,7 +884,7 @@ object BreakManager : RequestHandler<BreakRequest>(
885884

886885
info.startBreakPacket(world, interaction)
887886

888-
if (info.type == Secondary || (!info.vanillaInstantBreakable && progress >= info.breakConfig.breakThreshold)) {
887+
if (info.type == Secondary || (instantBreakable && !info.vanillaInstantBreakable)) {
889888
info.stopBreakPacket(world, interaction)
890889
}
891890

@@ -897,10 +896,9 @@ object BreakManager : RequestHandler<BreakRequest>(
897896
world: BlockView,
898897
pos: BlockPos,
899898
config: BreakConfig,
900-
item: ItemStack? = null,
901-
ignoreEfficiency: Boolean = false
899+
item: ItemStack? = null
902900
) = runSafe {
903-
val delta = calcItemBlockBreakingDelta(player, world, pos, item ?: player.mainHandStack, ignoreEfficiency)
901+
val delta = calcItemBlockBreakingDelta(player, world, pos, item ?: player.mainHandStack)
904902
//ToDo: This setting requires some fixes / improvements in the player movement prediction to work properly. Currently, it's broken
905903
// if (config.desyncFix) {
906904
// val nextTickPrediction = buildPlayerPrediction().next()

‎src/main/kotlin/com/lambda/interaction/request/breaking/RebreakHandler.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ object RebreakHandler {
8989
val context = reBreak.context
9090
val breakDelta = context.cachedState.calcBreakDelta(player, world, context.blockPos, reBreak.breakConfig)
9191
val breakTicks = reBreak.breakingTicks - reBreak.breakConfig.fudgeFactor
92-
return@runSafe if (breakTicks * breakDelta >= reBreak.getBreakThreshold() && reBreak.swapInfo.canCompleteBreak) {
92+
return@runSafe if (breakTicks * breakDelta >= reBreak.getBreakThreshold() && reBreak.swapInfo.validSwap) {
9393
if (reBreak.breakConfig.breakConfirmation != BreakConfig.BreakConfirmationMode.AwaitThenBreak) {
9494
destroyBlock(reBreak)
9595
}

‎src/main/kotlin/com/lambda/interaction/request/breaking/SwapInfo.kt‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
package com.lambda.interaction.request.breaking
1919

20+
import com.lambda.Lambda.mc
2021
import com.lambda.interaction.request.breaking.BreakInfo.BreakType.Primary
2122
import com.lambda.interaction.request.breaking.BreakInfo.BreakType.Rebreak
2223
import com.lambda.interaction.request.breaking.BreakManager.calcBreakDelta
@@ -27,14 +28,18 @@ import net.minecraft.item.ItemStack
2728
import net.minecraft.world.BlockView
2829

2930
data class SwapInfo(
30-
val type: BreakInfo.BreakType,
31-
val breakConfig: BreakConfig = TaskFlowModule.build.breaking,
31+
private val type: BreakInfo.BreakType,
32+
private val breakConfig: BreakConfig = TaskFlowModule.build.breaking,
3233
val swap: Boolean = false,
3334
val minKeepTicks: Int = 0,
3435
) {
35-
val canCompleteBreak
36-
get() = BreakManager.heldTicks >= if (type == Primary || type == Rebreak) breakConfig.serverSwapTicks
37-
else breakConfig.serverSwapTicks.coerceAtLeast(3)
36+
val validSwap
37+
get() = run {
38+
val serverSwapTicks = if (type == Primary || type == Rebreak) breakConfig.serverSwapTicks
39+
else breakConfig.serverSwapTicks.coerceAtLeast(3)
40+
41+
(mc.player?.mainHandStack?.heldTicks ?: return false) >= serverSwapTicks
42+
}
3843

3944
companion object {
4045
val EMPTY = SwapInfo(Primary)
@@ -46,8 +51,6 @@ data class SwapInfo(
4651
): SwapInfo = with(info) {
4752
val breakDelta = context.cachedState
4853
.calcBreakDelta(player, world, context.blockPos, breakConfig, swapStack)
49-
val breakDeltaNoEfficiency = context.cachedState
50-
.calcBreakDelta(player, world, context.blockPos, breakConfig, swapStack, ignoreEfficiency = true)
5154

5255
val threshold = getBreakThreshold()
5356

@@ -56,16 +59,14 @@ data class SwapInfo(
5659
else breakingTicks).let {
5760
// Plus one as this is calculated before this ticks progress is calculated and the breakingTicks are incremented
5861
(it + 1).let {
59-
if (breakDelta >= threshold) it else it - breakConfig.fudgeFactor
62+
if (breakDelta >= threshold || !info.breaking) it else (it - breakConfig.fudgeFactor)
6063
}
6164
}
6265

6366
val minKeepTicks = run {
6467
if (type == Primary) {
6568
val swapTickProgress = breakDelta * (breakTicks + breakConfig.serverSwapTicks - 1)
66-
val withoutEfficiency = breakDeltaNoEfficiency * breakTicks >= threshold
67-
if (swapTickProgress >= threshold &&
68-
!withoutEfficiency) 1
69+
if (swapTickProgress >= threshold) 1
6970
else 0
7071
} else {
7172
val serverSwapTicks = breakConfig.serverSwapTicks.coerceAtLeast(3)
@@ -91,7 +92,7 @@ data class SwapInfo(
9192
}
9293

9394
private val ItemStack.heldTicks
94-
get() = if (currentStack == this)
95+
get() = if (this == currentStack)
9596
BreakManager.heldTicks
9697
else 0
9798
}

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -256,13 +256,12 @@ object BlockUtils {
256256
player: PlayerEntity,
257257
world: BlockView,
258258
blockPos: BlockPos,
259-
item: ItemStack,
260-
ignoreEfficiency: Boolean = false
259+
item: ItemStack
261260
): Float {
262261
val hardness = getHardness(world, blockPos)
263262
return if (hardness == -1.0f) 0.0f else {
264263
val harvestMultiplier = if (item.canHarvest(this)) 30 else 100
265-
player.getItemBlockBreakingSpeed(this, item, ignoreEfficiency) / hardness / harvestMultiplier
264+
player.getItemBlockBreakingSpeed(this, item) / hardness / harvestMultiplier
266265
}
267266
}
268267

@@ -271,14 +270,13 @@ object BlockUtils {
271270

272271
fun PlayerEntity.getItemBlockBreakingSpeed(
273272
blockState: BlockState,
274-
item: ItemStack,
275-
ignoreEfficiency: Boolean = false
273+
item: ItemStack
276274
): Float {
277275
var speedMultiplier = item.getMiningSpeedMultiplier(blockState)
278276
if (speedMultiplier > 1.0f) {
279-
val level = if (ignoreEfficiency) 0 else item.getEnchantment(Enchantments.EFFICIENCY)
280-
if (level > 0 && !item.isEmpty) {
281-
speedMultiplier += (level * level + 1)
277+
speedMultiplier += item.getEnchantment(Enchantments.EFFICIENCY).let {
278+
if (it > 0) (it * it) + 1
279+
else 0
282280
}
283281
}
284282

@@ -298,6 +296,7 @@ object BlockUtils {
298296
speedMultiplier *= fatigueMultiplier
299297
}
300298

299+
speedMultiplier *= getAttributeValue(EntityAttributes.BLOCK_BREAK_SPEED).toFloat()
301300
if (isSubmergedIn(FluidTags.WATER)) {
302301
getAttributeInstance(EntityAttributes.SUBMERGED_MINING_SPEED)?.let { speed ->
303302
speedMultiplier *= speed.getValue().toFloat()

0 commit comments

Comments
 (0)