Fixed issue with visible parts in spectator mode

Author: ZigyTheBird

CHANGELOG.md

@@ -1 +1,2 @@
-Fixed various bugs with first person animations.
+Fixed model parts being visible when they shouldn't be in spectator mode.  
+More logs when an animation is not found.

gradle.properties

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

minecraft/common/src/main/java/com/zigythebird/playeranim/animation/PlayerAnimationController.java

@@ -2,6 +2,7 @@
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Axis;
+import com.zigythebird.playeranim.PlayerAnimLibMod;
 import com.zigythebird.playeranim.util.RenderUtil;
 import com.zigythebird.playeranimcore.animation.AnimationController;
 import com.zigythebird.playeranimcore.animation.AnimationData;
@@ -77,6 +78,7 @@ public boolean triggerAnimation(ResourceLocation newAnimation, float startAnimFr
             triggerAnimation(PlayerAnimResources.getAnimation(newAnimation), startAnimFrom);
             return true;
         }
+        PlayerAnimLibMod.LOGGER.error("Could not find animation with the name:" + newAnimation);
         return false;
     }
 

minecraft/common/src/main/java/com/zigythebird/playeranim/mixin/PlayerModelMixin.java

@@ -133,34 +133,21 @@ private void setupPlayerAnimation(Entity entity, float limbSwing, float limbSwin
             // Hiding all parts, because they should not be visible in first person
             playerAnimLib$setAllPartsVisible(false);
             // Showing arms based on configuration
-            var skipRightArm = !config.isShowRightArm();
-            var skipLeftArm = !config.isShowLeftArm();
-            this.rightArm.skipDraw = skipRightArm;
-            this.leftArm.skipDraw = skipLeftArm;
-
-            // These are children of those ^^^
-            // this.rightSleeve.skipDraw = skipRightArm;
-            // this.leftSleeve.skipDraw = skipLeftArm;
-        } else {
-            playerAnimLib$setAllPartsVisible(true);
+            this.rightArm.visible = config.isShowRightArm();
+            this.leftArm.visible = !config.isShowLeftArm();
+            this.rightSleeve.visible = config.isShowRightArm();
+            this.leftSleeve.visible = !config.isShowLeftArm();
         }
     }
 
     @Unique
     private void playerAnimLib$setAllPartsVisible(boolean visible) {
-        var skip = !visible;
-        this.head.skipDraw = skip;
-        this.head.getAllParts().forEach(p -> p.skipDraw = skip);
-        this.body.skipDraw = skip;
-        this.body.getAllParts().forEach(p -> p.skipDraw = skip);
-        this.leftLeg.skipDraw = skip;
-        this.leftLeg.getAllParts().forEach(p -> p.skipDraw = skip);
-        this.rightLeg.skipDraw = skip;
-        this.rightLeg.getAllParts().forEach(p -> p.skipDraw = skip);
-        this.rightArm.skipDraw = skip;
-        this.rightArm.getAllParts().forEach(p -> p.skipDraw = skip);
-        this.leftArm.skipDraw = skip;
-        this.leftArm.getAllParts().forEach(p -> p.skipDraw = skip);
+        this.head.visible = visible;
+        this.body.visible = visible;
+        this.leftLeg.visible = visible;
+        this.rightLeg.visible = visible;
+        this.rightArm.visible = visible;
+        this.leftArm.visible = visible;
 
         this.hat.visible = visible;
         this.leftSleeve.visible = visible;

minecraft/common/src/main/java/com/zigythebird/playeranim/mixin/firstPerson/LivingEntityRendererMixin.java

@@ -27,10 +27,7 @@
 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;
@@ -40,37 +37,10 @@
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-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;
 
 @Mixin(value = LivingEntityRenderer.class, priority = 2001)
 public class LivingEntityRendererMixin<T extends LivingEntity, M extends EntityModel<T>> {
-    @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) {
-        if (FirstPersonMode.isFirstPersonPass() && entity instanceof AbstractClientPlayer player
-                && player == Minecraft.getInstance().cameraEntity) {
-            playerAnimLib$setAllPartsVisible(true);
-        }
-    }
-
-    @Unique
-    private void playerAnimLib$setAllPartsVisible(boolean visible) {
-        PlayerModel model = (PlayerModel)this.model;
-
-        model.head.visible = visible;
-        model.body.visible = visible;
-        model.leftLeg.visible = visible;
-        model.rightLeg.visible = visible;
-        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"))