Skip to content

Commit be5b42f

Browse files
committed
change default air place to standard as it is now enabled on 2b rather than accessible through a bypass
1 parent e846ff8 commit be5b42f

3 files changed

Lines changed: 8 additions & 16 deletions

File tree

src/main/kotlin/com/lambda/config/blocks/InteractSettings.kt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,23 @@ package com.lambda.config.blocks
1919

2020
import com.lambda.config.Config
2121
import com.lambda.config.ConfigBlock
22+
import com.lambda.config.blocks.ActionConfig.SortMode
23+
import com.lambda.config.blocks.BuildConfig.SwingType
24+
import com.lambda.config.blocks.InteractConfig.AirPlaceMode
25+
import com.lambda.config.blocks.InteractConfig.InteractConfirmationMode
2226
import com.lambda.event.events.TickEvent
2327
import com.lambda.event.events.TickEvent.Companion.ALL_STAGES
2428

2529
class InteractSettings(override val c: Config) : InteractConfig, ConfigBlock {
2630
override val rotate by c.setting("Rotate For Interact", true, "Rotate towards block while placing")
27-
override val airPlace by c.setting("Air Place", InteractConfig.AirPlaceMode.Grim, "Allows for placing blocks without adjacent faces")
31+
override val airPlace by c.setting("Air Place", AirPlaceMode.Standard, "Allows for placing blocks without adjacent faces")
2832
override val axisRotateSetting by c.setting("Axis Rotate", true, "Overrides the Rotate For Place setting and rotates the player on each axis to air place rotational blocks") { airPlace.isEnabled }
29-
override val sorter by c.setting("Interaction Sorter", ActionConfig.SortMode.Tool, "The order in which placements are performed")
33+
override val sorter by c.setting("Interaction Sorter", SortMode.Tool, "The order in which placements are performed")
3034
override val tickStageMask by c.setting("Interaction Stage Mask", setOf(TickEvent.Input.Post), ALL_STAGES.toSet(), "The sub-tick timing at which place actions are performed", displayClassName = true)
31-
override val interactConfirmationMode by c.setting("Interact Confirmation", InteractConfig.InteractConfirmationMode.PlaceThenAwait, "Wait for block placement confirmation")
35+
override val interactConfirmationMode by c.setting("Interact Confirmation", InteractConfirmationMode.PlaceThenAwait, "Wait for block placement confirmation")
3236
override val interactDelay by c.setting("Interact Delay", 0, 0..3, 1, "Tick delay between interacting with another block")
3337
override val interactionsPerTick by c.setting("Interactions Per Tick", 9, 1..30, 1, "Maximum instant block places per tick")
3438
override val swing by c.setting("Swing On Interact", true, "Swings the players hand when placing")
35-
override val swingType by c.setting("Interact Swing Type", BuildConfig.SwingType.Vanilla, "The style of swing") { swing }
39+
override val swingType by c.setting("Interact Swing Type", SwingType.Vanilla, "The style of swing") { swing }
3640
override val sounds by c.setting("Place Sounds", true, "Plays the placing sounds")
3741
}

src/main/kotlin/com/lambda/module/modules/world/Scaffold.kt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,10 @@
1717

1818
package com.lambda.module.modules.world
1919

20-
import com.lambda.config.ConfigEditor.editSetting
2120
import com.lambda.config.ConfigEditor.editTypedSettings
2221
import com.lambda.config.ConfigEditor.hide
2322
import com.lambda.config.ConfigEditor.hideAllExcept
2423
import com.lambda.config.automation.AutomationConfig.Companion.setDefaultAutomationConfig
25-
import com.lambda.config.blocks.InteractConfig
2624
import com.lambda.config.settings.complex.Bind
2725
import com.lambda.config.withEdits
2826
import com.lambda.context.SafeContext
@@ -68,15 +66,8 @@ object Scaffold : Module(
6866
defaultValue(false)
6967
hide()
7068
}
71-
::checkSideVisibility.editSetting { defaultValue(true) }
7269
hide(::breakBlocks)
7370
}
74-
interactConfig::airPlace.editSetting { defaultValue(InteractConfig.AirPlaceMode.None) }
75-
rotationConfig.apply {
76-
::instant.editSetting { defaultValue(false) }
77-
::mean.editSetting { defaultValue(120.0) }
78-
::spread.editSetting { defaultValue(0.0) }
79-
}
8071
hideAllExcept(::buildConfig, ::interactConfig, ::rotationConfig, ::hotbarConfig)
8172
}
8273

src/main/kotlin/com/lambda/module/modules/world/StashMover.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,11 @@ package com.lambda.module.modules.world
1919

2020
import baritone.api.pathing.goals.GoalBlock
2121
import com.lambda.Lambda.mc
22-
import com.lambda.config.ConfigEditor.editSetting
2322
import com.lambda.config.ConfigEditor.editTypedSettings
2423
import com.lambda.config.ConfigEditor.hide
2524
import com.lambda.config.ConfigEditor.hideBlock
2625
import com.lambda.config.Tab
2726
import com.lambda.config.automation.AutomationConfig.Companion.setDefaultAutomationConfig
28-
import com.lambda.config.blocks.InteractConfig
2927
import com.lambda.config.entries.Setting.Companion.onValueChange
3028
import com.lambda.config.settings.complex.Bind
3129
import com.lambda.config.settings.complex.KeybindSetting.Companion.onPress
@@ -187,7 +185,6 @@ object StashMover : Module(
187185
hide(::pathing, ::collectDrops, ::spleefEntities, ::entityReach)
188186
hideBlock(::eatConfig)
189187
}
190-
interactConfig::airPlace.editSetting { defaultValue(InteractConfig.AirPlaceMode.None) }
191188
breakConfig.apply {
192189
editTypedSettings(::suitableToolsOnly, ::efficientOnly) { defaultValue(false) }
193190
}

0 commit comments

Comments
 (0)