Invalid Choice Cant Move issue while using gimmiks

Summary

When i have certain gimmiks enabled i get an invalid move error

Steps to reproduce

video I tried to fix it as much as possible but i miss some case or the other since i dont fully understand how it works This is how i fixed it GitHubRepo It would really be appreciated if a fix can be provided for my mixin here as well since my mod is in prod i would like to fix this asap

What is the current bug behavior?

Doent allow me to use certain moves

What is the expected correct behavior?

Moves should work as they should

Cobblemon Version and Mod Loader

Same issue in both fabric and neoforge 1.21.1 cobblemon 1.6.1

Mods used besides Cobblemon

My own mod, but its not the issue

Relevant logs, screenshots and/or videos

(Paste any relevant logs - use code blocks (```) at the start and end to format console output, logs, and code, as it's very hard to read otherwise. Or just put a link here)