Clean up the HandView 'skip swap animation' setting

Author: Wide-Cat

src/main/java/meteordevelopment/meteorclient/mixin/HeldItemRendererMixin.java

@@ -6,6 +6,7 @@
 package meteordevelopment.meteorclient.mixin;
 
 import com.google.common.base.MoreObjects;
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import meteordevelopment.meteorclient.MeteorClient;
 import meteordevelopment.meteorclient.events.render.ArmRenderEvent;
 import meteordevelopment.meteorclient.events.render.HeldItemRendererEvent;
@@ -21,8 +22,10 @@
 import net.minecraft.util.Hand;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.*;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import static meteordevelopment.meteorclient.MeteorClient.mc;
@@ -41,6 +44,9 @@ public abstract class HeldItemRendererMixin {
     @Shadow
     private ItemStack offHand;
 
+    @Shadow
+    protected abstract boolean shouldSkipHandAnimationOnSwap(ItemStack from, ItemStack to);
+
     @ModifyVariable(method = "renderItem(FLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider$Immediate;Lnet/minecraft/client/network/ClientPlayerEntity;I)V", at = @At(value = "STORE", ordinal = 0), index = 6)
     private float modifySwing(float swingProgress) {
         HandView module = Modules.get().get(HandView.class);
@@ -58,22 +64,22 @@ private float modifySwing(float swingProgress) {
         return swingProgress;
     }
 
-    @Redirect(method = "updateHeldItems", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/item/HeldItemRenderer;shouldSkipHandAnimationOnSwap(Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/ItemStack;)Z"))
-    private boolean redirectSwapping(HeldItemRenderer instance, ItemStack from, ItemStack to) {
-        return skipSwapAnimation(from, to);
+    @ModifyReturnValue(method = "shouldSkipHandAnimationOnSwap", at = @At("RETURN"))
+    private boolean modifySkipSwapAnimation(boolean original) {
+        return original || Modules.get().get(HandView.class).skipSwapping();
     }
 
     @ModifyArg(method = "updateHeldItems", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/MathHelper;clamp(FFF)F", ordinal = 2), index = 0)
     private float modifyEquipProgressMainhand(float value) {
         float f = mc.player.getAttackCooldownProgress(1f);
         float modified = Modules.get().get(HandView.class).oldAnimations() ? 1 : f * f * f;
 
-        return (skipSwapAnimation(mainHand, mc.player.getMainHandStack()) ? modified : 0) - equipProgressMainHand;
+        return (shouldSkipHandAnimationOnSwap(mainHand, mc.player.getMainHandStack()) ? modified : 0) - equipProgressMainHand;
     }
 
     @ModifyArg(method = "updateHeldItems", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/MathHelper;clamp(FFF)F", ordinal = 3), index = 0)
     private float modifyEquipProgressOffhand(float value) {
-        return (skipSwapAnimation(offHand, mc.player.getOffHandStack()) ? 1 : 0) - equipProgressOffHand;
+        return (shouldSkipHandAnimationOnSwap(offHand, mc.player.getOffHandStack()) ? 1 : 0) - equipProgressOffHand;
     }
 
     @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/item/ItemDisplayContext;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V", shift = At.Shift.BEFORE))
@@ -90,9 +96,4 @@ private void onRenderArm(AbstractClientPlayerEntity player, float tickDelta, flo
     private void cancelTransformations(MatrixStack matrices, float tickDelta, Arm arm, ItemStack stack, PlayerEntity player, CallbackInfo ci) {
         if (Modules.get().get(HandView.class).disableFoodAnimation()) ci.cancel();
     }
-
-    @Unique
-    private boolean skipSwapAnimation(ItemStack stack1, ItemStack stack2) {
-        return !Modules.get().get(HandView.class).showSwapping() || ItemStack.areEqual(stack1, stack2);
-    }
 }

src/main/java/meteordevelopment/meteorclient/systems/modules/render/HandView.java

@@ -39,10 +39,10 @@ public class HandView extends Module {
         .build()
     );
 
-    public final Setting<Boolean> showSwapping = sgGeneral.add(new BoolSetting.Builder()
-        .name("show-swapping")
-        .description("Whether or not to show the item swapping animation")
-        .defaultValue(true)
+    public final Setting<Boolean> skipSwapping = sgGeneral.add(new BoolSetting.Builder()
+        .name("skip-swapping-animation")
+        .description("Whether or not to skip the item swapping animation")
+        .defaultValue(false)
         .build()
     );
 
@@ -223,8 +223,8 @@ public boolean oldAnimations() {
         return isActive() && oldAnimations.get();
     }
 
-    public boolean showSwapping() {
-        return isActive() && showSwapping.get();
+    public boolean skipSwapping() {
+        return isActive() && skipSwapping.get();
     }
 
     public boolean disableFoodAnimation() {