added basic swing mode implementation, needs to also change/disable the drop down animation

Author: beanbag44

common/src/main/java/com/lambda/mixin/entity/ClientPlayerEntityMixin.java

@@ -6,9 +6,12 @@
 import com.lambda.event.events.TickEvent;
 import com.lambda.interaction.PlayerPacketManager;
 import com.lambda.interaction.RotationManager;
+import com.lambda.module.modules.render.ViewModel;
 import net.minecraft.client.input.Input;
+import net.minecraft.client.network.AbstractClientPlayerEntity;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.entity.MovementType;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.Vec3d;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -91,4 +94,16 @@ float fixHeldItemYaw(ClientPlayerEntity instance) {
     float fixHeldItemPitch(ClientPlayerEntity instance) {
         return Objects.requireNonNullElse(RotationManager.getHandPitch(), instance.getPitch());
     }
+
+    @Redirect(method = "swingHand", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/AbstractClientPlayerEntity;swingHand(Lnet/minecraft/util/Hand;)V"))
+    private void adjustSwing(AbstractClientPlayerEntity instance, Hand hand) {
+        ViewModel viewModel = ViewModel.INSTANCE;
+
+        if (!viewModel.isEnabled()) {
+            instance.swingHand(hand);
+            return;
+        }
+
+        viewModel.adjustSwing(hand, instance);
+    }
 }

common/src/main/java/com/lambda/mixin/render/HeldItemRendererMixin.java

@@ -16,11 +16,15 @@
 public class HeldItemRendererMixin {
     @Inject(method = "renderFirstPersonItem", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/item/HeldItemRenderer;renderArmHoldingItem(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IFFLnet/minecraft/util/Arm;)V"))
     private void onRenderArmHoldingItem(AbstractClientPlayerEntity player, float tickDelta, float pitch, Hand hand, float swingProgress, ItemStack itemStack, float equipProgress, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo ci) {
-        if (ViewModel.INSTANCE.isEnabled()) ViewModel.INSTANCE.transform(itemStack, hand, matrices);
+        if (!ViewModel.INSTANCE.isEnabled()) return;
+
+        ViewModel.INSTANCE.transform(itemStack, hand, matrices);
     }
 
     @Inject(method = "renderFirstPersonItem", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/item/HeldItemRenderer;renderItem(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/render/model/json/ModelTransformationMode;ZLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V"))
     private void onRenderFirstPersonItem(AbstractClientPlayerEntity player, float tickDelta, float pitch, Hand hand, float swingProgress, ItemStack itemStack, float equipProgress, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo ci) {
-        if (ViewModel.INSTANCE.isEnabled()) ViewModel.INSTANCE.transform(itemStack, hand, matrices);
+        if (!ViewModel.INSTANCE.isEnabled()) return;
+
+        ViewModel.INSTANCE.transform(itemStack, hand, matrices);
     }
 }

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

@@ -3,6 +3,7 @@ package com.lambda.module.modules.render
 import com.lambda.Lambda.mc
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
+import net.minecraft.client.network.AbstractClientPlayerEntity
 import net.minecraft.client.util.math.MatrixStack
 import net.minecraft.item.ItemStack
 import net.minecraft.util.Arm
@@ -21,7 +22,7 @@ object ViewModel : Module(
     //ToDo: implement the rest of the settings and maybe add a couple more
 
     private val ignoreHand by setting("Ignore Hand", false, "Prevents adjusting the players hand", visibility = { page == Page.General })
-    val swingMode by setting("Swing Mode", SwingMode.MainHand, "Changes which hands swing", visibility = { page == Page.General })
+    private val swingMode by setting("Swing Mode", SwingMode.Standard, "Changes which hands swing", visibility = { page == Page.General })
     val swingSpeed by setting("Swing Speed", 6, 0..20, 1, "Adjusts how fast the player swings", visibility = { page == Page.General })
     val swingProgress by setting("Swing Progress", 0.0f, 0.0f..1.0f, 0.025f, "Renders as if the player was this progress through the swing animation", visibility = { page == Page.General })
     val oldSwingAnimation by setting("Old Swing Animation", false, "Adjusts the swing animation to what it looked like in 1.8", visibility = { page == Page.General })
@@ -76,7 +77,7 @@ object ViewModel : Module(
     }
 
     enum class SwingMode {
-        MainHand, OffHand, Both, None
+        Standard, Opposites, MainHand, OffHand, None
     }
 
     fun transform(itemStack: ItemStack, hand: Hand, matrices: MatrixStack) {
@@ -208,4 +209,27 @@ object ViewModel : Module(
             }
         }
     }
+
+    fun adjustSwing(hand: Hand, player: AbstractClientPlayerEntity) {
+        when (swingMode) {
+            SwingMode.Standard -> swingHand(hand, player)
+            SwingMode.Opposites -> {
+                if (hand == Hand.MAIN_HAND)
+                    swingHand(Hand.OFF_HAND, player)
+                else
+                    swingHand(Hand.MAIN_HAND, player)
+            }
+            SwingMode.MainHand -> swingHand(Hand.MAIN_HAND, player)
+            SwingMode.OffHand -> swingHand(Hand.OFF_HAND, player)
+            SwingMode.None -> {}
+        }
+    }
+
+    private fun swingHand(hand: Hand, player: AbstractClientPlayerEntity) {
+        if ((!player.handSwinging || player.handSwingTicks >= player.handSwingDuration / 2) || player.handSwingTicks < 0) {
+            player.handSwingTicks = -1
+            player.handSwinging = true
+            player.preferredHand = hand
+        }
+    }
 }

common/src/main/resources/lambda.accesswidener

@@ -19,6 +19,7 @@ accessible method net/minecraft/entity/Entity movementInputToVelocity (Lnet/mine
 accessible method net/minecraft/entity/passive/AbstractHorseEntity setHorseFlag (IZ)V
 accessible method net/minecraft/entity/passive/AbstractHorseEntity updateSaddle ()V
 accessible field net/minecraft/entity/LivingEntity lastAttackedTicks I
+accessible method net/minecraft/entity/LivingEntity getHandSwingDuration ()I
 
 # Camera
 accessible method net/minecraft/client/render/Camera setPos (DDD)V