Fixed animations being stuck. Animations should now properly continue where they left off when a player rejoins a server/ singleplayer world.

This commit is contained in:
Luis C.M committed 2024-03-29 16:37:31 -05:00
1 parent fd4a6d0a2c
commit 266a6515e5
7 files changed
+171 -65

No files matched your search

@@ -1,7 +1,7 @@
package noppes.npcs.controllers.data;
import cpw.mods.fml.common.FMLCommonHandler;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -10,6 +10,7 @@ import net.minecraft.util.AxisAlignedBB;
import noppes.npcs.*;
import noppes.npcs.api.entity.IAnimatable;
import noppes.npcs.api.entity.ICustomNpc;
import noppes.npcs.api.entity.IEntity;
import noppes.npcs.api.entity.IPlayer;
import noppes.npcs.api.handler.data.IAnimation;
import noppes.npcs.api.handler.data.IAnimationData;
@@ -32,7 +33,7 @@ public class AnimationData implements IAnimationData {
public Animation animation;
public boolean allowAnimation = false;
private Animation sentAnimation;
public Animation currentClientAnimation;
private boolean isClientAnimating;
private final HashSet<Integer> cachedAnimationIDs = new HashSet<>();
@@ -51,6 +52,16 @@ public class AnimationData implements IAnimationData {
}
}
public static AnimationData getData(Entity entity) {
if (entity instanceof EntityPlayerMP) {
return PlayerData.get((EntityPlayer) entity).animationData;
} else if (entity instanceof EntityNPCInterface) {
return ((EntityNPCInterface)entity).display.animationData;
} else {
return null;
}
}
public IAnimatable getEntity() {
if (this.parent instanceof DataDisplay) {
EntityNPCInterface npc = ((DataDisplay)this.parent).npc;
@@ -74,13 +85,13 @@ public class AnimationData implements IAnimationData {
EntityLivingBase sendingEntity = parent instanceof PlayerData ? ((PlayerData) parent).player : parent instanceof DataDisplay ? ((DataDisplay) parent).npc : null;
float range = parent instanceof PlayerData ? 160 : 60;
if (sendingEntity != null) {
boolean prevIsClientAnimating = this.isClientAnimating && this.sentAnimation.currentFrame() != null;
boolean prevIsClientAnimating = this.isClientAnimating && this.currentClientAnimation.currentFrame() != null;
this.isClientAnimating = this.allowAnimation && this.animation != null;
if (prevIsClientAnimating && (!this.isClientAnimating || this.animation != this.sentAnimation)) {
EventHooks.onAnimationEnded(this.sentAnimation);
if (prevIsClientAnimating && (!this.isClientAnimating || this.animation != this.currentClientAnimation)) {
EventHooks.onAnimationEnded(this.currentClientAnimation);
}
if (this.isClientAnimating) {
this.sentAnimation = this.animation;
this.currentClientAnimation = this.animation;
}
if (this.animation != null && this.allowAnimation) {
@@ -89,10 +100,6 @@ public class AnimationData implements IAnimationData {
EventHooks.onAnimationFrameEntered(this.animation, this.animation.currentFrame());
}
if (!CustomNpcs.proxy.hasClient()) {
CommonProxy.serverPlayingAnimations.add(this.animation);
}
List<EntityPlayer> entities = sendingEntity.worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(
sendingEntity.posX - range, sendingEntity.posY - range, sendingEntity.posZ - range,
sendingEntity.posX + range, sendingEntity.posY + range, sendingEntity.posZ + range));
@@ -105,13 +112,21 @@ public class AnimationData implements IAnimationData {
if (animationNBT == null && this.animation != null && !animationData.isCached(this.animation.getID())) {
animationNBT = this.animation.writeToNBT();
}
animationData.viewAnimation(this.animation, sendingEntity, this, animationNBT);
animationData.viewAnimation(this.animation, this, animationNBT);
}
}
}
public boolean isClientAnimating() {
return this.isClientAnimating;
}
public boolean isActive() {
if (!this.allowAnimation || this.animation == null || this.animation.currentFrame == this.animation.frames.size() || animation.currentFrame() == null)
return this.isActive(this.animation);
}
public boolean isActive(Animation animation) {
if (!this.allowAnimation || animation == null || animation.currentFrame == animation.frames.size() || animation.currentFrame() == null)
return false;
if (this.parent instanceof DataDisplay) {
@@ -152,27 +167,69 @@ public class AnimationData implements IAnimationData {
this.cachedAnimationIDs.clear();
}
public void viewAnimation(Animation animation, EntityLivingBase entity, AnimationData animationData, NBTTagCompound animationNBT) {
NBTTagCompound data = animationData.writeToNBT(new NBTTagCompound());
public void viewAnimation(Animation animation, AnimationData animationData, NBTTagCompound animationNBT) {
this.viewAnimation(animation, animationData, animationNBT, animationData.allowAnimation, -1, -1);
}
public void viewAnimation(Animation animation, AnimationData animationData, NBTTagCompound animationNBT, boolean enabled, int currentFrame, int time) {
boolean prevEnabled = animationData.allowAnimation;
animationData.allowAnimation = enabled;
NBTTagCompound data = animationData.viewWriteNBT(new NBTTagCompound());
animationData.allowAnimation = prevEnabled;
synchronized (CommonProxy.serverPlayingAnimations) {
if (animationData.animationEntity != null && !animationData.animationEntity.worldObj.isRemote) {
CommonProxy.serverPlayingAnimations.add(animation);
}
}
if (animation != null && currentFrame >= 0 && currentFrame < animation.frames.size()) {
data.setInteger("Frame", currentFrame);
data.setInteger("Time", time);
}
if (animation != null) {
if (this.cachedAnimationIDs.contains(animation.getID())) {
if (this.cachedAnimationIDs.contains(animation.getID()) && !data.hasKey("Frame")) {
data.setInteger("AnimationID", animation.getID());
} else {
data.setTag("Animation", animationNBT);
}
}
IAnimatable animatable = animationData.getEntity();
Entity entity = ((IEntity<?>) animatable).getMCEntity();
if (!(entity instanceof EntityPlayer)) {
data.setInteger("EntityId", entity.getEntityId());
}
Server.sendData((EntityPlayerMP) ((PlayerData) parent).player, EnumPacketClient.UPDATE_ANIMATIONS, data, entity.getCommandSenderName());
}
public NBTTagCompound viewWriteNBT(NBTTagCompound compound) {
compound.setBoolean("AllowAnimation", allowAnimation);
return compound;
}
public void viewReadFromNBT(NBTTagCompound compound) {
this.setEnabled(compound.getBoolean("AllowAnimation"));
}
public NBTTagCompound writeToNBT(NBTTagCompound compound) {
if (this.currentClientAnimation != null) {
compound.setTag("CurrentAnimation", currentClientAnimation.writeToNBT());
compound.setBoolean("IsClientAnimating", isClientAnimating);
}
compound.setBoolean("AllowAnimation", allowAnimation);
return compound;
}
public void readFromNBT(NBTTagCompound compound) {
if (compound.hasKey("CurrentAnimation")) {
this.currentClientAnimation = new Animation();
this.currentClientAnimation.parent = this;
this.currentClientAnimation.readFromNBT(compound.getCompoundTag("CurrentAnimation"));
this.isClientAnimating = compound.getBoolean("IsClientAnimating");
}
this.setEnabled(compound.getBoolean("AllowAnimation"));
}
@@ -194,12 +251,15 @@ public class AnimationData implements IAnimationData {
if (animation != null) {
newAnim = new Animation();
newAnim.readFromNBT(((Animation) animation).writeToNBT());
newAnim.currentFrame = 0;
newAnim.currentFrameTime = 0;
newAnim.parent = this;
}
if (CustomNpcs.proxy.hasClient() && newAnim != null) {
CommonProxy.clientPlayingAnimations.remove(this.animation);
CommonProxy.clientPlayingAnimations.add(newAnim);
synchronized (CommonProxy.clientPlayingAnimations) {
if (this.animationEntity != null && this.animationEntity.worldObj.isRemote && newAnim != null) {
CommonProxy.clientPlayingAnimations.add(newAnim);
}
}
this.animation = newAnim;