mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-16 15:24:46 +00:00
Animations now continue where they should be when players rejoin a world/server.
This commit is contained in:
1 parent
cee52ec9e0
commit
a5ed14183e
7 files changed
+117
-34
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) {
|
||||
@@ -105,11 +116,15 @@ 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 false;
|
||||
@@ -152,27 +167,63 @@ 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;
|
||||
|
||||
|
||||
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.readFromNBT(compound.getCompoundTag("CurrentAnimation"));
|
||||
this.isClientAnimating = compound.getBoolean("IsClientAnimating");
|
||||
}
|
||||
this.setEnabled(compound.getBoolean("AllowAnimation"));
|
||||
}
|
||||
|
||||
@@ -194,11 +245,12 @@ 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);
|
||||
}
|
||||
this.animation = newAnim;
|
||||
|
||||
Reference in new issue
Block a user