Skip to content

Commit 7e7999f

Browse files
committed
Undo lean field changes
1 parent 56da720 commit 7e7999f

File tree

1 file changed

+8
-14
lines changed

1 file changed

+8
-14
lines changed

src/main/java/org/visuals/legacy/animatium/mixins/v1/entity/cape_movement/MixinAvatarRenderer_CapeRotation.java

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
package org.visuals.legacy.animatium.mixins.v1.entity.cape_movement;
2727

28+
import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
2829
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
2930
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
3031
import net.minecraft.client.entity.ClientAvatarEntity;
@@ -36,6 +37,7 @@
3637
import net.minecraft.client.renderer.entity.state.AvatarRenderState;
3738
import net.minecraft.util.Mth;
3839
import net.minecraft.world.entity.Avatar;
40+
import org.objectweb.asm.Opcodes;
3941
import org.spongepowered.asm.mixin.Mixin;
4042
import org.spongepowered.asm.mixin.injection.At;
4143
import org.spongepowered.asm.mixin.injection.ModifyArg;
@@ -66,21 +68,13 @@ public MixinAvatarRenderer_CapeRotation(EntityRendererProvider.Context context,
6668
}
6769
}
6870

69-
@WrapOperation(method = "extractCapeState", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Mth;clamp(FFF)F", ordinal = 1))
70-
private static float animatium$dontAssignLeanField(final float value, final float min, final float max, final Operation<Float> original) {
71-
if (Animatium.isEnabled() && AnimatiumConfig.instance().movement.capeMovement) {
72-
return value;
73-
} else {
74-
return original.call(value, min, max);
75-
}
71+
@WrapWithCondition(method = "extractCapeState", at = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/entity/state/AvatarRenderState;capeLean:F", ordinal = 1, opcode = Opcodes.PUTFIELD))
72+
private static boolean animatium$dontAssignLeanField(AvatarRenderState instance, float value) {
73+
return !Animatium.isEnabled() || !AnimatiumConfig.instance().movement.capeMovement;
7674
}
7775

78-
@WrapOperation(method = "extractCapeState", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Mth;clamp(FFF)F", ordinal = 2))
79-
private static float animatium$dontAssignLean2Field(final float value, final float min, final float max, final Operation<Float> original) {
80-
if (Animatium.isEnabled() && AnimatiumConfig.instance().movement.capeMovement) {
81-
return value;
82-
} else {
83-
return original.call(value, min, max);
84-
}
76+
@WrapWithCondition(method = "extractCapeState", at = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/entity/state/AvatarRenderState;capeLean2:F", ordinal = 1, opcode = Opcodes.PUTFIELD))
77+
private static boolean animatium$dontAssignLean2Field(AvatarRenderState instance, float value) {
78+
return !Animatium.isEnabled() || !AnimatiumConfig.instance().movement.capeMovement;
8579
}
8680
}

0 commit comments

Comments
 (0)