Skip to content

Fix: Break Manager #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
beanbag44 merged 12 commits into from
Aug 19, 2025
Merged

Fix: Break Manager #138

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
09b96de
move almost all swap data and logic into the SwapInfo class, and add …
beanbag44 Aug 18, 2025
a60fe87
min server swap ticks to 2 for secondary breaks allowing for faster p…
beanbag44 Aug 18, 2025
71baf3b
Merge branch '1.21.5' into improvement/breakmanager-again
beanbag44 Aug 18, 2025
a3a8bd8
idk what i was thinking at 5 am
beanbag44 Aug 18, 2025
a979cb2
catch rebreak logic up to the rest and raise minimum secondary swap t…
beanbag44 Aug 18, 2025
ad833ed
Merge branch '1.21.5' into improvement/breakmanager-again
beanbag44 Aug 18, 2025
d083a8f
Merge branch 'refs/heads/1.21.5' into improvement/breakmanager-again
beanbag44 Aug 18, 2025
e5100a6
Merge branch 'refs/heads/1.21.5' into improvement/breakmanager-again
beanbag44 Aug 19, 2025
ca55381
omit population from the repeat loop
beanbag44 Aug 19, 2025
18ed215
pass all contexts over to the break manager for it to decide which it…
beanbag44 Aug 19, 2025
77abd79
min secondary swap ticks to 2
beanbag44 Aug 19, 2025
41e2eda
back to two...
beanbag44 Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
pass all contexts over to the break manager for it to decide which it… 
… can take for optimal efficiency and leave stack selection check to the break manager too
  • Loading branch information
@beanbag44
beanbag44 committed Aug 19, 2025
commit 18ed215ca35f11d0b1515252b4c4dbac147a9630
2 changes: 0 additions & 2 deletions src/main/kotlin/com/lambda/interaction/construction/simulation/BuildSimulator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ import com.lambda.interaction.material.StackSelection.Companion.selectStack
import com.lambda.interaction.material.container.ContainerManager.containerWithMaterial
import com.lambda.interaction.material.container.MaterialContainer
import com.lambda.interaction.request.breaking.BreakConfig
import com.lambda.interaction.request.breaking.BreakManager
import com.lambda.interaction.request.inventory.InventoryConfig
import com.lambda.interaction.request.placing.PlaceConfig
import com.lambda.interaction.request.rotating.Rotation.Companion.rotation
Expand Down Expand Up @@ -850,7 +849,6 @@ object BuildSimulator {
val swapStack = swapCandidates.map { it.matchingStacks(stackSelection) }
.asSequence()
.flatten()
.filter { BreakManager.currentStackSelection.filterStack(it) }
.let { containerStacks ->
var bestStack = ItemStack.EMPTY
var bestBreakDelta = -1f
Expand Down
26 changes: 8 additions & 18 deletions src/main/kotlin/com/lambda/task/tasks/BuildTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import com.lambda.interaction.construction.blueprint.Blueprint.Companion.toStruc
import com.lambda.interaction.construction.blueprint.PropagatingBlueprint
import com.lambda.interaction.construction.blueprint.StaticBlueprint.Companion.toBlueprint
import com.lambda.interaction.construction.blueprint.TickingBlueprint
import com.lambda.interaction.construction.context.BreakContext
import com.lambda.interaction.construction.context.BuildContext
import com.lambda.interaction.construction.result.BreakResult
import com.lambda.interaction.construction.result.BuildResult
Expand Down Expand Up @@ -140,24 +139,14 @@ class BuildTask @Ta5kBuilder constructor(
if (atMaxPendingInteractions) return@listen
when (bestResult) {
is BreakResult.Break -> {
val breakResults = resultsNotBlocked.filterIsInstance<BreakResult.Break>()
val requestContexts = arrayListOf<BreakContext>()

if (build.breaking.breaksPerTick > 1) {
breakResults
.filter { it.context.instantBreak }
.take(emptyPendingInteractionSlots)
.let { instantBreakResults ->
requestContexts.addAll(instantBreakResults.map { it.context })
}
}

if (requestContexts.isEmpty()) {
requestContexts.addAll(breakResults.map { it.context })
}
val breakResults = resultsNotBlocked
.filterIsInstance<BreakResult.Break>()
.distinctBy { it.blockPos }
.take(emptyPendingInteractionSlots)
.map { it.context }

breakRequest(
requestContexts, pendingInteractions, rotation, hotbar, interactionConfig, inventory, build,
breakResults, pendingInteractions, rotation, hotbar, interactionConfig, inventory, build,
) {
onStop { breaks++ }
onItemDrop?.let { onItemDrop ->
Expand All @@ -171,8 +160,9 @@ class BuildTask @Ta5kBuilder constructor(
.filterIsInstance<PlaceResult.Place>()
.distinctBy { it.blockPos }
.take(emptyPendingInteractionSlots)
.map { it.context }

PlaceRequest(placeResults.map { it.context }, build, rotation, hotbar, pendingInteractions) { placements++ }.submit()
PlaceRequest(placeResults, build, rotation, hotbar, pendingInteractions) { placements++ }.submit()
}
is InteractResult.Interact -> {
val interactResults = resultsNotBlocked
Expand Down