Skip to content

Commit 158477b

Browse files
committed
Fix obsidian demand on tunnel mode
1 parent 05f7473 commit 158477b

1 file changed

Lines changed: 11 additions & 6 deletions

File tree

‎src/main/kotlin/trombone/handler/Player.kt‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package trombone.handler
33
import HighwayTools.fillerMat
44
import HighwayTools.grindObsidian
55
import HighwayTools.material
6+
import HighwayTools.mode
67
import HighwayTools.saveMaterial
78
import HighwayTools.saveTools
89
import HighwayTools.storageManagement
@@ -29,6 +30,7 @@ import trombone.Blueprint.isInsideBlueprintBuild
2930
import trombone.IO.disableError
3031
import trombone.Pathfinder.MovementState
3132
import trombone.Pathfinder.moveState
33+
import trombone.Trombone
3234
import trombone.Trombone.module
3335
import trombone.handler.Container.containerTask
3436
import trombone.handler.Container.getShulkerWith
@@ -95,11 +97,14 @@ object Player {
9597
}
9698
return true
9799
} else {
98-
if (storageManagement && grindObsidian &&
99-
containerTask.taskState == TaskState.DONE &&
100-
material == Blocks.OBSIDIAN &&
101-
(player.inventorySlots.countBlock(Blocks.OBSIDIAN) <= saveMaterial &&
102-
grindCycles == 0)) {
100+
if (mode != Trombone.Mode.TUNNEL
101+
&& storageManagement
102+
&& grindObsidian
103+
&& containerTask.taskState == TaskState.DONE
104+
&& material == Blocks.OBSIDIAN
105+
&& (player.inventorySlots.countBlock(Blocks.OBSIDIAN) <= saveMaterial &&
106+
grindCycles == 0)
107+
) {
103108
val cycles = (player.inventorySlots.count { it.stack.isEmpty || InventoryManager.ejectList.contains(it.stack.item.registryName.toString()) } - 1) * 8
104109
if (cycles > 0) {
105110
moveState = MovementState.RESTOCK
@@ -128,7 +133,7 @@ object Player {
128133

129134
private fun SafeClientEvent.findMaterial(blockTask: BlockTask) = when {
130135
blockTask.isFiller -> {
131-
if (isInsideBlueprintBuild(blockTask.blockPos)) {
136+
if (isInsideBlueprintBuild(blockTask.blockPos) && mode == Trombone.Mode.HIGHWAY) {
132137
if (player.inventorySlots.countBlock(material) > 0) {
133138
material
134139
} else {

0 commit comments

Comments
 (0)