Skip to content

Commit e637c11

Browse files
committed
working default break settings
1 parent e846ff8 commit e637c11

3 files changed

Lines changed: 9 additions & 11 deletions

File tree

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ import com.lambda.config.Group
2424
import com.lambda.config.blocks.BreakConfig.AnimationMode
2525
import com.lambda.config.blocks.BreakConfig.BreakConfirmationMode
2626
import com.lambda.config.blocks.BreakConfig.BreakMode
27+
import com.lambda.config.blocks.BreakConfig.SwapMode
2728
import com.lambda.config.blocks.BreakConfig.SwingMode
2829
import com.lambda.config.blocks.BreakConfig.WhitelistMode
30+
import com.lambda.config.blocks.BuildConfig.SwingType
2931
import com.lambda.config.withEdits
3032
import com.lambda.event.events.TickEvent
3133
import com.lambda.event.events.TickEvent.Companion.ALL_STAGES
@@ -38,23 +40,23 @@ class BreakSettings(override val c: Config) : BreakConfig, ConfigBlock {
3840
}
3941

4042
// General
41-
override val breakMode by c.setting("Break Mode", BreakMode.Packet)
43+
override val breakMode by c.setting("Break Mode", BreakMode.Vanilla)
4244
override val sorter by c.setting("Break Sorter", ActionConfig.SortMode.Tool, "The order in which breaks are performed")
4345
override val rebreak by c.setting("Rebreak", true, "Re-breaks blocks after they've been broken once")
4446
// Double break
45-
override val doubleBreak by c.setting("Double Break", true, "Allows breaking two blocks at once")
47+
override val doubleBreak by c.setting("Double Break", false, "Allows breaking two blocks at once")
4648
override val unsafeCancels by c.setting("Unsafe Cancels", true, "Allows cancelling block breaking even if the server might continue breaking sever side, potentially causing unexpected state changes") { doubleBreak }
4749
// Fixes / Delays
48-
override val breakThreshold by c.setting("Break Threshold", 0.70f, 0.1f..1.0f, 0.01f, "The break amount at which the block is considered broken")
50+
override val breakThreshold by c.setting("Break Threshold", 1f, 0.1f..1.0f, 0.01f, "The break amount at which the block is considered broken")
4951
override val fudgeFactor by c.setting("Fudge Factor", 1, 0..5, 1, "The number of ticks to add to the break time, usually to account for server lag")
5052
override val serverSwapTicks by c.setting("Server Swap", 0, 0..5, 1, "The number of ticks to give the server time to recognize the player attributes on the swapped item", " tick(s)")
5153
// @Group(GeneralGroup) override val desyncFix by c.setting("Desync Fix", false, "Predicts if the players breaking will be slowed next tick as block break packets are processed using the players next position") { page == Page.General }
52-
override val breakDelay by c.setting("Break Delay", 0, 0..6, 1, "The delay between breaking blocks", " tick(s)")
54+
override val breakDelay by c.setting("Break Delay", 6, 0..6, 1, "The delay between breaking blocks", " tick(s)")
5355
// Timing
5456
override val tickStageMask by c.setting("Break Stage Mask", setOf(TickEvent.Input.Post), ALL_STAGES.toSet(), "The sub-tick timing at which break actions can be performed", displayClassName = true)
55-
override val swapMode by c.setting("Break Swap Mode", BreakConfig.SwapMode.End, "Decides when to swap to the best suited tool when breaking a block")
57+
override val swapMode by c.setting("Break Swap Mode", SwapMode.Constant, "Decides when to swap to the best suited tool when breaking a block")
5658
override val swing by c.setting("Swing Mode", SwingMode.Constant, "The times at which to swing the players hand")
57-
override val swingType by c.setting("Break Swing Type", BuildConfig.SwingType.Vanilla, "The style of swing") { swing != SwingMode.None }
59+
override val swingType by c.setting("Break Swing Type", SwingType.Vanilla, "The style of swing") { swing != SwingMode.None }
5860
// Rotate
5961
override val rotate by c.setting("Rotate For Break", false, "Rotate towards block while breaking")
6062
// Pending / Post

src/main/kotlin/com/lambda/module/modules/player/FastBreak.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ object FastBreak : Module(
7676
::doubleBreak
7777
) { defaultValue(false); hide() }
7878
::breaksPerTick.editSetting { defaultValue(1); hide() }
79-
::tickStageMask.editSetting { defaultValue(mutableSetOf(TickEvent.Input.Post)); hide() }
80-
hide(::sorter, ::unsafeCancels)
79+
hide(::sorter, ::unsafeCancels, ::tickStageMask)
8180
}
8281
hotbarConfig::tickStageMask.editSetting { defaultValue(mutableSetOf(TickEvent.Input.Post)); hide() }
8382
}

src/main/kotlin/com/lambda/module/modules/player/PacketMine.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import com.lambda.config.ConfigEditor.hide
2323
import com.lambda.config.ConfigEditor.hideAllExcept
2424
import com.lambda.config.Group
2525
import com.lambda.config.automation.AutomationConfig.Companion.setDefaultAutomationConfig
26-
import com.lambda.config.blocks.BreakConfig.SwingMode
2726
import com.lambda.config.entries.Setting.Companion.disabled
2827
import com.lambda.config.entries.Setting.Companion.onValueChange
2928
import com.lambda.config.withEdits
@@ -127,9 +126,7 @@ object PacketMine : Module(
127126
::efficientOnly,
128127
::suitableToolsOnly
129128
) { defaultValue(false) }
130-
::swing.editSetting { defaultValue(SwingMode.Start) }
131129
}
132-
hotbarConfig::keepTicks.editSetting { defaultValue(0) }
133130
}
134131

135132
listen<TickEvent.Post> {

0 commit comments

Comments
 (0)