diff --git a/src/main/java/com/tiedup/remake/rig/anim/types/ActionAnimation.java b/src/main/java/com/tiedup/remake/rig/anim/types/ActionAnimation.java index d81b02f..fa76df1 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/types/ActionAnimation.java +++ b/src/main/java/com/tiedup/remake/rig/anim/types/ActionAnimation.java @@ -58,7 +58,7 @@ public class ActionAnimation extends MainFrameAnimation { * frames à chaque entrée dans l'action anim.

*/ public void correctRootJoint( - com.tiedup.remake.rig.anim.types.LinkAnimation linkAnimation, + com.tiedup.remake.rig.anim.types.DynamicAnimation animation, com.tiedup.remake.rig.anim.Pose pose, com.tiedup.remake.rig.patch.LivingEntityPatch entitypatch, float time, diff --git a/src/main/java/com/tiedup/remake/rig/anim/types/AttackAnimation.java b/src/main/java/com/tiedup/remake/rig/anim/types/AttackAnimation.java index 0eff923..62b989b 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/types/AttackAnimation.java +++ b/src/main/java/com/tiedup/remake/rig/anim/types/AttackAnimation.java @@ -6,9 +6,6 @@ package com.tiedup.remake.rig.anim.types; -import java.util.Collections; -import java.util.List; - import net.minecraft.world.InteractionHand; import com.tiedup.remake.rig.armature.Armature; @@ -35,8 +32,11 @@ public class AttackAnimation extends ActionAnimation { * Liste des phases d'attaque. Toujours vide en TiedUp — on ne joue * jamais d'animation attaque. Mais le field doit exister pour que * JsonAssetLoader.java ligne 591 puisse itérer dessus sans NPE. + * + *

Type {@code Phase[]} (et non {@code List}) pour s'aligner + * sur la signature upstream EF — facilite le re-port de fixes EF.

*/ - public final List phases = Collections.emptyList(); + public final Phase[] phases = new Phase[0]; public AttackAnimation(float transitionTime, boolean isRepeat, String registryName, AssetAccessor armature) { super(transitionTime, isRepeat, registryName, armature);