swing

Author: beanbag44

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

@@ -31,6 +31,8 @@ class BreakSettings(
     override val breakThreshold by c.setting("Break Threshold", 1.0f, 0.1f..1.0f, 0.02f, "The break amount at which the block is considered broken") { vis() }
     override val doubleBreak by c.setting("Double Break", false, "Allows breaking two blocks at once") { vis() }
     override val breakDelay by c.setting("Break Delay", 5, 0..5, 1, "The delay between breaking blocks", " ticks") { vis() }
+    override val swing by c.setting("Swing Mode", SwingMode.Constant, "The times at which to swing the players hand") { vis() }
+    override val swingType by c.setting("Swing Type", SwingType.Vanilla, "The style of swing")
     override val sounds by c.setting("Sounds", true, "Plays the breaking sounds") { vis() }
     override val particles by c.setting("Particles", true, "Renders the breaking particles") { vis() }
     override val breakingTexture by c.setting("Breaking Overlay", true, "Overlays the breaking texture at its different stages") { vis() }

common/src/main/kotlin/com/lambda/interaction/request/breaking/BreakConfig.kt

@@ -28,6 +28,8 @@ abstract class BreakConfig(
     abstract val breakThreshold: Float
     abstract val doubleBreak: Boolean
     abstract val breakDelay: Int
+    abstract val swing: SwingMode
+    abstract val swingType: SwingType
     abstract val sounds: Boolean
     abstract val particles: Boolean
     abstract val breakingTexture: Boolean
@@ -49,6 +51,19 @@ abstract class BreakConfig(
         Packet
     }
 
+    enum class SwingMode {
+        Constant,
+        StartAndEnd,
+        Start,
+        End
+    }
+
+    enum class SwingType {
+        Vanilla,
+        Server,
+        Client
+    }
+
     enum class BreakConfirmationMode {
         None,
         BreakThenAwait,

common/src/main/kotlin/com/lambda/interaction/request/breaking/BreakManager.kt

@@ -36,13 +36,15 @@ import com.lambda.util.BlockUtils.fluidState
 import com.lambda.util.Communication.info
 import com.lambda.util.Communication.warn
 import com.lambda.util.collections.LimitedDecayQueue
+import com.lambda.util.player.swingHandClient
 import net.minecraft.block.BlockState
 import net.minecraft.block.OperatorBlock
 import net.minecraft.client.sound.PositionedSoundInstance
 import net.minecraft.client.sound.SoundInstance
 import net.minecraft.client.world.ClientWorld
 import net.minecraft.entity.player.PlayerEntity
 import net.minecraft.item.ItemStack
+import net.minecraft.network.packet.c2s.play.HandSwingC2SPacket
 import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket
 import net.minecraft.sound.SoundCategory
 import net.minecraft.util.math.BlockPos
@@ -204,6 +206,7 @@ object BreakManager : RequestHandler<BreakRequest>() {
                 info.nullify()
                 return false
             }
+            if (info.breakConfig.swing != BreakConfig.SwingMode.End) swingHand(info)
             return true
         }
 
@@ -245,15 +248,18 @@ object BreakManager : RequestHandler<BreakRequest>() {
             )
         }
 
+        if (info.breakConfig.breakingTexture) {
+            setBreakingTextureStage(info)
+        }
+
         if (progress >= info.getBreakThreshold()) {
             interaction.sendSequencedPacket(world) { sequence ->
                 onBlockBreak(info)
                 PlayerActionC2SPacket(PlayerActionC2SPacket.Action.STOP_DESTROY_BLOCK, ctx.expectedPos, hitResult.side, sequence)
             }
-        }
-
-        if (info.breakConfig.breakingTexture) {
-            setBreakingTextureStage(info)
+            if (info.breakConfig.swing != BreakConfig.SwingMode.Start) swingHand(info)
+        } else {
+            if (info.breakConfig.swing == BreakConfig.SwingMode.Constant) swingHand(info)
         }
 
         return true
@@ -366,6 +372,14 @@ object BreakManager : RequestHandler<BreakRequest>() {
         )
     }
 
+    private fun SafeContext.swingHand(info: BreakInfo) {
+        when (info.breakConfig.swingType) {
+            BreakConfig.SwingType.Vanilla -> player.swingHand(player.activeHand)
+            BreakConfig.SwingType.Server -> connection.sendPacket(HandSwingC2SPacket(player.activeHand))
+            BreakConfig.SwingType.Client -> swingHandClient(player.activeHand)
+        }
+    }
+
     data class BreakInfo(
         val context: BreakContext,
         var type: BreakType,

common/src/main/kotlin/com/lambda/util/player/PlayerUtils.kt

@@ -6,6 +6,7 @@ import net.minecraft.client.network.ClientPlayerEntity
 import net.minecraft.client.network.OtherClientPlayerEntity
 import net.minecraft.client.network.PlayerListEntry
 import net.minecraft.entity.player.PlayerEntity
+import net.minecraft.util.Hand
 
 fun SafeContext.copyPlayer(entity: ClientPlayerEntity) =
     ClientPlayerEntity(mc, world, mc.networkHandler, null, null, entity.isSneaking, entity.isSprinting).apply {
@@ -39,3 +40,11 @@ fun SafeContext.spawnFakePlayer(
 
     return entity
 }
+
+fun SafeContext.swingHandClient(hand: Hand) {
+    if (!player.handSwinging || player.handSwingTicks >= player.handSwingDuration / 2 || player.handSwingTicks < 0) {
+        player.handSwingTicks = -1
+        player.handSwinging = true
+        player.preferredHand = hand
+    }
+}