Skip to content

Commit 3aaadfd

Browse files
beanbag44beanbag44
committed
rename RebreakManager to RebreakHandler
1 parent 2d0d955 commit 3aaadfd

5 files changed

Lines changed: 16 additions & 16 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ data class BreakInfo(
4545

4646
// Pre Processing
4747
var shouldProgress = false
48-
var rebreakPotential by OneSetPerTick(value = RebreakManager.RebreakPotential.None, throwOnLimitBreach = true)
48+
var rebreakPotential by OneSetPerTick(value = RebreakHandler.RebreakPotential.None, throwOnLimitBreach = true)
4949
var swapInfo by OneSetPerTick(value = SwapInfo.EMPTY, throwOnLimitBreach = true)
5050
var swapStack: ItemStack by OneSetPerTick(ItemStack.EMPTY, true)
5151

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ object BreakManager : RequestHandler<BreakRequest>(
157157

158158
var lastPosStarted: BlockPos? = null
159159
set(value) {
160-
if (value != field) RebreakManager.clearRebreak()
160+
if (value != field) RebreakHandler.clearRebreak()
161161
field = value
162162
}
163163

@@ -188,7 +188,7 @@ object BreakManager : RequestHandler<BreakRequest>(
188188
}
189189

190190
listen<WorldEvent.BlockUpdate.Server>(priority = Int.MIN_VALUE) { event ->
191-
if (event.pos == RebreakManager.rebreak?.context?.blockPos) return@listen
191+
if (event.pos == RebreakHandler.rebreak?.context?.blockPos) return@listen
192192

193193
breakInfos
194194
.firstOrNull { it?.context?.blockPos == event.pos }
@@ -207,7 +207,7 @@ object BreakManager : RequestHandler<BreakRequest>(
207207
info.request.onStop?.invoke(info.context.blockPos)
208208
info.internalOnBreak()
209209
if (info.callbacksCompleted)
210-
RebreakManager.offerRebreak(info)
210+
RebreakHandler.offerRebreak(info)
211211
else info.startPending()
212212
info.nullify()
213213
}
@@ -218,7 +218,7 @@ object BreakManager : RequestHandler<BreakRequest>(
218218
if (it.entity !is ItemEntity) return@listen
219219

220220
// ToDo: Proper item drop prediction system
221-
RebreakManager.rebreak?.let { reBreak ->
221+
RebreakHandler.rebreak?.let { reBreak ->
222222
if (matchesBlockItem(reBreak, it.entity)) return@listen
223223
}
224224

@@ -583,7 +583,7 @@ object BreakManager : RequestHandler<BreakRequest>(
583583
if (!info.callbacksCompleted) {
584584
info.startPending()
585585
} else {
586-
RebreakManager.offerRebreak(info)
586+
RebreakHandler.offerRebreak(info)
587587
}
588588
}
589589
BreakConfirmationMode.BreakThenAwait -> {
@@ -607,7 +607,7 @@ object BreakManager : RequestHandler<BreakRequest>(
607607
updatedPreProcessingThisTick = true
608608

609609
swapStack = player.inventory.getStack(context.hotbarIndex)
610-
rebreakPotential = RebreakManager.getRebreakPotential(this, player, world)
610+
rebreakPotential = RebreakHandler.getRebreakPotential(this, player, world)
611611
swapInfo = getSwapInfo(this, player, world)
612612
}
613613

@@ -771,11 +771,11 @@ object BreakManager : RequestHandler<BreakRequest>(
771771
val ctx = info.context
772772

773773
if (info.rebreakPotential.isPossible()) {
774-
when (val rebreakResult = RebreakManager.handleUpdate(info.context, info.request)) {
774+
when (val rebreakResult = RebreakHandler.handleUpdate(info.context, info.request)) {
775775
is RebreakResult.StillBreaking -> {
776776
primaryBreak = rebreakResult.breakInfo.apply {
777777
type = Primary
778-
RebreakManager.clearRebreak()
778+
RebreakHandler.clearRebreak()
779779
request.onStart?.invoke(ctx.blockPos)
780780
}
781781

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import com.lambda.interaction.request.PostActionHandler
2626
import com.lambda.interaction.request.breaking.BreakConfig.BreakConfirmationMode
2727
import com.lambda.interaction.request.breaking.BreakManager.lastPosStarted
2828
import com.lambda.interaction.request.breaking.BreakManager.matchesBlockItem
29-
import com.lambda.interaction.request.breaking.RebreakManager.rebreak
29+
import com.lambda.interaction.request.breaking.RebreakHandler.rebreak
3030
import com.lambda.module.modules.client.TaskFlowModule
3131
import com.lambda.threading.runSafe
3232
import com.lambda.util.BlockUtils.emptyState
@@ -105,7 +105,7 @@ object BrokenBlockHandler : PostActionHandler<BreakInfo>() {
105105
if (pending.callbacksCompleted) {
106106
pending.stopPending()
107107
if (lastPosStarted == pending.context.blockPos) {
108-
RebreakManager.offerRebreak(pending)
108+
RebreakHandler.offerRebreak(pending)
109109
}
110110
}
111111
return@listen
@@ -125,7 +125,7 @@ object BrokenBlockHandler : PostActionHandler<BreakInfo>() {
125125
if (pending.callbacksCompleted) {
126126
pending.stopPending()
127127
if (lastPosStarted == pending.context.blockPos) {
128-
RebreakManager.offerRebreak(pending)
128+
RebreakHandler.offerRebreak(pending)
129129
}
130130
}
131131
return@listen

src/main/kotlin/com/lambda/interaction/request/breaking/RebreakManager.kt renamed to src/main/kotlin/com/lambda/interaction/request/breaking/RebreakHandler.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import net.minecraft.client.network.ClientPlayerEntity
3131
import net.minecraft.util.Hand
3232
import net.minecraft.world.BlockView
3333

34-
object RebreakManager {
34+
object RebreakHandler {
3535
var rebreak: BreakInfo? = null
3636

3737
init {
@@ -83,7 +83,7 @@ object RebreakManager {
8383

8484
fun handleUpdate(ctx: BreakContext, breakRequest: BreakRequest) =
8585
runSafe {
86-
val reBreak = this@RebreakManager.rebreak ?: return@runSafe RebreakResult.Ignored
86+
val reBreak = this@RebreakHandler.rebreak ?: return@runSafe RebreakResult.Ignored
8787

8888
reBreak.updateInfo(ctx, breakRequest)
8989

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ data class SwapInfo(
5151

5252
val threshold = getBreakThreshold()
5353

54-
val breakTicks = (if (rebreakPotential.isPossible()) RebreakManager.rebreak?.breakingTicks
54+
val breakTicks = (if (rebreakPotential.isPossible()) RebreakHandler.rebreak?.breakingTicks
5555
?: throw IllegalStateException("Rebreak BreakInfo was null when rebreak was considered possible")
5656
else breakingTicks).let {
5757
// Plus one as this is calculated before this ticks progress is calculated and the breakingTicks are incremented
@@ -77,7 +77,7 @@ data class SwapInfo(
7777

7878
val swapAtEnd = breakDelta * breakTicks >= threshold || minKeepTicks > 0
7979

80-
val swap = if (rebreakPotential == RebreakManager.RebreakPotential.Instant)
80+
val swap = if (rebreakPotential == RebreakHandler.RebreakPotential.Instant)
8181
breakConfig.swapMode.isEnabled()
8282
else when (breakConfig.swapMode) {
8383
BreakConfig.SwapMode.None -> false

0 commit comments

Comments
 (0)