Fixed various bugs with first person animations.

Author: ZigyTheBird

CHANGELOG.md

@@ -1 +1 @@
-Fixed crash when using certain modifiers. (Thanks to PROHitman for reporting the bug.)
+Fixed various bugs with first person animations.

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
 # Mod properties
-mod_version = 1.1.2
+mod_version = 1.1.3
 maven_group = com.zigythebird.playeranim
 archives_base_name = PlayerAnimationLib
 

minecraft/common/src/main/java/com/zigythebird/playeranim/ModMixinPlugin.java

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package com.zigythebird.playeranim.mixin;
+package com.zigythebird.playeranim.mixin.firstPerson;
 
 import com.zigythebird.playeranim.accessors.IAnimatedPlayer;
 import com.zigythebird.playeranim.animation.PlayerAnimManager;
@@ -37,19 +37,17 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(HumanoidArmorLayer.class)
+@Mixin(value = HumanoidArmorLayer.class, priority = 2000)
 @SuppressWarnings("rawtypes")
 public abstract class HumanoidArmorLayerMixin<T extends LivingEntity, A extends HumanoidModel<T>> {
     @Inject(method = "setPartVisibility", at = @At("HEAD"), cancellable = true)
     private void modifyArmorVisibility(A humanoidModel, EquipmentSlot equipmentSlot, CallbackInfo ci) {
         PlayerAnimManager emote = ((IAnimatedPlayer) Minecraft.getInstance().player).playerAnimLib$getAnimManager();
-        if (emote.isActive() && emote.getFirstPersonMode() == FirstPersonMode.THIRD_PERSON_MODEL &&
-                emote.getFirstPersonConfiguration().isShowArmor() && FirstPersonMode.isFirstPersonPass()) {
+        if (emote.isActive() && emote.getFirstPersonMode() == FirstPersonMode.THIRD_PERSON_MODEL && FirstPersonMode.isFirstPersonPass()) {
             humanoidModel.setAllVisible(false);
-            if (equipmentSlot == EquipmentSlot.CHEST) {
+            if (equipmentSlot == EquipmentSlot.CHEST && emote.getFirstPersonConfiguration().isShowArmor()) {
                 humanoidModel.rightArm.visible = emote.getFirstPersonConfiguration().isShowRightArm();
                 humanoidModel.leftArm.visible = emote.getFirstPersonConfiguration().isShowLeftArm();
-                humanoidModel.body.visible = false;
             }
             ci.cancel();
         }

…ranim/mixin/HumanoidArmorLayerMixin.java …firstPerson/HumanoidArmorLayerMixin.javaminecraft/common/src/main/java/com/zigythebird/playeranim/mixin/HumanoidArmorLayerMixin.java renamed to minecraft/common/src/main/java/com/zigythebird/playeranim/mixin/firstPerson/HumanoidArmorLayerMixin.java minecraft/common/src/main/java/com/zigythebird/playeranim/mixin/HumanoidArmorLayerMixin.java renamed to minecraft/common/src/main/java/com/zigythebird/playeranim/mixin/firstPerson/HumanoidArmorLayerMixin.java

@@ -22,16 +22,22 @@
  * SOFTWARE.
  */
 
-package com.zigythebird.playeranim.mixin;
+package com.zigythebird.playeranim.mixin.firstPerson;
 
+import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.zigythebird.playeranimcore.api.firstPerson.FirstPersonMode;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.model.EntityModel;
 import net.minecraft.client.model.PlayerModel;
 import net.minecraft.client.player.AbstractClientPlayer;
+import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.entity.LivingEntityRenderer;
+import net.minecraft.client.renderer.entity.layers.HumanoidArmorLayer;
+import net.minecraft.client.renderer.entity.layers.PlayerItemInHandLayer;
+import net.minecraft.client.renderer.entity.layers.RenderLayer;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -40,9 +46,10 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(LivingEntityRenderer.class)
+@Mixin(value = LivingEntityRenderer.class, priority = 2001)
 public class LivingEntityRendererMixin<T extends LivingEntity, M extends EntityModel<T>> {
-    @Shadow protected M model;
+    @Shadow
+    protected M model;
 
     @Inject(method = "render(Lnet/minecraft/world/entity/LivingEntity;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V", at = @At("TAIL"))
     private void render(T entity, float entityYaw, float partialTicks, PoseStack poseStack, MultiBufferSource buffer, int packedLight, CallbackInfo ci) {
@@ -63,4 +70,14 @@ private void render(T entity, float entityYaw, float partialTicks, PoseStack pos
         model.rightArm.visible = visible;
         model.leftArm.visible = visible;
     }
+
+    @WrapWithCondition(
+            method = "render(Lnet/minecraft/world/entity/LivingEntity;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V",
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/entity/layers/RenderLayer;render(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/Entity;FFFFFF)V"))
+    private boolean filterLayers(RenderLayer layer, PoseStack poseStack, MultiBufferSource multiBufferSource, int i, Entity entity, float v, float v1, float v2, float v3, float v4, float v5) {
+        if (entity instanceof LocalPlayer && FirstPersonMode.isFirstPersonPass()) {
+            return layer instanceof PlayerItemInHandLayer || layer instanceof HumanoidArmorLayer<?,?,?>;
+        }
+        return true;
+    }
 }

…nim/mixin/LivingEntityRendererMixin.java …rstPerson/LivingEntityRendererMixin.javaminecraft/common/src/main/java/com/zigythebird/playeranim/mixin/LivingEntityRendererMixin.java renamed to minecraft/common/src/main/java/com/zigythebird/playeranim/mixin/firstPerson/LivingEntityRendererMixin.java minecraft/common/src/main/java/com/zigythebird/playeranim/mixin/LivingEntityRendererMixin.java renamed to minecraft/common/src/main/java/com/zigythebird/playeranim/mixin/firstPerson/LivingEntityRendererMixin.java

@@ -1,25 +1,23 @@
 {
   "required": true,
   "package": "com.zigythebird.playeranim.mixin",
-  "plugin": "com.zigythebird.playeranim.ModMixinPlugin",
   "compatibilityLevel": "JAVA_21",
   "minVersion": "0.8",
   "client": [
     "AbstractClientPlayerMixin",
     "CameraAccessor",
     "CapeLayerMixin",
     "ElytraLayerMixin",
-    "HumanoidArmorLayerMixin",
+    "firstPerson.HumanoidArmorLayerMixin",
     "HumanoidModelMixin",
     "ItemInHandLayerMixin",
-    "LivingEntityRendererMixin",
     "PlayerModelAccessor",
     "PlayerModelMixin",
     "PlayerRendererMixin",
     "firstPerson.EntityRenderDispatcherMixin",
     "firstPerson.ItemInHandRendererMixin",
     "firstPerson.LevelRendererMixin",
-    "firstPerson.LivingEntityRendererMixin_noPA"
+    "firstPerson.LivingEntityRendererMixin"
   ],
   "mixins": [],
   "injectors": {