Skip to content

Commit 46c9acb

Browse files
committed
progressed check rather than adding an extra tick. Caches primary break item swaps which messed with secondary demotion timings
1 parent a22994b commit 46c9acb

2 files changed

Lines changed: 8 additions & 9 deletions

File tree

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -509,9 +509,8 @@ object BreakManager : Manager<BreakRequest>(
509509

510510
if (primaryConfig.breakMode == BreakMode.OldGrim) {
511511
val breakDelta = primary.calcBreakDelta()
512-
val extraTick = !primary.progressedThisTick
513-
val ticks = primary.breakingTicks.let { if (extraTick) it + 1 else it }
514-
if (ticks * breakDelta >= primaryConfig.breakThreshold) return null
512+
if (!primary.progressedThisTick) return null
513+
if (primary.breakingTicks * breakDelta >= primaryConfig.breakThreshold) return null
515514
}
516515

517516
secondaryBreak =

src/main/kotlin/com/lambda/module/modules/render/ViewModel.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ object ViewModel : Module(
5050
private const val HAND_TAB = "Hand"
5151

5252
@Tab(GENERAL_TAB) private val swingMode by setting("Swing Mode", SwingMode.Standard, "Changes which hands swing")
53-
@Tab(GENERAL_TAB)val swingDuration by setting("Swing Duration", 6, 0..20, 1, "Adjusts how fast the player swings", " ticks")
54-
@Tab(GENERAL_TAB)private val noSwingDelay by setting("No Swing Delay", false, "Removes the delay between swings")
55-
@Tab(GENERAL_TAB)val mainSwingProgress by setting("Main Swing Progress", 0.0f, 0.0f..1.0f, 0.025f, "Renders as if the players main hand was this progress through the swing animation")
56-
@Tab(GENERAL_TAB)val offhandSwingProgress by setting("Offhand Swing Progress", 0.0f, 0.0f..1.0f, 0.025f, "Renders as if the players offhand was this progress through the swing animation")
57-
@Tab(GENERAL_TAB)val oldAnimations by setting("Old Animations", false, "Adjusts the animations to look like they did in 1.8")
58-
@Tab(GENERAL_TAB)val swapAnimation by setting("Swap Animation", true, "If disabled, removes the drop down animation when swapping item") { oldAnimations }
53+
@Tab(GENERAL_TAB) val swingDuration by setting("Swing Duration", 6, 0..20, 1, "Adjusts how fast the player swings", " ticks")
54+
@Tab(GENERAL_TAB) private val noSwingDelay by setting("No Swing Delay", false, "Removes the delay between swings")
55+
@Tab(GENERAL_TAB) val mainSwingProgress by setting("Main Swing Progress", 0.0f, 0.0f..1.0f, 0.025f, "Renders as if the players main hand was this progress through the swing animation")
56+
@Tab(GENERAL_TAB) val offhandSwingProgress by setting("Offhand Swing Progress", 0.0f, 0.0f..1.0f, 0.025f, "Renders as if the players offhand was this progress through the swing animation")
57+
@Tab(GENERAL_TAB) val oldAnimations by setting("Old Animations", false, "Adjusts the animations to look like they did in 1.8")
58+
@Tab(GENERAL_TAB) val swapAnimation by setting("Swap Animation", true, "If disabled, removes the drop down animation when swapping item") { oldAnimations }
5959
//ToDo: Implement
6060
// val shadow by setting("Shadows", true, "If disabled, removes shadows on the model") { page == Page.General }
6161

0 commit comments

Comments
 (0)