introduce proper shouldSwingHand function (#5031)

CCBlueX · Dec 23, 2024 · fe2bc68 · fe2bc68
1 parent e231efd
commit fe2bc68
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/...cbluex/liquidbounce/features/module/modules/combat/killaura/features/KillAuraAutoBlock.kt b/...cbluex/liquidbounce/features/module/modules/combat/killaura/features/KillAuraAutoBlock.kt
@@ -36,6 +36,7 @@ import net.ccbluex.liquidbounce.utils.client.isOlderThanOrEquals1_7_10
 import net.ccbluex.liquidbounce.utils.combat.shouldBeAttacked
 import net.ccbluex.liquidbounce.utils.entity.isBlockAction
 import net.ccbluex.liquidbounce.utils.entity.rotation
+import net.ccbluex.liquidbounce.utils.input.shouldSwingHand
 import net.minecraft.item.ItemStack
 import net.minecraft.item.consume.UseAction
 import net.minecraft.network.packet.c2s.play.UpdateSelectedSlotC2SPacket
@@ -141,9 +142,9 @@ object KillAuraAutoBlock : ToggleableConfigurable(ModuleKillAura, "AutoBlocking"
 
             // Interact with the item in the block hand
             val actionResult = interaction.interactItem(player, blockHand)
+
             if (actionResult.isAccepted) {
-                if (actionResult is ActionResult.Success &&
-                    actionResult.swingSource == ActionResult.SwingSource.CLIENT) {
+                if (actionResult.shouldSwingHand()) {
                     player.swingHand(blockHand)
                 }
             }

diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/utils/client/NetworkUtils.kt b/src/main/kotlin/net/ccbluex/liquidbounce/utils/client/NetworkUtils.kt
@@ -24,6 +24,7 @@ import net.ccbluex.liquidbounce.event.events.TransferOrigin
 import net.ccbluex.liquidbounce.features.module.modules.combat.crystalaura.SwitchMode
 import net.ccbluex.liquidbounce.utils.aiming.RotationManager
 import net.ccbluex.liquidbounce.utils.block.SwingMode
+import net.ccbluex.liquidbounce.utils.input.shouldSwingHand
 import net.ccbluex.liquidbounce.utils.inventory.OFFHAND_SLOT
 import net.minecraft.client.network.ClientPlayerEntity
 import net.minecraft.client.network.ClientPlayerInteractionManager
@@ -89,7 +90,7 @@ fun clickBlockWithSlot(
         actionResult = itemStack.useOnBlock(itemUsageContext)
     }
 
-    if (actionResult is ActionResult.Success && actionResult.swingSource == ActionResult.SwingSource.CLIENT) {
+    if (actionResult.shouldSwingHand()) {
         swingMode.swing(hand)
     }
 

diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/utils/input/InputUtil.kt b/src/main/kotlin/net/ccbluex/liquidbounce/utils/input/InputUtil.kt
@@ -20,6 +20,7 @@
 package net.ccbluex.liquidbounce.utils.input
 
 import net.minecraft.client.util.InputUtil
+import net.minecraft.util.ActionResult
 
 /**
  * Translates a key name to an InputUtil.Key using GLFW key codes.
@@ -82,3 +83,5 @@ val keyList: Set<String>
     get() = InputUtil.Type.KEYSYM.map.values
         .map { key -> reduceInputName(key.translationKey) }
         .toSet()
+
+fun ActionResult.shouldSwingHand() = this is ActionResult.Success && this.swingSource == ActionResult.SwingSource.CLIENT
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/utils/inventory/InventoryUtils.kt b/src/main/kotlin/net/ccbluex/liquidbounce/utils/inventory/InventoryUtils.kt
@@ -30,6 +30,7 @@ import net.ccbluex.liquidbounce.features.module.modules.player.invcleaner.*
 import net.ccbluex.liquidbounce.features.module.modules.world.scaffold.ModuleScaffold
 import net.ccbluex.liquidbounce.utils.aiming.RotationManager
 import net.ccbluex.liquidbounce.utils.client.*
+import net.ccbluex.liquidbounce.utils.input.shouldSwingHand
 import net.ccbluex.liquidbounce.utils.item.isNothing
 import net.fabricmc.loader.api.FabricLoader
 import net.minecraft.block.Blocks
@@ -209,7 +210,7 @@ fun interactItem(
     preInteraction()
 
     interaction.interactItem(player, hand, yaw, pitch).takeIf { it.isAccepted }?.let {
-        if (it is ActionResult.Success && it.swingSource == ActionResult.SwingSource.CLIENT) {
+        if (it.shouldSwingHand()) {
             player.swingHand(hand)
         }