mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-18 02:15:11 +00:00
completely annihilated animation caching (not worth it)
This commit is contained in:
1 parent
4d963b0205
commit
e5673a85e7
7 files changed
+11
-83
No files matched your search
@@ -10,13 +10,17 @@ import io.netty.buffer.ByteBuf;
|
||||
import kamkeel.npcs.network.enums.EnumChannelType;
|
||||
import kamkeel.npcs.network.packets.data.*;
|
||||
import kamkeel.npcs.network.packets.data.gui.*;
|
||||
import kamkeel.npcs.network.packets.data.gui.IsGuiOpenPacket;
|
||||
import kamkeel.npcs.network.packets.data.large.*;
|
||||
import kamkeel.npcs.network.packets.data.npc.*;
|
||||
import kamkeel.npcs.network.packets.data.script.*;
|
||||
import kamkeel.npcs.network.packets.data.script.ScriptOverlayClosePacket;
|
||||
import kamkeel.npcs.network.packets.data.script.ScriptOverlayDataPacket;
|
||||
import kamkeel.npcs.network.packets.data.script.ScriptedParticlePacket;
|
||||
import kamkeel.npcs.network.packets.player.*;
|
||||
import kamkeel.npcs.network.packets.request.*;
|
||||
import kamkeel.npcs.network.packets.request.animation.*;
|
||||
import kamkeel.npcs.network.packets.request.animation.AnimationGetPacket;
|
||||
import kamkeel.npcs.network.packets.request.animation.AnimationRemovePacket;
|
||||
import kamkeel.npcs.network.packets.request.animation.AnimationSavePacket;
|
||||
import kamkeel.npcs.network.packets.request.animation.AnimationsGetPacket;
|
||||
import kamkeel.npcs.network.packets.request.bank.BankGetPacket;
|
||||
import kamkeel.npcs.network.packets.request.bank.BankRemovePacket;
|
||||
import kamkeel.npcs.network.packets.request.bank.BankSavePacket;
|
||||
@@ -80,7 +84,10 @@ import noppes.npcs.NoppesUtilServer;
|
||||
import noppes.npcs.config.ConfigMain;
|
||||
import noppes.npcs.entity.EntityNPCInterface;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Hashtable;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class PacketHandler {
|
||||
public static PacketHandler Instance;
|
||||
@@ -295,7 +302,6 @@ public class PacketHandler {
|
||||
REQUEST_PACKET.registerPacket(new AnimationGetPacket());
|
||||
REQUEST_PACKET.registerPacket(new AnimationRemovePacket());
|
||||
REQUEST_PACKET.registerPacket(new AnimationSavePacket());
|
||||
REQUEST_PACKET.registerPacket(new AnimationCachePacket());
|
||||
|
||||
// Moving Path
|
||||
REQUEST_PACKET.registerPacket(new MovingPathSavePacket());
|
||||
|
||||
@@ -5,10 +5,8 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import kamkeel.npcs.network.AbstractPacket;
|
||||
import kamkeel.npcs.network.PacketChannel;
|
||||
import kamkeel.npcs.network.PacketClient;
|
||||
import kamkeel.npcs.network.PacketHandler;
|
||||
import kamkeel.npcs.network.enums.EnumDataPacket;
|
||||
import kamkeel.npcs.network.packets.request.animation.AnimationCachePacket;
|
||||
import kamkeel.npcs.util.ByteBufUtils;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.entity.Entity;
|
||||
|
||||
-46
@@ -1,46 +0,0 @@
|
||||
package kamkeel.npcs.network.packets.request.animation;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import kamkeel.npcs.network.AbstractPacket;
|
||||
import kamkeel.npcs.network.PacketChannel;
|
||||
import kamkeel.npcs.network.PacketHandler;
|
||||
import kamkeel.npcs.network.enums.EnumRequestPacket;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import noppes.npcs.controllers.PlayerDataController;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
public final class AnimationCachePacket extends AbstractPacket {
|
||||
public static final String packetName = "Request|AnimationCache";
|
||||
private int id;
|
||||
|
||||
public AnimationCachePacket() {
|
||||
}
|
||||
|
||||
public AnimationCachePacket(int id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Enum getType() {
|
||||
return EnumRequestPacket.CacheAnimation;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PacketChannel getChannel() {
|
||||
return PacketHandler.REQUEST_PACKET;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void sendData(ByteBuf out) throws IOException {
|
||||
out.writeInt(this.id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
PlayerDataController.Instance.getPlayerData(player).animationData.cacheAnimation(in.readInt());
|
||||
}
|
||||
}
|
||||
@@ -51,7 +51,6 @@ public class ClientCacheHandler {
|
||||
ClientCacheHandler.customOverlays.clear();
|
||||
ClientCacheHandler.skinOverlays.clear();
|
||||
ClientCacheHandler.playerAnimations.clear();
|
||||
ClientCacheHandler.playerData.animationData.clearCache();
|
||||
}
|
||||
|
||||
public static void clearSkinCache() {
|
||||
|
||||
@@ -8,7 +8,6 @@ import noppes.npcs.LogWriter;
|
||||
import noppes.npcs.api.handler.IAnimationHandler;
|
||||
import noppes.npcs.api.handler.data.IAnimation;
|
||||
import noppes.npcs.controllers.data.Animation;
|
||||
import noppes.npcs.controllers.data.PlayerData;
|
||||
import noppes.npcs.util.NBTJsonUtil;
|
||||
|
||||
import java.io.*;
|
||||
@@ -121,10 +120,6 @@ public class AnimationController implements IAnimationHandler {
|
||||
animations.remove(animation.getID());
|
||||
animations.put(animation.getID(), (Animation) animation);
|
||||
|
||||
for (PlayerData playerData : PlayerDataController.Instance.getAllPlayerData()) {
|
||||
playerData.animationData.uncacheAnimation(animation.getID());
|
||||
}
|
||||
|
||||
saveAnimationMap();
|
||||
|
||||
// Save Animation File
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
package noppes.npcs.controllers.data;
|
||||
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import kamkeel.npcs.network.PacketHandler;
|
||||
import kamkeel.npcs.network.packets.data.UpdateAnimationsPacket;
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -14,7 +12,6 @@ import net.minecraft.util.AxisAlignedBB;
|
||||
import noppes.npcs.CommonProxy;
|
||||
import noppes.npcs.DataDisplay;
|
||||
import noppes.npcs.EventHooks;
|
||||
import noppes.npcs.Server;
|
||||
import noppes.npcs.api.entity.IAnimatable;
|
||||
import noppes.npcs.api.entity.IEntity;
|
||||
import noppes.npcs.api.handler.data.IAnimation;
|
||||
@@ -25,7 +22,6 @@ import noppes.npcs.entity.EntityNPCInterface;
|
||||
import noppes.npcs.scripted.NpcAPI;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@@ -41,8 +37,6 @@ public class AnimationData implements IAnimationData {
|
||||
public Animation currentClientAnimation;
|
||||
private boolean isClientAnimating;
|
||||
|
||||
private final HashSet<Integer> cachedAnimationIDs = new HashSet<>();
|
||||
|
||||
//Client-side values
|
||||
public int finishedTime = -1;
|
||||
public int finishedFrame = -1;
|
||||
@@ -182,22 +176,6 @@ public class AnimationData implements IAnimationData {
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isCached(int id) {
|
||||
return this.cachedAnimationIDs.contains(id);
|
||||
}
|
||||
|
||||
public void cacheAnimation(int id) {
|
||||
this.cachedAnimationIDs.add(id);
|
||||
}
|
||||
|
||||
public void uncacheAnimation(int id) {
|
||||
this.cachedAnimationIDs.remove(id);
|
||||
}
|
||||
|
||||
public void clearCache() {
|
||||
this.cachedAnimationIDs.clear();
|
||||
}
|
||||
|
||||
public void viewAnimation(Animation animation, AnimationData animationData, NBTTagCompound animationNBT) {
|
||||
this.viewAnimation(animation, animationData, animationNBT, animationData.allowAnimation, -1, -1);
|
||||
}
|
||||
|
||||
@@ -69,12 +69,10 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData {
|
||||
public ScreenSize screenSize = new ScreenSize(-1,-1);
|
||||
|
||||
public void onLogin() {
|
||||
this.animationData.clearCache();
|
||||
}
|
||||
|
||||
public void onLogout() {
|
||||
this.partyInvites.clear();
|
||||
this.animationData.clearCache();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user