Skip to content

Commit 67a8575

Browse files
committed
cleanup
1 parent 18e58ea commit 67a8575

5 files changed

Lines changed: 2 additions & 28 deletions

File tree

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import com.lambda.interaction.managers.breaking.BreakConfig.BreakConfirmationMod
2828
import com.lambda.interaction.managers.breaking.BreakConfig.BreakMode
2929
import com.lambda.interaction.managers.breaking.BreakConfig.SwingMode
3030
import com.lambda.util.NamedEnum
31-
import net.minecraft.block.Block
3231
import net.minecraft.registry.Registries
3332
import java.awt.Color
3433

@@ -88,12 +87,6 @@ open class BreakSettings(
8887
override val forceSilkTouch by c.setting("${prefix}Force Silk Touch", false, "Force silk touch when breaking blocks") { visibility() && swapMode.isEnabled() }.group(*baseGroup, Group.General).index()
8988
override val forceFortunePickaxe by c.setting("${prefix}Force Fortune Pickaxe", false, "Force fortune pickaxe when breaking blocks") { visibility() && swapMode.isEnabled() }.group(*baseGroup, Group.General).index()
9089
override val minFortuneLevel by c.setting("${prefix}Min Fortune Level", 1, 1..3, 1, "The minimum fortune level to use") { visibility() && swapMode.isEnabled() && forceFortunePickaxe }.group(*baseGroup, Group.General).index()
91-
override val useWoodenTools by c.setting("${prefix}Use Wooden Tools", true, "Use wooden tools when breaking blocks") { visibility() && swapMode.isEnabled() }.group(*baseGroup, Group.General).index()
92-
override val useStoneTools by c.setting("${prefix}Use Stone Tools", true, "Use stone tools when breaking blocks") { visibility() && swapMode.isEnabled() }.group(*baseGroup, Group.General).index()
93-
override val useIronTools by c.setting("${prefix}Use Iron Tools", true, "Use iron tools when breaking blocks") { visibility() && swapMode.isEnabled() }.group(*baseGroup, Group.General).index()
94-
override val useDiamondTools by c.setting("${prefix}Use Diamond Tools", true, "Use diamond tools when breaking blocks") { visibility() && swapMode.isEnabled() }.group(*baseGroup, Group.General).index()
95-
override val useGoldTools by c.setting("${prefix}Use Gold Tools", true, "Use gold tools when breaking blocks") { visibility() && swapMode.isEnabled() }.group(*baseGroup, Group.General).index()
96-
override val useNetheriteTools by c.setting("${prefix}Use Netherite Tools", true, "Use netherite tools when breaking blocks") { visibility() && swapMode.isEnabled() }.group(*baseGroup, Group.General).index()
9790

9891
// Cosmetics
9992
override val sounds by c.setting("${prefix}Break Sounds", true, "Plays the breaking sounds", visibility = visibility).group(*baseGroup, Group.Cosmetic).index()

src/main/kotlin/com/lambda/interaction/construction/simulation/checks/BreakSim.kt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -170,18 +170,6 @@ class BreakSim private constructor(simInfo: SimInfo)
170170
hasEnchantment(Enchantments.SILK_TOUCH)
171171
}.andIf(breakConfig.forceFortunePickaxe) {
172172
hasEnchantment(Enchantments.FORTUNE)
173-
}.andIf(!breakConfig.useWoodenTools) {
174-
hasTag(WOODEN_TOOL_MATERIALS).not()
175-
}.andIf(!breakConfig.useStoneTools) {
176-
hasTag(STONE_TOOL_MATERIALS).not()
177-
}.andIf(!breakConfig.useIronTools) {
178-
hasTag(IRON_TOOL_MATERIALS).not()
179-
}.andIf(!breakConfig.useDiamondTools) {
180-
hasTag(DIAMOND_TOOL_MATERIALS).not()
181-
}.andIf(!breakConfig.useGoldTools) {
182-
hasTag(GOLD_TOOL_MATERIALS).not()
183-
}.andIf(!breakConfig.useNetheriteTools) {
184-
hasTag(NETHERITE_TOOL_MATERIALS).not()
185173
}
186174
}
187175

src/main/kotlin/com/lambda/interaction/construction/simulation/checks/InteractSim.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ class InteractSim private constructor(simInfo: InteractSimInfo)
7777
InteractResult.Dependency(pos, buildResult)
7878

7979
companion object {
80-
context(automatedSafeContext: AutomatedSafeContext, dependent: Sim<*>)
8180
@SimDsl
81+
context(automatedSafeContext: AutomatedSafeContext, dependent: Sim<*>)
8282
suspend fun InteractSimInfo.simInteraction() =
8383
InteractSim(this).run {
8484
withDependent(dependent) {

src/main/kotlin/com/lambda/interaction/managers/breaking/BreakConfig.kt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,6 @@ interface BreakConfig : ActionConfig, ISettingGroup {
6161
val forceFortunePickaxe: Boolean
6262
val minFortuneLevel: Int
6363

64-
val useWoodenTools: Boolean
65-
val useStoneTools: Boolean
66-
val useIronTools: Boolean
67-
val useDiamondTools: Boolean
68-
val useGoldTools: Boolean
69-
val useNetheriteTools: Boolean
70-
7164
val sounds: Boolean
7265
val particles: Boolean
7366
val breakingTexture: Boolean

src/main/kotlin/com/lambda/module/modules/movement/ElytraFly.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ object ElytraFly : Module(
6464
private val autoPitch by setting("Auto Pitch", true, "Automatically pitches the players rotation down to bounce at faster speeds") { mode == FlyMode.Bounce }
6565
private val pitch by setting("Pitch", 80, 0..90, 1) { autoPitch && mode == FlyMode.Bounce }
6666
private val yMotion by setting("Y Motion", false, "Cancels the players y velocity to aid speed") { mode == FlyMode.Bounce }
67-
private val yMotionStartSpeed by setting("Y Motion Start Speed", 20, 5..30, 1, "bps") { mode == FlyMode.Bounce && yMotion }
67+
private val yMotionStartSpeed by setting("Y Motion Start Speed", 30, 5..30, 1, "bps") { mode == FlyMode.Bounce && yMotion }
6868
private val speedLimit by setting("Speed Limit", 110, 10..720, 1, "bps") { mode == FlyMode.Bounce && yMotion }
6969
private val jump by setting("Jump", true, "Automatically jumps") { mode == FlyMode.Bounce }
7070
private val flagPause by setting("Flag Pause", 20, 0..100, 1, "How long to pause if the server flags you for a movement check") { mode == FlyMode.Bounce }

0 commit comments

Comments
 (0)