Working double break and fast break. Still buggy break delay with no bypass implemented currently. also silent swap scaffold default config

Author: beanbag44

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

@@ -17,6 +17,7 @@
 
 package com.lambda.config.blocks
 
+import com.lambda.config.blocks.BuildConfig.SwingType
 import com.lambda.util.Describable
 import com.lambda.util.NamedEnum
 import net.minecraft.block.Block
@@ -40,7 +41,7 @@ interface BreakConfig : ActionConfig {
 	val swapMode: SwapMode
 
 	val swing: SwingMode
-	val swingType: BuildConfig.SwingType
+	val swingType: SwingType
 
 	val rotate: Boolean
 
@@ -85,7 +86,8 @@ interface BreakConfig : ActionConfig {
 		override val description: String
 	) : NamedEnum, Describable {
 		Vanilla("Vanilla", "Uses vanilla breaking"),
-		Packet("Packet", "Breaks blocks using only using packets")
+		Grim("Grim", "Uses a grim bypass"),
+		OldGrim("Old Grim", "Uses an old grim bypass")
 	}
 
 	enum class SwapMode(

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

@@ -21,11 +21,14 @@ import com.lambda.config.Config
 import com.lambda.config.ConfigBlock
 import com.lambda.config.ConfigEditor.hide
 import com.lambda.config.Group
+import com.lambda.config.blocks.ActionConfig.SortMode
 import com.lambda.config.blocks.BreakConfig.AnimationMode
 import com.lambda.config.blocks.BreakConfig.BreakConfirmationMode
 import com.lambda.config.blocks.BreakConfig.BreakMode
+import com.lambda.config.blocks.BreakConfig.SwapMode
 import com.lambda.config.blocks.BreakConfig.SwingMode
 import com.lambda.config.blocks.BreakConfig.WhitelistMode
+import com.lambda.config.blocks.BuildConfig.SwingType
 import com.lambda.config.withEdits
 import com.lambda.event.events.TickEvent
 import com.lambda.event.events.TickEvent.Companion.ALL_STAGES
@@ -38,8 +41,8 @@ class BreakSettings(override val c: Config) : BreakConfig, ConfigBlock {
 	}
 
 	// General
-	override val breakMode by c.setting("Break Mode", BreakMode.Packet)
-	override val sorter by c.setting("Break Sorter", ActionConfig.SortMode.Tool, "The order in which breaks are performed")
+	override val breakMode by c.setting("Break Mode", BreakMode.OldGrim)
+	override val sorter by c.setting("Break Sorter", SortMode.Tool, "The order in which breaks are performed")
 	override val rebreak by c.setting("Rebreak", true, "Re-breaks blocks after they've been broken once")
 	// Double break
 	override val doubleBreak by c.setting("Double Break", true, "Allows breaking two blocks at once")
@@ -52,9 +55,9 @@ class BreakSettings(override val c: Config) : BreakConfig, ConfigBlock {
 	override val breakDelay by c.setting("Break Delay", 0, 0..6, 1, "The delay between breaking blocks", " tick(s)")
 	// Timing
 	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)
-	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")
+	override val swapMode by c.setting("Break Swap Mode", SwapMode.End, "Decides when to swap to the best suited tool when breaking a block")
 	override val swing by c.setting("Swing Mode", SwingMode.Constant, "The times at which to swing the players hand")
-	override val swingType by c.setting("Break Swing Type", BuildConfig.SwingType.Vanilla, "The style of swing") { swing != SwingMode.None }
+	override val swingType by c.setting("Break Swing Type", SwingType.Vanilla, "The style of swing") { swing != SwingMode.None }
 	// Rotate
 	override val rotate by c.setting("Rotate For Break", false, "Rotate towards block while breaking")
 	// Pending / Post

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

@@ -34,6 +34,7 @@ import net.minecraft.entity.ItemEntity
 import net.minecraft.item.ItemStack
 import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket
 import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket.Action
+import net.minecraft.util.math.BlockPos
 
 /**
  * A data class that holds all the information required to process and continue a break.
@@ -139,21 +140,21 @@ data class BreakInfo(
 		}
 
 	context(_: SafeContext)
-	fun startBreakPacket() = breakPacket(Action.START_DESTROY_BLOCK)
+	fun startBreakPacket(yAddition: Int = 0) = breakPacket(Action.START_DESTROY_BLOCK, yAddition)
 
 	context(_: SafeContext)
-	fun stopBreakPacket() = breakPacket(Action.STOP_DESTROY_BLOCK)
+	fun stopBreakPacket(yAddition: Int = 0) = breakPacket(Action.STOP_DESTROY_BLOCK, yAddition)
 
 	context(_: SafeContext)
-	fun abortBreakPacket() = breakPacket(Action.ABORT_DESTROY_BLOCK)
+	fun abortBreakPacket(yAddition: Int = 0) = breakPacket(Action.ABORT_DESTROY_BLOCK, yAddition)
 
 	context(safeContext: SafeContext)
-	private fun breakPacket(action: Action) =
+	private fun breakPacket(action: Action, yAddition: Int) =
 		with(safeContext) {
 			interaction.sendSequencedPacket(world) { sequence: Int ->
 				PlayerActionC2SPacket(
 					action,
-					context.blockPos,
+					with(context.blockPos) { BlockPos(x, y + yAddition, z) },
 					context.hitResult.side,
 					sequence
 				)

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

@@ -166,6 +166,8 @@ object BreakManager : Manager<BreakRequest>(
 			field = value
 		}
 
+	const val OLD_GRIM_Y_OFFSET = 2000
+
 	override fun load(): String {
 		super.load()
 
@@ -818,8 +820,9 @@ object BreakManager : Manager<BreakRequest>(
 		val instantBreakable = progress >= info.getBreakThreshold()
 
 		var packetCount = 1
-		if (breakConfig.breakMode == BreakMode.Packet) packetCount++
 		info.vanillaInstantBreakable = progress >= 1
+		val oldGrim = breakConfig.breakMode == BreakMode.OldGrim && !info.vanillaInstantBreakable
+		if (breakConfig.breakMode == BreakMode.Grim || oldGrim) packetCount++
 		val requiresSecondStop = info.type == Secondary || (instantBreakable && !info.vanillaInstantBreakable)
 		if (requiresSecondStop) packetCount++
 
@@ -846,8 +849,9 @@ object BreakManager : Manager<BreakRequest>(
 			}
 		}
 
-		if (breakConfig.breakMode == BreakMode.Packet) info.stopBreakPacket()
+		if (breakConfig.breakMode == BreakMode.Grim) info.stopBreakPacket()
 		info.startBreakPacket()
+		if (oldGrim) info.startBreakPacket(OLD_GRIM_Y_OFFSET)
 		if (requiresSecondStop) info.stopBreakPacket()
 
 		PacketLimitHandler.sentPackets(packetCount, PacketType.PlayerAction)

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

@@ -17,6 +17,7 @@
 
 package com.lambda.module.modules.world
 
+import com.lambda.config.ConfigEditor.editSetting
 import com.lambda.config.ConfigEditor.editTypedSettings
 import com.lambda.config.ConfigEditor.hide
 import com.lambda.config.ConfigEditor.hideAllExcept
@@ -68,6 +69,7 @@ object Scaffold : Module(
 					}
 					hide(::breakBlocks)
 				}
+				hotbarConfig::keepTicks.editSetting { defaultValue(0) }
 				hideAllExcept(::buildConfig, ::interactConfig, ::rotationConfig, ::hotbarConfig)
 			}