incredibly large break limits

Author: beanbag44

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

@@ -62,7 +62,7 @@ class BreakSettings(override val c: Config) : BreakConfig, ConfigBlock {
 	override val rotate by c.setting("Rotate For Break", false, "Rotate towards block while breaking")
 	// Pending / Post
 	override val breakConfirmation by c.setting("Break Confirmation", BreakConfirmationMode.BreakThenAwait, "The style of confirmation used when breaking")
-	override val breaksPerTick by c.setting("Breaks Per Tick", 30, 1..30, 1, "Maximum instant block breaks per tick")
+	override val breaksPerTick by c.setting("Breaks Per Tick", 59, 1..60, 1, "Maximum instant block breaks per tick")
 	override val whitelistMode by c.setting("Whitelist Mode", WhitelistMode.None, "The type of block selection used")
 	override val whitelist by c.setting("Whitelist", mutableSetOf(), Registries.BLOCK.toSet(), "Only these selected blocks are allowed to be broken") { whitelistMode == WhitelistMode.Whitelist }
 	override val blacklist by c.setting("Blacklist", mutableSetOf(), Registries.BLOCK.toSet(), "These selected blocks are not allowed to be broken") { whitelistMode == WhitelistMode.Blacklist }

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

@@ -38,7 +38,7 @@ class BuildSettings(override val c: Config) : BuildConfig, ConfigBlock {
     @Group(GENERAL_GROUP) override val collectDrops by c.setting("Collect All Drops", false, "Collect all drops when breaking blocks")
     @Group(GENERAL_GROUP) override val spleefEntities by c.setting("Spleef Entities", false, "Breaks blocks beneath entities blocking placements to get them out of the way")
     @Group(GENERAL_GROUP) override val cautionDoubleBlocks by c.setting("Caution Double Blocks", true, "Prevents spamming double blocks like doors, chests, etc when configured to interact more than once per tick")
-    @Group(GENERAL_GROUP) override val maxPendingActions by c.setting("Max Pending Actions", 15, 1..30, 1, "The maximum count of pending interactions to allow before pausing future interactions")
+    @Group(GENERAL_GROUP) override val maxPendingActions by c.setting("Max Pending Actions", 59, 1..60, 1, "The maximum count of pending interactions to allow before pausing future interactions")
     @Group(GENERAL_GROUP) override val actionTimeout by c.setting("Action Timeout", 10, 1..30, 1, "Timeout for block breaks in ticks", unit = " ticks")
     @Group(GENERAL_GROUP) override val maxBuildDependencies by c.setting("Max Sim Dependencies", 3, 0..10, 1, "Maximum dependency build results")
 

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

@@ -34,7 +34,7 @@ class InteractSettings(override val c: Config) : InteractConfig, ConfigBlock {
     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)
     override val interactConfirmationMode by c.setting("Interact Confirmation", InteractConfirmationMode.PlaceThenAwait, "Wait for block placement confirmation")
     override val interactDelay by c.setting("Interact Delay", 0, 0..3, 1, "Tick delay between interacting with another block")
-    override val interactionsPerTick by c.setting("Interactions Per Tick", 9, 1..30, 1, "Maximum instant block places per tick")
+    override val interactionsPerTick by c.setting("Interactions Per Tick", 9, 1..60, 1, "Maximum instant block places per tick")
     override val swing by c.setting("Swing On Interact", true, "Swings the players hand when placing")
     override val swingType by c.setting("Interact Swing Type", SwingType.Vanilla, "The style of swing") { swing }
     override val sounds by c.setting("Place Sounds", true, "Plays the placing sounds")

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

@@ -617,7 +617,7 @@ object BreakManager : Manager<BreakRequest>(
 			}
 		}
 		breaksThisTick++
-		if (info.type == Primary) breakDelay = info.getBreakDelay()
+		if (info.type == Primary && !info.vanillaInstantBreakable) breakDelay = info.getBreakDelay()
 		info.nullify()
 	}
 
@@ -701,7 +701,6 @@ object BreakManager : Manager<BreakRequest>(
 
 			if (gamemode.isCreative && world.worldBorder.contains(ctx.blockPos)) {
 				if (!PacketLimitHandler.canSendPackets(1, PacketType.PlayerAction)) return
-				breakDelay = info.getBreakDelay()
 				lastPosStarted = ctx.blockPos
 				onBlockBreak(info)
 				info.startBreakPacket()
@@ -815,7 +814,6 @@ object BreakManager : Manager<BreakRequest>(
 			onBlockBreak(info)
 			info.startBreakPacket()
 			PacketLimitHandler.sentPackets(1, PacketType.PlayerAction)
-			breakDelay = info.getBreakDelay()
 			if (breakConfig.swing.isEnabled()) swingHand(breakConfig.swingType, Hand.MAIN_HAND)
 			return true
 		}
@@ -828,7 +826,7 @@ object BreakManager : Manager<BreakRequest>(
 		var packetCount = 1
 		info.vanillaInstantBreakable = progress >= 1
 		val isGrim = breakConfig.breakMode == BreakMode.Grim
-		val oldGrim = breakConfig.breakMode == BreakMode.OldGrim
+		val oldGrim = breakConfig.breakMode == BreakMode.OldGrim && !info.vanillaInstantBreakable
 		val requiresSecondStop = instantBreakable && !info.vanillaInstantBreakable
 
 		if (isGrim) packetCount++
@@ -845,10 +843,8 @@ object BreakManager : Manager<BreakRequest>(
 			blockState.onBlockBreakStart(world, ctx.blockPos, player)
 		}
 
-		if (instantBreakable) {
-			onBlockBreak(info)
-			if (!info.vanillaInstantBreakable) breakDelay = info.getBreakDelay()
-		} else {
+		if (instantBreakable) onBlockBreak(info)
+		else {
 			info.apply {
 				breaking = true
 				breakingTicks = 1