diff --git a/src/main/java/noppes/npcs/mixin/CustomNPCsMixinPlugin.java b/src/main/java/noppes/npcs/mixin/CustomNPCsMixinPlugin.java index 3a4643556..1fb4b4ef7 100644 --- a/src/main/java/noppes/npcs/mixin/CustomNPCsMixinPlugin.java +++ b/src/main/java/noppes/npcs/mixin/CustomNPCsMixinPlugin.java @@ -49,6 +49,7 @@ public class CustomNPCsMixinPlugin implements IMixinConfigPlugin { } if (ConfigMixin.AnimationMixin) { mixins.add("MixinModelRenderer"); + mixins.add("MixinMPMModelScaleRenderer"); mixins.add("MixinRendererLivingEntity"); } if (ConfigMixin.FirstPersonAnimationMixin) { diff --git a/src/main/java/noppes/npcs/mixin/MixinMPMModelScaleRenderer.java b/src/main/java/noppes/npcs/mixin/MixinMPMModelScaleRenderer.java new file mode 100644 index 000000000..2166d12e2 --- /dev/null +++ b/src/main/java/noppes/npcs/mixin/MixinMPMModelScaleRenderer.java @@ -0,0 +1,70 @@ +package noppes.npcs.mixin; + +import net.minecraft.client.model.ModelRenderer; +import noppes.npcs.AnimationMixinFunctions; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Pseudo; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +/** + * Lets CustomNPC+ animations reach MorePlayerModels+' replacement limbs. + * + * MPM's ModelScaleRenderer overrides ModelRenderer.render without calling the + * parent implementation, so the normal animation mixin is bypassed. The + * string target and {@link Pseudo} keep this integration entirely optional. + */ +@Pseudo +@Mixin(targets = "noppes.mpm.client.model.ModelScaleRenderer", remap = false) +public abstract class MixinMPMModelScaleRenderer { + + @Unique private boolean cnpc$changed; + @Unique private float cnpc$pointX; + @Unique private float cnpc$pointY; + @Unique private float cnpc$pointZ; + @Unique private float cnpc$angleX; + @Unique private float cnpc$angleY; + @Unique private float cnpc$angleZ; + @Unique private float cnpc$offsetX; + @Unique private float cnpc$offsetY; + @Unique private float cnpc$offsetZ; + + @Inject(method = {"render(F)V", "func_78785_a(F)V"}, at = @At("HEAD"), remap = false, require = 0) + private void cnpc$applyAnimation(float scale, CallbackInfo callbackInfo) { + ModelRenderer renderer = (ModelRenderer) (Object) this; + cnpc$pointX = renderer.rotationPointX; + cnpc$pointY = renderer.rotationPointY; + cnpc$pointZ = renderer.rotationPointZ; + cnpc$angleX = renderer.rotateAngleX; + cnpc$angleY = renderer.rotateAngleY; + cnpc$angleZ = renderer.rotateAngleZ; + cnpc$offsetX = renderer.offsetX; + cnpc$offsetY = renderer.offsetY; + cnpc$offsetZ = renderer.offsetZ; + + try { + cnpc$changed = AnimationMixinFunctions.applyValues(renderer); + } catch (Exception ignored) { + cnpc$changed = false; + } + } + + @Inject(method = {"render(F)V", "func_78785_a(F)V"}, at = @At("RETURN"), remap = false, require = 0) + private void cnpc$restoreAnimation(float scale, CallbackInfo callbackInfo) { + if (!cnpc$changed) return; + + ModelRenderer renderer = (ModelRenderer) (Object) this; + renderer.rotationPointX = cnpc$pointX; + renderer.rotationPointY = cnpc$pointY; + renderer.rotationPointZ = cnpc$pointZ; + renderer.rotateAngleX = cnpc$angleX; + renderer.rotateAngleY = cnpc$angleY; + renderer.rotateAngleZ = cnpc$angleZ; + renderer.offsetX = cnpc$offsetX; + renderer.offsetY = cnpc$offsetY; + renderer.offsetZ = cnpc$offsetZ; + cnpc$changed = false; + } +}