mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-19 21:09:40 +00:00
Remove PacketHandlerClient
This commit is contained in:
1 parent
43b0e7c23b
commit
c3179b36f2
30 files changed
+238
-396
No files matched your search
@@ -34,6 +34,10 @@ public class PacketChannel {
|
||||
}
|
||||
|
||||
public void registerPacket(AbstractPacket packet) {
|
||||
if(packets.containsKey(packet.getType().ordinal())){
|
||||
System.out.println("Packet ID: " + packet.getType().ordinal() + " is already registered in " + this.channelName);
|
||||
return;
|
||||
}
|
||||
this.packets.put(packet.getType().ordinal(), packet);
|
||||
}
|
||||
}
|
||||
@@ -40,7 +40,6 @@ public final class PacketHandler {
|
||||
packetChannels.add(CLIENT_PACKET);
|
||||
|
||||
this.registerChannels();
|
||||
this.registerLargePackets();
|
||||
this.registerClientPackets();
|
||||
}
|
||||
|
||||
@@ -78,6 +77,7 @@ public final class PacketHandler {
|
||||
CLIENT_PACKET.registerPacket(new UpdateNpcPacket());
|
||||
CLIENT_PACKET.registerPacket(new DialogPacket());
|
||||
CLIENT_PACKET.registerPacket(new RolePacket());
|
||||
CLIENT_PACKET.registerPacket(new WeaponNpcPacket());
|
||||
|
||||
// Client | Script Packets
|
||||
CLIENT_PACKET.registerPacket(new ScriptedParticlePacket());
|
||||
|
||||
@@ -5,12 +5,9 @@ import kamkeel.npcs.network.packets.client.AchievementPacket;
|
||||
import kamkeel.npcs.network.packets.client.QuestCompletionPacket;
|
||||
import kamkeel.npcs.network.packets.client.ScrollSelectedPacket;
|
||||
import kamkeel.npcs.network.packets.client.gui.GuiClosePacket;
|
||||
import kamkeel.npcs.network.packets.client.large.LargeGuiDataPacket;
|
||||
import kamkeel.npcs.network.packets.client.large.*;
|
||||
import kamkeel.npcs.network.packets.client.gui.GuiErrorPacket;
|
||||
import kamkeel.npcs.network.packets.client.gui.GuiOpenPacket;
|
||||
import kamkeel.npcs.network.packets.client.large.LargeScrollGroupPacket;
|
||||
import kamkeel.npcs.network.packets.client.large.LargeScrollDataPacket;
|
||||
import kamkeel.npcs.network.packets.client.large.LargeScrollListPacket;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import noppes.npcs.constants.EnumGuiType;
|
||||
@@ -65,6 +62,12 @@ public class PacketUtil {
|
||||
PacketHandler.Instance.sendToPlayer(packet, playerMP);
|
||||
}
|
||||
|
||||
public static void sendPartyData(EntityPlayerMP playerMP, NBTTagCompound compound){
|
||||
LargePartyDataPacket packet = new LargePartyDataPacket(compound);
|
||||
PacketHandler.Instance.sendToPlayer(packet, playerMP);
|
||||
}
|
||||
|
||||
|
||||
public static void sendQuestComplete(EntityPlayerMP playerMP, NBTTagCompound compound){
|
||||
QuestCompletionPacket packet = new QuestCompletionPacket(compound);
|
||||
PacketHandler.Instance.sendToPlayer(packet, playerMP);
|
||||
|
||||
@@ -21,6 +21,7 @@ public enum EnumClientPacket {
|
||||
ROLE_NPC,
|
||||
DELETE_NPC,
|
||||
CLONE_NPC,
|
||||
WEAPON_NPC,
|
||||
|
||||
// Data
|
||||
SCROLL_LIST,
|
||||
@@ -49,7 +50,7 @@ public enum EnumClientPacket {
|
||||
SCRIPT_OVERLAY_CLOSE,
|
||||
OVERLAY_QUEST_TRACKING,
|
||||
MARK_DATA,
|
||||
|
||||
|
||||
// Other
|
||||
VILLAGER_LIST,
|
||||
SWING_PLAYER_ARM,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
package kamkeel.npcs.network.enums;
|
||||
|
||||
public enum EnumPacketType {
|
||||
INFO, DATA, CLIENT, LARGE
|
||||
INFO, DATA, CLIENT
|
||||
}
|
||||
@@ -10,8 +10,6 @@ import kamkeel.npcs.network.enums.EnumClientPacket;
|
||||
import kamkeel.npcs.util.ByteBufUtils;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.util.ChatComponentTranslation;
|
||||
import noppes.npcs.CustomNpcs;
|
||||
import noppes.npcs.Server;
|
||||
import noppes.npcs.config.ConfigClient;
|
||||
|
||||
import java.io.IOException;
|
||||
@@ -50,7 +48,7 @@ public final class ChatAlertPacket extends AbstractPacket {
|
||||
|
||||
StringBuilder message = new StringBuilder();
|
||||
String str;
|
||||
while ((str = Server.readString(in)) != null && !str.isEmpty()) {
|
||||
while ((str = ByteBufUtils.readString(in)) != null && !str.isEmpty()) {
|
||||
message.append(str);
|
||||
}
|
||||
player.addChatMessage(new ChatComponentTranslation(message.toString()));
|
||||
|
||||
@@ -9,7 +9,6 @@ import kamkeel.npcs.network.PacketHandler;
|
||||
import kamkeel.npcs.network.enums.EnumClientPacket;
|
||||
import kamkeel.npcs.util.ByteBufUtils;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import noppes.npcs.Server;
|
||||
import noppes.npcs.client.ClientEventHandler;
|
||||
|
||||
import java.io.IOException;
|
||||
@@ -47,7 +46,7 @@ public final class DisableMouseInputPacket extends AbstractPacket {
|
||||
@Override
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
long duration = in.readLong();
|
||||
String parsedButtons = Server.readString(in);
|
||||
String parsedButtons = ByteBufUtils.readString(in);
|
||||
|
||||
if (parsedButtons == null || parsedButtons.isEmpty()) {
|
||||
ClientEventHandler.disabledButtonTimes.put(-1, duration);
|
||||
|
||||
@@ -11,8 +11,6 @@ import kamkeel.npcs.util.ByteBufUtils;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import noppes.npcs.CustomNpcs;
|
||||
import noppes.npcs.Server;
|
||||
import noppes.npcs.client.gui.OverlayQuestTracking;
|
||||
import noppes.npcs.client.ClientCacheHandler;
|
||||
|
||||
@@ -48,7 +46,7 @@ public final class OverlayQuestTrackingPacket extends AbstractPacket {
|
||||
@Override
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
try {
|
||||
NBTTagCompound nbt = Server.readNBT(in);
|
||||
NBTTagCompound nbt = ByteBufUtils.readNBT(in);
|
||||
ClientCacheHandler.questTrackingOverlay = new OverlayQuestTracking(Minecraft.getMinecraft());
|
||||
ClientCacheHandler.questTrackingOverlay.setOverlayData(nbt);
|
||||
} catch (IOException e) {
|
||||
|
||||
@@ -11,8 +11,6 @@ import kamkeel.npcs.util.ByteBufUtils;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.world.World;
|
||||
import noppes.npcs.CustomNpcs;
|
||||
import noppes.npcs.Server;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Random;
|
||||
@@ -80,7 +78,7 @@ public final class ParticlePacket extends AbstractPacket {
|
||||
float width = buffer.readFloat();
|
||||
float yOffset = buffer.readFloat();
|
||||
|
||||
String particle = Server.readString(buffer);
|
||||
String particle = ByteBufUtils.readString(buffer);
|
||||
World worldObj = Minecraft.getMinecraft().theWorld;
|
||||
|
||||
Random rand = worldObj.rand;
|
||||
|
||||
@@ -11,8 +11,6 @@ import kamkeel.npcs.util.ByteBufUtils;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import noppes.npcs.CustomNpcs;
|
||||
import noppes.npcs.Server;
|
||||
import noppes.npcs.client.gui.util.IScrollData;
|
||||
|
||||
import java.io.IOException;
|
||||
@@ -48,7 +46,7 @@ public final class ScrollSelectedPacket extends AbstractPacket {
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
GuiScreen gui = Minecraft.getMinecraft().currentScreen;
|
||||
if (gui instanceof IScrollData) {
|
||||
String selected = Server.readString(in);
|
||||
String selected = ByteBufUtils.readString(in);
|
||||
((IScrollData) gui).setSelected(selected);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,9 +30,7 @@ public final class IsGuiOpenPacket extends AbstractPacket {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sendData(ByteBuf out) throws IOException {
|
||||
// TODO: Send Packet
|
||||
}
|
||||
public void sendData(ByteBuf out) throws IOException {}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package kamkeel.npcs.network.packets.client.large;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.buffer.Unpooled;
|
||||
import kamkeel.npcs.controllers.SyncController;
|
||||
@@ -11,9 +12,14 @@ import kamkeel.npcs.network.enums.EnumClientPacket;
|
||||
import kamkeel.npcs.network.enums.EnumSyncAction;
|
||||
import kamkeel.npcs.network.enums.EnumSyncType;
|
||||
import kamkeel.npcs.util.ByteBufUtils;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import noppes.npcs.CustomNpcs;
|
||||
import noppes.npcs.Server;
|
||||
import noppes.npcs.entity.EntityNPCInterface;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
package kamkeel.npcs.network.packets.client.npc;
|
||||
|
||||
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.EnumClientPacket;
|
||||
import kamkeel.npcs.util.ByteBufUtils;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import noppes.npcs.Server;
|
||||
import noppes.npcs.client.NoppesUtil;
|
||||
import noppes.npcs.entity.EntityNPCInterface;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
public final class WeaponNpcPacket extends AbstractPacket {
|
||||
public static final String packetName = "Client|WeaponNpc";
|
||||
|
||||
private int entityId;
|
||||
private int weaponIndex;
|
||||
private NBTTagCompound compound;
|
||||
|
||||
public WeaponNpcPacket() {}
|
||||
|
||||
public WeaponNpcPacket(int entityId, int weaponIndex, NBTTagCompound compound) {
|
||||
this.entityId = entityId;
|
||||
this.weaponIndex = weaponIndex;
|
||||
this.compound = compound;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Enum getType() {
|
||||
return EnumClientPacket.WEAPON_NPC;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PacketChannel getChannel() {
|
||||
return PacketHandler.CLIENT_PACKET;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sendData(ByteBuf out) throws IOException {
|
||||
out.writeInt(this.entityId);
|
||||
out.writeInt(this.weaponIndex);
|
||||
|
||||
ByteBufUtils.writeNBT(out, this.compound);
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(in.readInt());
|
||||
if(!(entity instanceof EntityNPCInterface))
|
||||
return;
|
||||
EntityNPCInterface npc = (EntityNPCInterface) entity;
|
||||
int weaponSlotIndex = in.readInt();
|
||||
ItemStack stack = ItemStack.loadItemStackFromNBT(ByteBufUtils.readNBT(in));
|
||||
npc.inventory.weapons.put(weaponSlotIndex,stack);
|
||||
}
|
||||
}
|
||||
+1
-2
@@ -14,7 +14,6 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.World;
|
||||
import noppes.npcs.CustomNpcs;
|
||||
import noppes.npcs.Server;
|
||||
import noppes.npcs.client.fx.CustomFX;
|
||||
import noppes.npcs.scripted.ScriptParticle;
|
||||
|
||||
@@ -62,7 +61,7 @@ public final class ScriptedParticlePacket extends AbstractPacket {
|
||||
NBTTagCompound compound;
|
||||
ScriptParticle particle;
|
||||
try {
|
||||
compound = Server.readNBT(buffer);
|
||||
compound = ByteBufUtils.readNBT(buffer);
|
||||
particle = ScriptParticle.fromNBT(compound);
|
||||
} catch (IOException ignored) {
|
||||
return;
|
||||
|
||||
@@ -6,7 +6,12 @@ import io.netty.buffer.Unpooled;
|
||||
import kamkeel.npcs.network.PacketHandler;
|
||||
import kamkeel.npcs.network.PacketUtil;
|
||||
import kamkeel.npcs.network.enums.EnumSoundOperation;
|
||||
import kamkeel.npcs.network.packets.client.DisableMouseInputPacket;
|
||||
import kamkeel.npcs.network.packets.client.OverlayQuestTrackingPacket;
|
||||
import kamkeel.npcs.network.packets.client.SoundManagementPacket;
|
||||
import kamkeel.npcs.network.packets.client.SwingPlayerArmPacket;
|
||||
import kamkeel.npcs.network.packets.client.gui.IsGuiOpenPacket;
|
||||
import kamkeel.npcs.util.ByteBufUtils;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.inventory.Container;
|
||||
@@ -137,11 +142,11 @@ public class NoppesUtilPlayer {
|
||||
}
|
||||
}
|
||||
|
||||
Server.sendData(player, EnumPacketClient.DISABLE_MOUSE_INPUT, time, stringedIds.toString());
|
||||
PacketHandler.Instance.sendToPlayer(new DisableMouseInputPacket(time, stringedIds.toString()), player);
|
||||
}
|
||||
|
||||
public static void swingPlayerArm(EntityPlayerMP player){
|
||||
Server.sendData(player, EnumPacketClient.SWING_PLAYER_ARM);
|
||||
PacketHandler.Instance.sendToPlayer(new SwingPlayerArmPacket(), player);
|
||||
}
|
||||
|
||||
private static void followerBuy(RoleFollower role,IInventory currencyInv,EntityPlayerMP player, EntityNPCInterface npc){
|
||||
@@ -306,7 +311,7 @@ public class NoppesUtilPlayer {
|
||||
public static void updateQuestLogData(ByteBuf buffer, EntityPlayerMP player) throws IOException {
|
||||
PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
|
||||
|
||||
NBTTagCompound compound = Server.readNBT(buffer);
|
||||
NBTTagCompound compound = ByteBufUtils.readNBT(buffer);
|
||||
HashMap<String,String> questAlerts = NBTTags.getStringStringMap(compound.getTagList("Alerts", 10));
|
||||
for (Map.Entry<String,String> entry : questAlerts.entrySet()) {
|
||||
Quest quest = getQuestFromStringKey(entry.getKey());
|
||||
@@ -315,7 +320,7 @@ public class NoppesUtilPlayer {
|
||||
}
|
||||
}
|
||||
|
||||
String trackedQuestString = Server.readString(buffer);
|
||||
String trackedQuestString = ByteBufUtils.readString(buffer);
|
||||
Quest trackedQuest = getQuestFromStringKey(trackedQuestString);
|
||||
if (trackedQuest != null) {
|
||||
playerData.questData.trackQuest(trackedQuest);
|
||||
@@ -332,7 +337,7 @@ public class NoppesUtilPlayer {
|
||||
|
||||
public static void updatePartyQuestLogData(ByteBuf buffer, EntityPlayerMP player) throws IOException {
|
||||
PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
|
||||
String trackedQuestString = Server.readString(buffer);
|
||||
String trackedQuestString = ByteBufUtils.readString(buffer);
|
||||
Quest trackedQuest = getQuestFromStringKey(trackedQuestString);
|
||||
if (trackedQuest != null) {
|
||||
playerData.questData.trackParty(playerData.getPlayerParty());
|
||||
@@ -388,7 +393,7 @@ public class NoppesUtilPlayer {
|
||||
}
|
||||
compound.setTag("ObjectiveList",nbtTagList);
|
||||
|
||||
Server.sendData(player, EnumPacketClient.OVERLAY_QUEST_TRACKING, compound);
|
||||
PacketHandler.Instance.sendToPlayer(new OverlayQuestTrackingPacket(compound), player);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -411,8 +416,7 @@ public class NoppesUtilPlayer {
|
||||
nbtTagList.appendTag(new NBTTagString(objective.getAdditionalText()));
|
||||
}
|
||||
compound.setTag("ObjectiveList",nbtTagList);
|
||||
|
||||
Server.sendData(player, EnumPacketClient.OVERLAY_QUEST_TRACKING, compound);
|
||||
PacketHandler.Instance.sendToPlayer(new OverlayQuestTrackingPacket(compound), player);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -428,7 +432,8 @@ public class NoppesUtilPlayer {
|
||||
public static void sendTrackedQuest(EntityPlayerMP player) {
|
||||
QuestLogData data = new QuestLogData();
|
||||
data.setTrackedQuestKey(player);
|
||||
Server.sendData(player, EnumPacketClient.PARTY_DATA, data.writeTrackedQuest());
|
||||
|
||||
PacketUtil.sendPartyData(player, data.writeTrackedQuest());
|
||||
}
|
||||
|
||||
public static boolean questCompletion(EntityPlayerMP player, int questId) {
|
||||
@@ -744,7 +749,7 @@ public class NoppesUtilPlayer {
|
||||
}
|
||||
}
|
||||
public static void isGUIOpen(EntityPlayerMP player){
|
||||
Server.sendData(player, EnumPacketClient.ISGUIOPEN);
|
||||
PacketHandler.Instance.sendToPlayer(new IsGuiOpenPacket(), player);
|
||||
}
|
||||
|
||||
public static List<ItemStack> countStacks(IInventory inv, boolean ignoreDamage, boolean ignoreNBT) {
|
||||
|
||||
@@ -4,6 +4,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.network.FMLNetworkEvent.ServerCustomPacketEvent;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import kamkeel.npcs.network.PacketUtil;
|
||||
import kamkeel.npcs.util.ByteBufUtils;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.init.Items;
|
||||
@@ -45,7 +46,7 @@ public class PacketHandlerPlayer{
|
||||
|
||||
private void player(ByteBuf buffer, EntityPlayerMP player, EnumPlayerPacket type) throws IOException {
|
||||
if(type == EnumPlayerPacket.MarkData){
|
||||
String uuid = Server.readString(buffer);
|
||||
String uuid = ByteBufUtils.readString(buffer);
|
||||
if(uuid == null)
|
||||
return;
|
||||
|
||||
@@ -85,7 +86,7 @@ public class PacketHandlerPlayer{
|
||||
boolean isMetaPressed = buffer.readBoolean();
|
||||
boolean buttonDown = buffer.readBoolean();
|
||||
|
||||
String ints = Server.readString(buffer);
|
||||
String ints = ByteBufUtils.readString(buffer);
|
||||
String[] split = ints.split(",");
|
||||
int[] keysDown;
|
||||
|
||||
@@ -118,7 +119,7 @@ public class PacketHandlerPlayer{
|
||||
boolean isAltPressed = buffer.readBoolean();
|
||||
boolean isMetaPressed = buffer.readBoolean();
|
||||
|
||||
String ints = Server.readString(buffer);
|
||||
String ints = ByteBufUtils.readString(buffer);
|
||||
String[] split = ints.split(",");
|
||||
int[] keysDown;
|
||||
|
||||
@@ -167,7 +168,7 @@ public class PacketHandlerPlayer{
|
||||
EntityNPCInterface npc = NoppesUtilServer.getEditingNpc(player);
|
||||
if(npc == null || npc.advanced.role != EnumRoleType.Transporter)
|
||||
return;
|
||||
NoppesUtilPlayer.transport(player, npc, Server.readString(buffer));
|
||||
NoppesUtilPlayer.transport(player, npc, ByteBufUtils.readString(buffer));
|
||||
}
|
||||
else if(type == EnumPlayerPacket.BankUpgrade){
|
||||
EntityNPCInterface npc = NoppesUtilServer.getEditingNpc(player);
|
||||
@@ -221,7 +222,7 @@ public class PacketHandlerPlayer{
|
||||
}
|
||||
else if(type == EnumPlayerPacket.MailDelete){
|
||||
long time = buffer.readLong();
|
||||
String username = Server.readString(buffer);
|
||||
String username = ByteBufUtils.readString(buffer);
|
||||
PlayerMailData data = PlayerDataController.Instance.getPlayerData(player).mailData;
|
||||
|
||||
Iterator<PlayerMail> it = data.playermail.iterator();
|
||||
@@ -236,7 +237,7 @@ public class PacketHandlerPlayer{
|
||||
else if(type == EnumPlayerPacket.MailSend){
|
||||
if(!(player.openContainer instanceof ContainerMail))
|
||||
return;
|
||||
String username = PlayerDataController.Instance.hasPlayer(Server.readString(buffer));
|
||||
String username = PlayerDataController.Instance.hasPlayer(ByteBufUtils.readString(buffer));
|
||||
if(username.isEmpty()){
|
||||
NoppesUtilServer.sendGuiError(player, 0);
|
||||
return;
|
||||
@@ -247,7 +248,7 @@ public class PacketHandlerPlayer{
|
||||
String s = player.getDisplayName();
|
||||
if(!s.equals(player.getCommandSenderName()))
|
||||
s += "(" + player.getCommandSenderName() + ")";
|
||||
mail.readNBT(Server.readNBT(buffer));
|
||||
mail.readNBT(ByteBufUtils.readNBT(buffer));
|
||||
mail.sender = s;
|
||||
mail.items = ((ContainerMail)player.openContainer).mail.items;
|
||||
|
||||
@@ -263,7 +264,7 @@ public class PacketHandlerPlayer{
|
||||
}
|
||||
else if(type == EnumPlayerPacket.MailboxOpenMail){
|
||||
long time = buffer.readLong();
|
||||
String username = Server.readString(buffer);
|
||||
String username = ByteBufUtils.readString(buffer);
|
||||
player.closeContainer();
|
||||
PlayerMailData data = PlayerDataController.Instance.getPlayerData(player).mailData;
|
||||
|
||||
@@ -279,7 +280,7 @@ public class PacketHandlerPlayer{
|
||||
}
|
||||
else if(type == EnumPlayerPacket.MailRead){
|
||||
long time = buffer.readLong();
|
||||
String username = Server.readString(buffer);
|
||||
String username = ByteBufUtils.readString(buffer);
|
||||
PlayerMailData data = PlayerDataController.Instance.getPlayerData(player).mailData;
|
||||
|
||||
Iterator<PlayerMail> it = data.playermail.iterator();
|
||||
@@ -300,7 +301,7 @@ public class PacketHandlerPlayer{
|
||||
return;
|
||||
TileBigSign sign = (TileBigSign) tile;
|
||||
if (sign.canEdit) {
|
||||
sign.setText(Server.readString(buffer));
|
||||
sign.setText(ByteBufUtils.readString(buffer));
|
||||
sign.canEdit = false;
|
||||
player.worldObj.markBlockForUpdate(x, y, z);
|
||||
}
|
||||
@@ -316,7 +317,7 @@ public class PacketHandlerPlayer{
|
||||
if (tile.book.getItem() == Items.written_book)
|
||||
return;
|
||||
boolean sign = buffer.readBoolean();
|
||||
ItemStack book = ItemStack.loadItemStackFromNBT(Server.readNBT(buffer));
|
||||
ItemStack book = ItemStack.loadItemStackFromNBT(ByteBufUtils.readNBT(buffer));
|
||||
if (book == null)
|
||||
return;
|
||||
if (book.getItem() == Items.writable_book && !sign && ItemWritableBook.func_150930_a(book.getTagCompound())) {
|
||||
|
||||
@@ -7,6 +7,7 @@ import cpw.mods.fml.relauncher.Side;
|
||||
import foxz.utils.Market;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import kamkeel.npcs.network.PacketUtil;
|
||||
import kamkeel.npcs.util.ByteBufUtils;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityList;
|
||||
import net.minecraft.entity.passive.EntityVillager;
|
||||
@@ -74,19 +75,19 @@ public class PacketHandlerServer{
|
||||
isGuiOpenPacket(buffer, player);
|
||||
return;
|
||||
} else if (type == EnumPacketServer.CustomGuiButton && player.openContainer instanceof ContainerCustomGui) {
|
||||
((ContainerCustomGui) player.openContainer).customGui.fromNBT(Server.readNBT(buffer));
|
||||
((ContainerCustomGui) player.openContainer).customGui.fromNBT(ByteBufUtils.readNBT(buffer));
|
||||
EventHooks.onCustomGuiButton((IPlayer) NpcAPI.Instance().getIEntity(player), ((ContainerCustomGui) player.openContainer).customGui, buffer.readInt());
|
||||
return;
|
||||
} else if (type == EnumPacketServer.CustomGuiUnfocused && player.openContainer instanceof ContainerCustomGui) {
|
||||
((ContainerCustomGui) player.openContainer).customGui.fromNBT(Server.readNBT(buffer));
|
||||
((ContainerCustomGui) player.openContainer).customGui.fromNBT(ByteBufUtils.readNBT(buffer));
|
||||
EventHooks.onCustomGuiUnfocused((IPlayer) NpcAPI.Instance().getIEntity(player), ((ContainerCustomGui) player.openContainer).customGui, buffer.readInt());
|
||||
return;
|
||||
} else if (type == EnumPacketServer.CustomGuiScrollClick && player.openContainer instanceof ContainerCustomGui) {
|
||||
((ContainerCustomGui) player.openContainer).customGui.fromNBT(Server.readNBT(buffer));
|
||||
((ContainerCustomGui) player.openContainer).customGui.fromNBT(ByteBufUtils.readNBT(buffer));
|
||||
EventHooks.onCustomGuiScrollClick((IPlayer) NpcAPI.Instance().getIEntity(player), ((ContainerCustomGui) player.openContainer).customGui, buffer.readInt(), buffer.readInt(), CustomGuiController.readScrollSelection(buffer), buffer.readBoolean());
|
||||
return;
|
||||
} else if (type == EnumPacketServer.CustomGuiClose) {
|
||||
EventHooks.onCustomGuiClose((IPlayer) NpcAPI.Instance().getIEntity(player), (new ScriptGui()).fromNBT(Server.readNBT(buffer)));
|
||||
EventHooks.onCustomGuiClose((IPlayer) NpcAPI.Instance().getIEntity(player), (new ScriptGui()).fromNBT(ByteBufUtils.readNBT(buffer)));
|
||||
return;
|
||||
} else if (type == EnumPacketServer.QuestLogToServer) {
|
||||
NoppesUtilPlayer.updateQuestLogData(buffer, player);
|
||||
@@ -137,9 +138,9 @@ public class PacketHandlerServer{
|
||||
}
|
||||
NBTTagCompound compound = new NBTTagCompound();
|
||||
compound.setBoolean("Disband", true);
|
||||
Server.sendData(player, EnumPacketClient.PARTY_DATA, compound);
|
||||
PacketUtil.sendPartyData(player, compound);
|
||||
} else if (type == EnumPacketServer.KickPlayer) {
|
||||
String kickPlayerName = Server.readString(buffer);
|
||||
String kickPlayerName = ByteBufUtils.readString(buffer);
|
||||
EntityPlayer kickPlayer = NoppesUtilServer.getPlayerByName(kickPlayerName);
|
||||
PlayerData playerData = null;
|
||||
UUID playerUUID = null;
|
||||
@@ -176,7 +177,7 @@ public class PacketHandlerServer{
|
||||
}
|
||||
}
|
||||
} else if (type == EnumPacketServer.LeavePlayer) {
|
||||
EntityPlayer leavingPlayer = NoppesUtilServer.getPlayerByName(Server.readString(buffer));
|
||||
EntityPlayer leavingPlayer = NoppesUtilServer.getPlayerByName(ByteBufUtils.readString(buffer));
|
||||
if (leavingPlayer != null) {
|
||||
PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
|
||||
if (playerData.partyUUID != null) {
|
||||
@@ -195,19 +196,19 @@ public class PacketHandlerServer{
|
||||
PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
|
||||
if (playerData.partyUUID != null) {
|
||||
Party party = PartyController.Instance().getParty(playerData.partyUUID);
|
||||
party.readClientNBT(Server.readNBT(buffer));
|
||||
party.readClientNBT(ByteBufUtils.readNBT(buffer));
|
||||
}
|
||||
} else if (type == EnumPacketServer.SetPartyLeader) {
|
||||
PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
|
||||
if (playerData.partyUUID != null) {
|
||||
Party party = PartyController.Instance().getParty(playerData.partyUUID);
|
||||
if (!party.getIsLocked()) {
|
||||
party.setLeader(NoppesUtilServer.getPlayerByName(Server.readString(buffer)));
|
||||
party.setLeader(NoppesUtilServer.getPlayerByName(ByteBufUtils.readString(buffer)));
|
||||
PartyController.Instance().pingPartyUpdate(party);
|
||||
}
|
||||
}
|
||||
} else if (type == EnumPacketServer.PartyInvite) {
|
||||
EntityPlayer invitedPlayer = NoppesUtilServer.getPlayerByName(Server.readString(buffer));
|
||||
EntityPlayer invitedPlayer = NoppesUtilServer.getPlayerByName(ByteBufUtils.readString(buffer));
|
||||
if (invitedPlayer != null) {
|
||||
PlayerData senderData = PlayerDataController.Instance.getPlayerData(player);
|
||||
PlayerData invitedData = PlayerDataController.Instance.getPlayerData(invitedPlayer);
|
||||
@@ -227,14 +228,14 @@ public class PacketHandlerServer{
|
||||
sendInviteData(player);
|
||||
} else if (type == EnumPacketServer.AcceptInvite) {
|
||||
PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
|
||||
String uuidString = Server.readString(buffer);
|
||||
String uuidString = ByteBufUtils.readString(buffer);
|
||||
if (uuidString != null) {
|
||||
UUID uuid = UUID.fromString(uuidString);
|
||||
playerData.acceptInvite(uuid);
|
||||
}
|
||||
} else if (type == EnumPacketServer.IgnoreInvite) {
|
||||
PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
|
||||
String uuidString = Server.readString(buffer);
|
||||
String uuidString = ByteBufUtils.readString(buffer);
|
||||
if (uuidString != null) {
|
||||
UUID uuid = UUID.fromString(uuidString);
|
||||
playerData.ignoreInvite(uuid);
|
||||
@@ -337,8 +338,8 @@ public class PacketHandlerServer{
|
||||
compound.setString("QuestCompleteWith", quest.completerNpc);
|
||||
}
|
||||
}
|
||||
Server.sendData(player, EnumPacketClient.PARTY_DATA, compound);
|
||||
} else {
|
||||
PacketUtil.sendPartyData(player, compound);
|
||||
} else {
|
||||
sendInviteData(player);
|
||||
}
|
||||
}
|
||||
@@ -357,8 +358,8 @@ public class PacketHandlerServer{
|
||||
list.appendTag(partyCompound);
|
||||
}
|
||||
compound.setTag("PartyInvites", list);
|
||||
Server.sendData(player, EnumPacketClient.PARTY_DATA, compound);
|
||||
}
|
||||
PacketUtil.sendPartyData(player, compound);
|
||||
}
|
||||
}
|
||||
|
||||
private void isGuiOpenPacket(ByteBuf buffer, EntityPlayerMP player) throws IOException {
|
||||
@@ -375,7 +376,7 @@ public class PacketHandlerServer{
|
||||
PacketUtil.sendGuiData(player, compound);
|
||||
}
|
||||
else if (type == EnumPacketServer.ScriptGlobalGuiDataSave) {
|
||||
NBTTagCompound compound = Server.readNBT(buffer);
|
||||
NBTTagCompound compound = ByteBufUtils.readNBT(buffer);
|
||||
ConfigScript.ScriptingEnabled = compound.getBoolean("ScriptsEnabled");
|
||||
ConfigScript.GlobalPlayerScripts = compound.getBoolean("PlayerScriptsEnabled");
|
||||
ConfigScript.GlobalNPCScripts = compound.getBoolean("GlobalNPCScriptsEnabled");
|
||||
@@ -385,7 +386,7 @@ public class PacketHandlerServer{
|
||||
|
||||
private void scriptPackets(EnumPacketServer type, ByteBuf buffer, EntityPlayerMP player, EntityNPCInterface npc) throws Exception {
|
||||
if(type == EnumPacketServer.ScriptDataSave){
|
||||
npc.script.readFromNBT(Server.readNBT(buffer));
|
||||
npc.script.readFromNBT(ByteBufUtils.readNBT(buffer));
|
||||
npc.updateAI = true;
|
||||
npc.script.hasInited = false;
|
||||
if(ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER){
|
||||
@@ -430,12 +431,12 @@ public class PacketHandlerServer{
|
||||
} else while (data.getScripts().size() < totalScripts) {
|
||||
data.getScripts().add(new ScriptContainer(data));
|
||||
}
|
||||
NBTTagCompound tabCompound = Server.readNBT(buffer);
|
||||
NBTTagCompound tabCompound = ByteBufUtils.readNBT(buffer);
|
||||
ScriptContainer script = new ScriptContainer(data);
|
||||
script.readFromNBT(tabCompound);
|
||||
data.getScripts().set(tab,script);
|
||||
} else {
|
||||
NBTTagCompound compound = Server.readNBT(buffer);
|
||||
NBTTagCompound compound = ByteBufUtils.readNBT(buffer);
|
||||
data.setLanguage(compound.getString("ScriptLanguage"));
|
||||
if (!ScriptController.Instance.languages.containsKey(data.getLanguage())) {
|
||||
if (!ScriptController.Instance.languages.isEmpty()) {
|
||||
@@ -513,7 +514,7 @@ public class PacketHandlerServer{
|
||||
return;
|
||||
}
|
||||
|
||||
NBTTagCompound compound = Server.readNBT(buffer);
|
||||
NBTTagCompound compound = ByteBufUtils.readNBT(buffer);
|
||||
ScriptCustomItem wrapper = (ScriptCustomItem) NpcAPI.Instance().getIItemStack(player.getHeldItem());
|
||||
wrapper.setMCNbt(compound);
|
||||
wrapper.saveScriptData();
|
||||
@@ -539,7 +540,7 @@ public class PacketHandlerServer{
|
||||
if(!(tile instanceof TileScripted))
|
||||
return;
|
||||
TileScripted script = (TileScripted) tile;
|
||||
script.setNBT(Server.readNBT(buffer));
|
||||
script.setNBT(ByteBufUtils.readNBT(buffer));
|
||||
script.lastInited = -1;
|
||||
}
|
||||
}
|
||||
@@ -570,13 +571,13 @@ public class PacketHandlerServer{
|
||||
PacketUtil.sendGuiData(player, npc.ai.writeToNBT(new NBTTagCompound()));
|
||||
}
|
||||
else if(type == EnumPacketServer.MovingPathSave){
|
||||
npc.ai.setMovingPath(NBTTags.getIntegerArraySet(Server.readNBT(buffer).getTagList("MovingPathNew",10)));
|
||||
npc.ai.setMovingPath(NBTTags.getIntegerArraySet(ByteBufUtils.readNBT(buffer).getTagList("MovingPathNew",10)));
|
||||
}
|
||||
}
|
||||
|
||||
private void blockPackets(EnumPacketServer type, ByteBuf buffer, EntityPlayerMP player) throws IOException {
|
||||
if (type == EnumPacketServer.SaveTileEntity) {
|
||||
NoppesUtilServer.saveTileEntity(player, Server.readNBT(buffer));
|
||||
NoppesUtilServer.saveTileEntity(player, ByteBufUtils.readNBT(buffer));
|
||||
}
|
||||
else if(type == EnumPacketServer.GetTileEntity){
|
||||
TileEntity tile = player.worldObj.getTileEntity(buffer.readInt(), buffer.readInt(), buffer.readInt());
|
||||
@@ -667,7 +668,7 @@ public class PacketHandlerServer{
|
||||
NoppesUtilServer.deleteNpc(npc,player);
|
||||
}
|
||||
else if(type == EnumPacketServer.LinkedAdd){
|
||||
LinkedNpcController.Instance.addData(Server.readString(buffer));
|
||||
LinkedNpcController.Instance.addData(ByteBufUtils.readString(buffer));
|
||||
|
||||
List<String> list = new ArrayList<String>();
|
||||
for(LinkedData data : LinkedNpcController.Instance.list)
|
||||
@@ -675,7 +676,7 @@ public class PacketHandlerServer{
|
||||
PacketUtil.sendList((EntityPlayerMP)player, list);
|
||||
}
|
||||
else if(type == EnumPacketServer.LinkedRemove){
|
||||
LinkedNpcController.Instance.removeData(Server.readString(buffer));
|
||||
LinkedNpcController.Instance.removeData(ByteBufUtils.readString(buffer));
|
||||
|
||||
List<String> list = new ArrayList<String>();
|
||||
for(LinkedData data : LinkedNpcController.Instance.list)
|
||||
@@ -691,7 +692,7 @@ public class PacketHandlerServer{
|
||||
PacketUtil.setSelectedList(player, npc.linkedName);
|
||||
}
|
||||
else if(type == EnumPacketServer.LinkedSet){
|
||||
npc.linkedName = Server.readString(buffer);
|
||||
npc.linkedName = ByteBufUtils.readString(buffer);
|
||||
LinkedNpcController.Instance.loadNpcData(npc);
|
||||
}
|
||||
else if(type == EnumPacketServer.NpcMenuClose){
|
||||
@@ -712,7 +713,7 @@ public class PacketHandlerServer{
|
||||
}
|
||||
else if(type == EnumPacketServer.BankSave){
|
||||
Bank bank = new Bank();
|
||||
bank.readEntityFromNBT(Server.readNBT(buffer));
|
||||
bank.readEntityFromNBT(ByteBufUtils.readNBT(buffer));
|
||||
BankController.getInstance().saveBank(bank);
|
||||
NoppesUtilServer.sendBankDataAll(player);
|
||||
NoppesUtilServer.sendBank(player,bank);
|
||||
@@ -793,7 +794,7 @@ public class PacketHandlerServer{
|
||||
NoppesUtilServer.setRecipeGui(player,new RecipeCarpentry(""));
|
||||
}
|
||||
else if(type == EnumPacketServer.RecipeSave){
|
||||
RecipeCarpentry recipe = RecipeController.Instance.saveRecipe(Server.readNBT(buffer));
|
||||
RecipeCarpentry recipe = RecipeController.Instance.saveRecipe(ByteBufUtils.readNBT(buffer));
|
||||
NoppesUtilServer.sendRecipeData(player, recipe.isGlobal?3:4);
|
||||
NoppesUtilServer.setRecipeGui(player,recipe);
|
||||
}
|
||||
@@ -808,7 +809,7 @@ public class PacketHandlerServer{
|
||||
}
|
||||
else if(type == EnumPacketServer.NaturalSpawnSave){
|
||||
SpawnData data = new SpawnData();
|
||||
data.readNBT(Server.readNBT(buffer));
|
||||
data.readNBT(ByteBufUtils.readNBT(buffer));
|
||||
SpawnController.Instance.saveSpawnData(data);
|
||||
|
||||
PacketUtil.sendScrollData(player, SpawnController.Instance.getScroll());
|
||||
@@ -819,7 +820,7 @@ public class PacketHandlerServer{
|
||||
}
|
||||
else if(type == EnumPacketServer.DialogCategorySave){
|
||||
DialogCategory category = new DialogCategory();
|
||||
category.readNBT(Server.readNBT(buffer));
|
||||
category.readNBT(ByteBufUtils.readNBT(buffer));
|
||||
DialogController.Instance.saveCategory(category);
|
||||
PacketUtil.sendScrollData(player, DialogController.Instance.getScroll());
|
||||
}
|
||||
@@ -838,7 +839,7 @@ public class PacketHandlerServer{
|
||||
else if(type == EnumPacketServer.DialogSave){
|
||||
int category = buffer.readInt();
|
||||
Dialog dialog = new Dialog();
|
||||
dialog.readNBT(Server.readNBT(buffer));
|
||||
dialog.readNBT(ByteBufUtils.readNBT(buffer));
|
||||
boolean sendGroup = buffer.readBoolean();
|
||||
DialogController.Instance.saveDialog(category,dialog);
|
||||
if(dialog.category != null){
|
||||
@@ -853,7 +854,7 @@ public class PacketHandlerServer{
|
||||
else if(type == EnumPacketServer.QuestOpenGui){
|
||||
Quest quest = new Quest();
|
||||
int gui = buffer.readInt();
|
||||
quest.readNBT(Server.readNBT(buffer));
|
||||
quest.readNBT(ByteBufUtils.readNBT(buffer));
|
||||
NoppesUtilServer.setEditingQuest(player,quest);
|
||||
player.openGui(CustomNpcs.instance, gui , player.worldObj, 0, 0, 0);
|
||||
}
|
||||
@@ -897,7 +898,7 @@ public class PacketHandlerServer{
|
||||
}
|
||||
else if(type == EnumPacketServer.QuestCategorySave){
|
||||
QuestCategory category = new QuestCategory();
|
||||
category.readNBT(Server.readNBT(buffer));
|
||||
category.readNBT(ByteBufUtils.readNBT(buffer));
|
||||
QuestController.Instance.saveCategory(category);
|
||||
NoppesUtilServer.sendQuestCategoryData(player);
|
||||
}
|
||||
@@ -908,7 +909,7 @@ public class PacketHandlerServer{
|
||||
else if(type == EnumPacketServer.QuestSave){
|
||||
int category = buffer.readInt();
|
||||
Quest quest = new Quest();
|
||||
quest.readNBT(Server.readNBT(buffer));
|
||||
quest.readNBT(ByteBufUtils.readNBT(buffer));
|
||||
boolean sendGroup = buffer.readBoolean();
|
||||
QuestController.Instance.saveQuest(category, quest);
|
||||
if(quest.category != null){
|
||||
@@ -950,7 +951,7 @@ public class PacketHandlerServer{
|
||||
NoppesUtilServer.sendTransportCategoryData(player);
|
||||
}
|
||||
else if(type == EnumPacketServer.TransportCategorySave){
|
||||
TransportController.getInstance().saveCategory(Server.readString(buffer), buffer.readInt());
|
||||
TransportController.getInstance().saveCategory(ByteBufUtils.readString(buffer), buffer.readInt());
|
||||
}
|
||||
else if(type == EnumPacketServer.TransportCategoryRemove){
|
||||
TransportController.getInstance().removeCategory(buffer.readInt());
|
||||
@@ -967,7 +968,7 @@ public class PacketHandlerServer{
|
||||
}
|
||||
else if(type == EnumPacketServer.TransportSave){
|
||||
int cat = buffer.readInt();
|
||||
TransportLocation location = TransportController.getInstance().saveLocation(cat,Server.readNBT(buffer), npc);
|
||||
TransportLocation location = TransportController.getInstance().saveLocation(cat, ByteBufUtils.readNBT(buffer), npc);
|
||||
if(location != null){
|
||||
if(npc.advanced.role != EnumRoleType.Transporter)
|
||||
return;
|
||||
@@ -989,7 +990,7 @@ public class PacketHandlerServer{
|
||||
}
|
||||
else if(type == EnumPacketServer.FactionSave){
|
||||
Faction faction = new Faction();
|
||||
faction.readNBT(Server.readNBT(buffer));
|
||||
faction.readNBT(ByteBufUtils.readNBT(buffer));
|
||||
FactionController.getInstance().saveFaction(faction);
|
||||
NoppesUtilServer.sendFactionDataAll(player);
|
||||
NBTTagCompound compound = new NBTTagCompound();
|
||||
@@ -1008,7 +1009,7 @@ public class PacketHandlerServer{
|
||||
}
|
||||
else if(type == EnumPacketServer.TagSave){
|
||||
Tag tag = new Tag();
|
||||
tag.readNBT(Server.readNBT(buffer));
|
||||
tag.readNBT(ByteBufUtils.readNBT(buffer));
|
||||
TagController.getInstance().saveTag(tag);
|
||||
NoppesUtilServer.sendTagDataAll(player);
|
||||
NBTTagCompound compound = new NBTTagCompound();
|
||||
@@ -1029,7 +1030,7 @@ public class PacketHandlerServer{
|
||||
String name = null;
|
||||
EnumPlayerData datatype = EnumPlayerData.values()[id];
|
||||
if(datatype != EnumPlayerData.Players)
|
||||
name = Server.readString(buffer);
|
||||
name = ByteBufUtils.readString(buffer);
|
||||
NoppesUtilServer.sendPlayerData(datatype,player,name);
|
||||
}
|
||||
else if(type == EnumPacketServer.PlayerDataRemove){
|
||||
@@ -1042,21 +1043,21 @@ public class PacketHandlerServer{
|
||||
PacketUtil.sendGuiData(player, npc.display.writeToNBT(new NBTTagCompound()));
|
||||
}
|
||||
else if(type == EnumPacketServer.MainmenuDisplaySave){
|
||||
npc.display.readToNBT(Server.readNBT(buffer));
|
||||
npc.display.readToNBT(ByteBufUtils.readNBT(buffer));
|
||||
npc.updateClient = true;
|
||||
}
|
||||
else if(type == EnumPacketServer.MainmenuStatsGet){
|
||||
PacketUtil.sendGuiData(player, npc.stats.writeToNBT(new NBTTagCompound()));
|
||||
}
|
||||
else if(type == EnumPacketServer.MainmenuStatsSave){
|
||||
npc.stats.readToNBT(Server.readNBT(buffer));
|
||||
npc.stats.readToNBT(ByteBufUtils.readNBT(buffer));
|
||||
npc.updateClient = true;
|
||||
}
|
||||
else if(type == EnumPacketServer.MainmenuInvGet){
|
||||
PacketUtil.sendGuiData(player, npc.inventory.writeEntityToNBT(new NBTTagCompound()));
|
||||
}
|
||||
else if(type == EnumPacketServer.MainmenuInvSave){
|
||||
npc.inventory.readEntityFromNBT(Server.readNBT(buffer));
|
||||
npc.inventory.readEntityFromNBT(ByteBufUtils.readNBT(buffer));
|
||||
npc.updateAI = true;
|
||||
npc.updateClient = true;
|
||||
}
|
||||
@@ -1064,7 +1065,7 @@ public class PacketHandlerServer{
|
||||
PacketUtil.sendGuiData(player, npc.ai.writeToNBT(new NBTTagCompound()));
|
||||
}
|
||||
else if(type == EnumPacketServer.MainmenuAISave){
|
||||
npc.ai.readToNBT(Server.readNBT(buffer));
|
||||
npc.ai.readToNBT(ByteBufUtils.readNBT(buffer));
|
||||
npc.setHealth(npc.getMaxHealth());
|
||||
npc.updateAI = true;
|
||||
npc.updateClient = true;
|
||||
@@ -1073,18 +1074,18 @@ public class PacketHandlerServer{
|
||||
PacketUtil.sendGuiData(player, npc.advanced.writeToNBT(new NBTTagCompound()));
|
||||
}
|
||||
else if(type == EnumPacketServer.MainmenuAdvancedSave){
|
||||
npc.advanced.readToNBT(Server.readNBT(buffer));
|
||||
npc.advanced.readToNBT(ByteBufUtils.readNBT(buffer));
|
||||
npc.updateAI = true;
|
||||
npc.updateClient = true;
|
||||
}
|
||||
else if(type == EnumPacketServer.MainmenuAdvancedMarkData){
|
||||
MarkData data = MarkData.get(npc);
|
||||
data.setNBT(Server.readNBT(buffer));
|
||||
data.setNBT(ByteBufUtils.readNBT(buffer));
|
||||
data.syncClients();
|
||||
}
|
||||
else if(type == EnumPacketServer.JobSave){
|
||||
NBTTagCompound original = npc.jobInterface.writeToNBT(new NBTTagCompound());
|
||||
NBTTagCompound compound = Server.readNBT(buffer);
|
||||
NBTTagCompound compound = ByteBufUtils.readNBT(buffer);
|
||||
Set<String> names = compound.func_150296_c();
|
||||
for(String name : names)
|
||||
original.setTag(name, compound.getTag(name));
|
||||
@@ -1111,12 +1112,12 @@ public class PacketHandlerServer{
|
||||
return;
|
||||
JobSpawner job = (JobSpawner) npc.jobInterface;
|
||||
if(buffer.readBoolean()){
|
||||
NBTTagCompound compound = ServerCloneController.Instance.getCloneData(null, Server.readString(buffer), buffer.readInt());
|
||||
NBTTagCompound compound = ServerCloneController.Instance.getCloneData(null, ByteBufUtils.readString(buffer), buffer.readInt());
|
||||
|
||||
job.setJobCompound(buffer.readInt(), compound);
|
||||
}
|
||||
else{
|
||||
job.setJobCompound(buffer.readInt(), Server.readNBT(buffer));
|
||||
job.setJobCompound(buffer.readInt(), ByteBufUtils.readNBT(buffer));
|
||||
}
|
||||
PacketUtil.sendGuiData(player, job.getTitles());
|
||||
}
|
||||
@@ -1134,7 +1135,7 @@ public class PacketHandlerServer{
|
||||
PacketUtil.sendGuiData(player, job.getTitles());
|
||||
}
|
||||
else if(type == EnumPacketServer.RoleSave){
|
||||
npc.roleInterface.readFromNBT(Server.readNBT(buffer));
|
||||
npc.roleInterface.readFromNBT(ByteBufUtils.readNBT(buffer));
|
||||
npc.updateClient = true;
|
||||
}
|
||||
else if(type == EnumPacketServer.RoleGet){
|
||||
@@ -1153,17 +1154,17 @@ public class PacketHandlerServer{
|
||||
}
|
||||
else if(type == EnumPacketServer.ModelDataSave){
|
||||
if(npc instanceof EntityCustomNpc)
|
||||
((EntityCustomNpc)npc).modelData.readFromNBT(Server.readNBT(buffer));
|
||||
((EntityCustomNpc)npc).modelData.readFromNBT(ByteBufUtils.readNBT(buffer));
|
||||
}
|
||||
else if(type == EnumPacketServer.MailOpenSetup){
|
||||
PlayerMail mail = new PlayerMail();
|
||||
mail.readNBT(Server.readNBT(buffer));
|
||||
mail.readNBT(ByteBufUtils.readNBT(buffer));
|
||||
ContainerMail.staticmail = mail;
|
||||
player.openGui(CustomNpcs.instance, EnumGuiType.PlayerMailman.ordinal(), player.worldObj, 1, 0, 0);
|
||||
}
|
||||
else if(type == EnumPacketServer.TransformSave){
|
||||
boolean isValid = npc.transform.isValid();
|
||||
npc.transform.readOptions(Server.readNBT(buffer));
|
||||
npc.transform.readOptions(ByteBufUtils.readNBT(buffer));
|
||||
if(isValid != npc.transform.isValid())
|
||||
npc.updateAI = true;
|
||||
}
|
||||
@@ -1175,7 +1176,7 @@ public class PacketHandlerServer{
|
||||
npc.transform.transform(buffer.readBoolean());
|
||||
}
|
||||
else if(type == EnumPacketServer.TraderMarketSave){
|
||||
String market = Server.readString(buffer);
|
||||
String market = ByteBufUtils.readString(buffer);
|
||||
if(market == null)
|
||||
return;
|
||||
boolean bo = buffer.readBoolean();
|
||||
@@ -1202,7 +1203,7 @@ public class PacketHandlerServer{
|
||||
}
|
||||
else if(type == EnumPacketServer.AnimationSave){
|
||||
Animation animation = new Animation();
|
||||
animation.readFromNBT(Server.readNBT(buffer));
|
||||
animation.readFromNBT(ByteBufUtils.readNBT(buffer));
|
||||
AnimationController.getInstance().saveAnimation(animation);
|
||||
NoppesUtilServer.sendAnimationDataAll(player);
|
||||
PacketUtil.sendGuiData(player, animation.writeToNBT());
|
||||
@@ -1213,7 +1214,7 @@ public class PacketHandlerServer{
|
||||
}
|
||||
private void mountPackets(EnumPacketServer type, ByteBuf buffer, EntityPlayerMP player) throws IOException{
|
||||
if(type == EnumPacketServer.SpawnRider){
|
||||
Entity entity = EntityList.createEntityFromNBT(Server.readNBT(buffer), player.worldObj);
|
||||
Entity entity = EntityList.createEntityFromNBT(ByteBufUtils.readNBT(buffer), player.worldObj);
|
||||
player.worldObj.spawnEntityInWorld(entity);
|
||||
entity.mountEntity(ServerEventsHandler.mounted);
|
||||
}
|
||||
@@ -1248,9 +1249,9 @@ public class PacketHandlerServer{
|
||||
int z = buffer.readInt();
|
||||
NBTTagCompound compound;
|
||||
if(server)
|
||||
compound = ServerCloneController.Instance.getCloneData(player, Server.readString(buffer), buffer.readInt());
|
||||
compound = ServerCloneController.Instance.getCloneData(player, ByteBufUtils.readString(buffer), buffer.readInt());
|
||||
else
|
||||
compound = Server.readNBT(buffer);
|
||||
compound = ByteBufUtils.readNBT(buffer);
|
||||
if(compound == null)
|
||||
return;
|
||||
Entity entity = NoppesUtilServer.spawnClone(compound, x, y, z, player.worldObj);
|
||||
@@ -1275,9 +1276,9 @@ public class PacketHandlerServer{
|
||||
int z = buffer.readInt();
|
||||
NBTTagCompound compound;
|
||||
if(server)
|
||||
compound = ServerCloneController.Instance.getCloneData(player, Server.readString(buffer), buffer.readInt());
|
||||
compound = ServerCloneController.Instance.getCloneData(player, ByteBufUtils.readString(buffer), buffer.readInt());
|
||||
else
|
||||
compound = Server.readNBT(buffer);
|
||||
compound = ByteBufUtils.readNBT(buffer);
|
||||
|
||||
if (!ConfigScript.canScript(player, CustomNpcsPermissions.SCRIPT)) {
|
||||
return;
|
||||
@@ -1287,7 +1288,7 @@ public class PacketHandlerServer{
|
||||
NoppesUtilServer.createMobSpawner(x, y, z, compound, player);
|
||||
}
|
||||
else if(type == EnumPacketServer.ClonePreSave){
|
||||
boolean bo = ServerCloneController.Instance.getCloneData(null, Server.readString(buffer), buffer.readInt()) != null;
|
||||
boolean bo = ServerCloneController.Instance.getCloneData(null, ByteBufUtils.readString(buffer), buffer.readInt()) != null;
|
||||
NBTTagCompound compound = new NBTTagCompound();
|
||||
compound.setBoolean("NameExists", bo);
|
||||
PacketUtil.sendGuiData(player, compound);
|
||||
@@ -1296,10 +1297,10 @@ public class PacketHandlerServer{
|
||||
PlayerData data = PlayerDataController.Instance.getPlayerData(player);
|
||||
if(data.cloned == null)
|
||||
return;
|
||||
String name = Server.readString(buffer);
|
||||
String name = ByteBufUtils.readString(buffer);
|
||||
int tab = buffer.readInt();
|
||||
NBTTagCompound tagExtra = Server.readNBT(buffer);
|
||||
NBTTagCompound tagCompound = Server.readNBT(buffer);
|
||||
NBTTagCompound tagExtra = ByteBufUtils.readNBT(buffer);
|
||||
NBTTagCompound tagCompound = ByteBufUtils.readNBT(buffer);
|
||||
|
||||
NBTTagList tagList = tagCompound.getTagList("TagUUIDs", 8);
|
||||
data.cloned.setTag("TagUUIDs", tagList);
|
||||
@@ -1307,7 +1308,7 @@ public class PacketHandlerServer{
|
||||
}
|
||||
else if(type == EnumPacketServer.CloneRemove){
|
||||
int tab = buffer.readInt();
|
||||
ServerCloneController.Instance.removeClone(Server.readString(buffer), tab);
|
||||
ServerCloneController.Instance.removeClone(ByteBufUtils.readString(buffer), tab);
|
||||
|
||||
NBTTagList list = new NBTTagList();
|
||||
|
||||
@@ -1382,7 +1383,7 @@ public class PacketHandlerServer{
|
||||
|
||||
private void setTags(EntityNPCInterface npc, ByteBuf buffer) throws IOException {
|
||||
npc.advanced.tagUUIDs.removeIf(uuid -> TagController.getInstance().getTagFromUUID(uuid) != null);
|
||||
NBTTagCompound compound = Server.readNBT(buffer);
|
||||
NBTTagCompound compound = ByteBufUtils.readNBT(buffer);
|
||||
NBTTagList list = compound.getTagList("TagNames",8);
|
||||
for (int i = 0; i < list.tagCount(); i++) {
|
||||
String tagName = list.getStringTagAt(i);
|
||||
|
||||
@@ -1,18 +1,10 @@
|
||||
package noppes.npcs;
|
||||
|
||||
import com.google.common.base.Charsets;
|
||||
import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
|
||||
import cpw.mods.fml.common.network.internal.FMLProxyPacket;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.buffer.Unpooled;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.nbt.CompressedStreamTools;
|
||||
import net.minecraft.nbt.NBTSizeTracker;
|
||||
import kamkeel.npcs.util.ByteBufUtils;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.network.PacketBuffer;
|
||||
import net.minecraft.village.MerchantRecipeList;
|
||||
import noppes.npcs.constants.EnumPacketClient;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
@@ -20,47 +12,6 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class Server {
|
||||
|
||||
public static void sendData(final EntityPlayerMP player, final EnumPacketClient enu, final Object... obs) {
|
||||
sendDataChecked(player, enu, obs);
|
||||
}
|
||||
|
||||
public static boolean sendDataChecked(EntityPlayerMP player, EnumPacketClient type, Object... obs) {
|
||||
PacketBuffer buffer = new PacketBuffer(Unpooled.buffer());
|
||||
try {
|
||||
if(!fillBuffer(buffer, type, obs))
|
||||
return false;
|
||||
CustomNpcs.Channel.sendTo(new FMLProxyPacket(buffer, "CustomNPCs"), player);
|
||||
} catch (IOException e) {
|
||||
LogWriter.error(type + " Errored", e);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public static void sendAssociatedData(final Entity entity, final EnumPacketClient enu, final Object... obs) {
|
||||
ByteBuf buffer = Unpooled.buffer();
|
||||
try {
|
||||
if(!fillBuffer(buffer, enu, obs))
|
||||
return;
|
||||
TargetPoint point = new TargetPoint(entity.dimension, entity.posX, entity.posY, entity.posZ, 60);
|
||||
CustomNpcs.Channel.sendToAllAround(new FMLProxyPacket(buffer,"CustomNPCs"), point);
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
LogWriter.error(enu + " Errored", e);
|
||||
}
|
||||
}
|
||||
public static void sendToAll(EnumPacketClient enu, Object... obs) {
|
||||
ByteBuf buffer = Unpooled.buffer();
|
||||
try {
|
||||
if(!fillBuffer(buffer, enu, obs))
|
||||
return;
|
||||
CustomNpcs.Channel.sendToAll(new FMLProxyPacket(buffer,"CustomNPCs"));
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
LogWriter.error(enu + " Errored", e);
|
||||
}
|
||||
}
|
||||
|
||||
public static boolean fillBuffer(ByteBuf buffer, Enum enu, Object... obs) throws IOException{
|
||||
buffer.writeInt(enu.ordinal());
|
||||
for(Object ob : obs){
|
||||
@@ -73,7 +24,7 @@ public class Server {
|
||||
for(String key : map.keySet()){
|
||||
int value = map.get(key);
|
||||
buffer.writeInt(value);
|
||||
writeString(buffer, key);
|
||||
ByteBufUtils.writeString(buffer, key);
|
||||
}
|
||||
}
|
||||
else if(ob instanceof MerchantRecipeList)
|
||||
@@ -82,7 +33,7 @@ public class Server {
|
||||
List<String> list = (List<String>) ob;
|
||||
buffer.writeInt(list.size());
|
||||
for(String s : list)
|
||||
writeString(buffer, s);
|
||||
ByteBufUtils.writeString(buffer, s);
|
||||
}
|
||||
else if(ob instanceof Enum)
|
||||
buffer.writeInt(((Enum<?>) ob).ordinal());
|
||||
@@ -91,7 +42,7 @@ public class Server {
|
||||
else if(ob instanceof Boolean)
|
||||
buffer.writeBoolean((Boolean) ob);
|
||||
else if(ob instanceof String)
|
||||
writeString(buffer, (String) ob);
|
||||
ByteBufUtils.writeString(buffer, (String) ob);
|
||||
else if(ob instanceof Float)
|
||||
buffer.writeFloat((Float) ob);
|
||||
else if(ob instanceof Long)
|
||||
@@ -105,7 +56,7 @@ public class Server {
|
||||
buffer.writeBytes(byteArray);
|
||||
}
|
||||
else if(ob instanceof NBTTagCompound)
|
||||
writeNBT(buffer, (NBTTagCompound) ob);
|
||||
ByteBufUtils.writeNBT(buffer, (NBTTagCompound) ob);
|
||||
}
|
||||
if(buffer.array().length >= 32767){
|
||||
LogWriter.error("Packet " + enu + " was too big to be send");
|
||||
@@ -114,33 +65,4 @@ public class Server {
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public static void writeNBT(ByteBuf buffer, NBTTagCompound compound) throws IOException {
|
||||
byte[] bytes = CompressedStreamTools.compress(compound);
|
||||
buffer.writeShort((short)bytes.length);
|
||||
buffer.writeBytes(bytes);
|
||||
}
|
||||
|
||||
public static NBTTagCompound readNBT(ByteBuf buffer) throws IOException {
|
||||
byte[] bytes = new byte[buffer.readShort()];
|
||||
buffer.readBytes(bytes);
|
||||
return CompressedStreamTools.func_152457_a(bytes, new NBTSizeTracker(2097152L));
|
||||
}
|
||||
|
||||
public static void writeString(ByteBuf buffer, String s){
|
||||
byte[] bytes = s.getBytes(Charsets.UTF_8);
|
||||
buffer.writeShort((short)bytes.length);
|
||||
buffer.writeBytes(bytes);
|
||||
}
|
||||
|
||||
public static String readString(ByteBuf buffer){
|
||||
try{
|
||||
byte[] bytes = new byte[buffer.readShort()];
|
||||
buffer.readBytes(bytes);
|
||||
return new String(bytes, Charsets.UTF_8);
|
||||
}
|
||||
catch(IndexOutOfBoundsException ex){
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -9,6 +9,7 @@ import kamkeel.npcs.network.PacketUtil;
|
||||
import kamkeel.npcs.network.enums.EnumSoundOperation;
|
||||
import kamkeel.npcs.network.enums.EnumSyncAction;
|
||||
import kamkeel.npcs.network.enums.EnumSyncType;
|
||||
import kamkeel.npcs.network.packets.client.MarkDataPacket;
|
||||
import kamkeel.npcs.network.packets.client.SoundManagementPacket;
|
||||
import kamkeel.npcs.network.packets.client.VillagerListPacket;
|
||||
import kamkeel.npcs.network.packets.client.large.LargeClonerPacket;
|
||||
@@ -486,6 +487,7 @@ public class ServerEventsHandler {
|
||||
MarkData data = MarkData.get((EntityNPCInterface) event.target);
|
||||
if(data.marks.isEmpty())
|
||||
return;
|
||||
Server.sendData((EntityPlayerMP)event.entityPlayer, EnumPacketClient.MARK_DATA, event.target.getEntityId(), data.getNBT());
|
||||
|
||||
PacketHandler.Instance.sendToPlayer(new MarkDataPacket(event.target.getEntityId(), data.getNBT()), (EntityPlayerMP)event.entityPlayer);
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
package noppes.npcs.client;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import kamkeel.npcs.util.ByteBufUtils;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.audio.PositionedSoundRecord;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
@@ -11,7 +12,6 @@ import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.Util;
|
||||
import noppes.npcs.CustomNpcs;
|
||||
import noppes.npcs.Server;
|
||||
import noppes.npcs.client.gui.player.GuiDialogInteract;
|
||||
import noppes.npcs.client.gui.player.GuiQuestCompletion;
|
||||
import noppes.npcs.client.gui.util.GuiContainerNPCInterface;
|
||||
@@ -141,7 +141,7 @@ public class NoppesUtil {
|
||||
try {
|
||||
int size = buffer.readInt();
|
||||
for(int i = 0; i < size; i++){
|
||||
data.add(Server.readString(buffer));
|
||||
data.add(ByteBufUtils.readString(buffer));
|
||||
}
|
||||
} catch (Exception e) {
|
||||
|
||||
@@ -158,7 +158,7 @@ public class NoppesUtil {
|
||||
int size = buffer.readInt();
|
||||
for(int i = 0; i < size; i++){
|
||||
int id = buffer.readInt();
|
||||
String name = Server.readString(buffer);
|
||||
String name = ByteBufUtils.readString(buffer);
|
||||
group.put(name, id);
|
||||
}
|
||||
} catch (Exception ignored) {
|
||||
@@ -173,7 +173,7 @@ public class NoppesUtil {
|
||||
int size = buffer.readInt();
|
||||
for(int i = 0; i < size; i++){
|
||||
int id = buffer.readInt();
|
||||
String name = Server.readString(buffer);
|
||||
String name = ByteBufUtils.readString(buffer);
|
||||
group.put(name, id);
|
||||
}
|
||||
} catch (Exception ignored) {
|
||||
@@ -194,7 +194,7 @@ public class NoppesUtil {
|
||||
int size = buffer.readInt();
|
||||
for(int i = 0; i < size; i++){
|
||||
int id = buffer.readInt();
|
||||
String name = Server.readString(buffer);
|
||||
String name = ByteBufUtils.readString(buffer);
|
||||
data.put(name, id);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
@@ -209,7 +209,7 @@ public class NoppesUtil {
|
||||
int size = buffer.readInt();
|
||||
for(int i = 0; i < size; i++){
|
||||
int id = buffer.readInt();
|
||||
String name = Server.readString(buffer);
|
||||
String name = ByteBufUtils.readString(buffer);
|
||||
data.put(name, id);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
|
||||
@@ -1,159 +0,0 @@
|
||||
package noppes.npcs.client;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.network.FMLNetworkEvent.ClientCustomPacketEvent;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.network.PacketBuffer;
|
||||
import net.minecraft.village.MerchantRecipeList;
|
||||
import noppes.npcs.*;
|
||||
import noppes.npcs.client.gui.GuiNpcMobSpawnerAdd;
|
||||
import noppes.npcs.client.gui.OverlayQuestTracking;
|
||||
import noppes.npcs.client.gui.customoverlay.OverlayCustom;
|
||||
import noppes.npcs.client.gui.player.GuiBook;
|
||||
import noppes.npcs.client.gui.util.*;
|
||||
import noppes.npcs.constants.EnumGuiType;
|
||||
import noppes.npcs.constants.EnumPacketClient;
|
||||
import noppes.npcs.constants.EnumPacketServer;
|
||||
import noppes.npcs.controllers.data.Animation;
|
||||
import noppes.npcs.controllers.data.AnimationData;
|
||||
import noppes.npcs.controllers.data.MarkData;
|
||||
import noppes.npcs.entity.EntityNPCInterface;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
public class PacketHandlerClient extends PacketHandlerServer{
|
||||
|
||||
@SubscribeEvent
|
||||
public void onPacketData(ClientCustomPacketEvent event) {
|
||||
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
|
||||
ByteBuf buffer = event.packet.payload();
|
||||
try {
|
||||
client(buffer,(EntityPlayer) player,EnumPacketClient.values()[buffer.readInt()]);
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
private void client(ByteBuf buffer, final EntityPlayer player, EnumPacketClient type) throws IOException{
|
||||
if(type == EnumPacketClient.MARK_DATA){
|
||||
Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(buffer.readInt());
|
||||
if(!(entity instanceof EntityNPCInterface))
|
||||
return;
|
||||
MarkData data = MarkData.get((EntityNPCInterface) entity);
|
||||
data.setNBT(Server.readNBT(buffer));
|
||||
}
|
||||
else if(type == EnumPacketClient.ISGUIOPEN){
|
||||
boolean isGUIOpen = Minecraft.getMinecraft().currentScreen != null;
|
||||
|
||||
NoppesUtil.isGUIOpen(isGUIOpen);
|
||||
}
|
||||
else if(type == EnumPacketClient.SCRIPT_OVERLAY_DATA){
|
||||
OverlayCustom overlayCustom = new OverlayCustom(Minecraft.getMinecraft());
|
||||
overlayCustom.setOverlayData(Server.readNBT(buffer));
|
||||
|
||||
ClientCacheHandler.customOverlays.put(overlayCustom.overlay.getID(),overlayCustom);
|
||||
}
|
||||
else if(type == EnumPacketClient.SCRIPT_OVERLAY_CLOSE){
|
||||
int id = buffer.readInt();
|
||||
ClientCacheHandler.customOverlays.remove(id);
|
||||
}
|
||||
else if(type == EnumPacketClient.OVERLAY_QUEST_TRACKING){
|
||||
try {
|
||||
NBTTagCompound compound = Server.readNBT(buffer);
|
||||
ClientCacheHandler.questTrackingOverlay = new OverlayQuestTracking(Minecraft.getMinecraft());
|
||||
ClientCacheHandler.questTrackingOverlay.setOverlayData(compound);
|
||||
} catch (IOException e) {
|
||||
ClientCacheHandler.questTrackingOverlay = null;
|
||||
}
|
||||
}
|
||||
else if(type == EnumPacketClient.SWING_PLAYER_ARM){
|
||||
Minecraft.getMinecraft().thePlayer.swingItem();
|
||||
}
|
||||
else if(type == EnumPacketClient.PLAYER_UPDATE_SKIN_OVERLAYS) {
|
||||
EntityPlayer sendingPlayer = Minecraft.getMinecraft().theWorld.getPlayerEntityByName(Server.readString(buffer));
|
||||
NBTTagCompound compound = Server.readNBT(buffer);
|
||||
if (sendingPlayer != null) {
|
||||
NoppesUtil.updateSkinOverlayData(sendingPlayer, compound);
|
||||
}
|
||||
}
|
||||
else if(type == EnumPacketClient.UPDATE_ANIMATIONS) {
|
||||
NBTTagCompound compound = Server.readNBT(buffer);
|
||||
AnimationData animationData = null;
|
||||
if (compound.hasKey("EntityId")) {
|
||||
Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(compound.getInteger("EntityId"));
|
||||
if (entity instanceof EntityNPCInterface) {
|
||||
animationData = ((EntityNPCInterface) entity).display.animationData;
|
||||
}
|
||||
} else {
|
||||
EntityPlayer sendingPlayer = Minecraft.getMinecraft().theWorld.getPlayerEntityByName(Server.readString(buffer));
|
||||
if (sendingPlayer != null) {
|
||||
if (!ClientCacheHandler.playerAnimations.containsKey(sendingPlayer.getUniqueID())) {
|
||||
ClientCacheHandler.playerAnimations.put(sendingPlayer.getUniqueID(), new AnimationData(sendingPlayer));
|
||||
}
|
||||
animationData = ClientCacheHandler.playerAnimations.get(sendingPlayer.getUniqueID());
|
||||
animationData.parent = sendingPlayer;
|
||||
}
|
||||
}
|
||||
|
||||
if (animationData != null) {
|
||||
int animationId;
|
||||
if (compound.hasKey("AnimationID")) {
|
||||
animationId = compound.getInteger("AnimationID");
|
||||
} else {
|
||||
Animation animation = new Animation();
|
||||
animation.readFromNBT(compound.getCompoundTag("Animation"));
|
||||
ClientCacheHandler.animationCache.put(animation.getID(), animation);
|
||||
animationId = animation.getID();
|
||||
}
|
||||
|
||||
animationData.setAnimation(ClientCacheHandler.animationCache.get(animationId));
|
||||
animationData.readFromNBT(compound);
|
||||
Client.sendData(EnumPacketServer.CacheAnimation, animationId);
|
||||
}
|
||||
}
|
||||
else if(type == EnumPacketClient.DISABLE_MOUSE_INPUT) {
|
||||
long length = buffer.readLong();
|
||||
try {
|
||||
String parsedButtons = Server.readString(buffer);
|
||||
if (parsedButtons == null || parsedButtons.isEmpty()) {
|
||||
ClientEventHandler.disabledButtonTimes.put(-1, length);
|
||||
return;
|
||||
}
|
||||
|
||||
String[] splitIds = parsedButtons.split(";");
|
||||
for (String s : splitIds) {
|
||||
ClientEventHandler.disabledButtonTimes.put(Integer.parseInt(s), length);
|
||||
}
|
||||
} catch (Exception ignored) {}
|
||||
}
|
||||
else if(type == EnumPacketClient.SYNC_WEAPON) {
|
||||
Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(buffer.readInt());
|
||||
if(!(entity instanceof EntityNPCInterface))
|
||||
return;
|
||||
EntityNPCInterface npc = (EntityNPCInterface) entity;
|
||||
int weaponSlotIndex = buffer.readInt();
|
||||
ItemStack stack = ItemStack.loadItemStackFromNBT(Server.readNBT(buffer));
|
||||
npc.inventory.weapons.put(weaponSlotIndex,stack);
|
||||
}
|
||||
else if(type == EnumPacketClient.PARTY_DATA){
|
||||
GuiScreen gui = Minecraft.getMinecraft().currentScreen;
|
||||
if(gui == null)
|
||||
return;
|
||||
|
||||
if(gui instanceof GuiNPCInterface && ((GuiNPCInterface)gui).hasSubGui()){
|
||||
gui = (GuiScreen) ((GuiNPCInterface)gui).getSubGui();
|
||||
}
|
||||
else if(gui instanceof GuiContainerNPCInterface && ((GuiContainerNPCInterface)gui).hasSubGui()){
|
||||
gui = (GuiScreen) ((GuiContainerNPCInterface)gui).getSubGui();
|
||||
}
|
||||
if(gui instanceof IPartyData)
|
||||
((IPartyData)gui).setPartyData(Server.readNBT(buffer));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,16 +1,4 @@
|
||||
package
|
||||
noppes.npcs.constants;
|
||||
|
||||
public enum EnumPacketClient {
|
||||
ISGUIOPEN,
|
||||
SCRIPT_OVERLAY_DATA,
|
||||
SCRIPT_OVERLAY_CLOSE,
|
||||
SWING_PLAYER_ARM,
|
||||
PLAYER_UPDATE_SKIN_OVERLAYS,
|
||||
UPDATE_ANIMATIONS,
|
||||
OVERLAY_QUEST_TRACKING,
|
||||
DISABLE_MOUSE_INPUT,
|
||||
SYNC_WEAPON,
|
||||
MARK_DATA,
|
||||
PARTY_DATA
|
||||
}
|
||||
public enum EnumPacketClient {}
|
||||
@@ -1,16 +1,17 @@
|
||||
package noppes.npcs.controllers;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import kamkeel.npcs.network.PacketHandler;
|
||||
import kamkeel.npcs.network.PacketUtil;
|
||||
import kamkeel.npcs.network.packets.client.script.ScriptOverlayDataPacket;
|
||||
import kamkeel.npcs.util.ByteBufUtils;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import noppes.npcs.CustomNpcs;
|
||||
import noppes.npcs.Server;
|
||||
import noppes.npcs.api.entity.IPlayer;
|
||||
import noppes.npcs.api.item.IItemStack;
|
||||
import noppes.npcs.constants.EnumGuiType;
|
||||
import noppes.npcs.constants.EnumPacketClient;
|
||||
import noppes.npcs.constants.EnumScriptType;
|
||||
import noppes.npcs.containers.ContainerCustomGui;
|
||||
import noppes.npcs.scripted.NpcAPI;
|
||||
@@ -42,11 +43,11 @@ public class CustomGuiController {
|
||||
}
|
||||
|
||||
public static void openOverlay(IPlayer player, ScriptOverlay gui) {
|
||||
Server.sendDataChecked((EntityPlayerMP)player.getMCEntity(), EnumPacketClient.SCRIPT_OVERLAY_DATA, new Object[]{gui.toNBT()});
|
||||
PacketHandler.Instance.sendToPlayer(new ScriptOverlayDataPacket(gui.toNBT()), (EntityPlayerMP)player.getMCEntity());
|
||||
}
|
||||
|
||||
public static boolean updateOverlay(IPlayer player, ScriptOverlay gui) {
|
||||
Server.sendDataChecked((EntityPlayerMP)player.getMCEntity(), EnumPacketClient.SCRIPT_OVERLAY_DATA, new Object[]{gui.toNBT()});
|
||||
PacketHandler.Instance.sendToPlayer(new ScriptOverlayDataPacket(gui.toNBT()), (EntityPlayerMP)player.getMCEntity());
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -131,7 +132,7 @@ public class CustomGuiController {
|
||||
|
||||
public static String[] readScrollSelection(ByteBuf buffer) {
|
||||
try {
|
||||
NBTTagList list = Server.readNBT(buffer).getTagList("selection", 8);
|
||||
NBTTagList list = ByteBufUtils.readNBT(buffer).getTagList("selection", 8);
|
||||
String[] selection = new String[list.tagCount()];
|
||||
|
||||
for(int i = 0; i < list.tagCount(); ++i) {
|
||||
|
||||
@@ -135,7 +135,7 @@ public class PartyController {
|
||||
if(playerMP != null){
|
||||
PlayerData playerData = PlayerDataController.Instance.getPlayerData(playerMP);
|
||||
if(playerData != null){
|
||||
Server.sendData((EntityPlayerMP) playerMP, EnumPacketClient.PARTY_DATA, compound);
|
||||
PacketUtil.sendPartyData((EntityPlayerMP) playerMP, compound);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -166,7 +166,7 @@ public class PartyController {
|
||||
if(playerMP != null){
|
||||
PlayerData playerData = PlayerDataController.Instance.getPlayerData(playerMP);
|
||||
if(playerData != null){
|
||||
Server.sendData((EntityPlayerMP) playerMP, EnumPacketClient.PARTY_DATA, compound);
|
||||
PacketUtil.sendPartyData((EntityPlayerMP) playerMP, compound);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,6 +3,8 @@ 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.client.UpdateAnimationsPacket;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
@@ -128,7 +130,8 @@ public class AnimationData implements IAnimationData {
|
||||
if (!(entity instanceof EntityPlayer)) {
|
||||
data.setInteger("EntityId", entity.getEntityId());
|
||||
}
|
||||
Server.sendData((EntityPlayerMP) ((PlayerData) parent).player, EnumPacketClient.UPDATE_ANIMATIONS, data, entity.getCommandSenderName());
|
||||
|
||||
PacketHandler.Instance.sendToPlayer(new UpdateAnimationsPacket(data, entity.getCommandSenderName()), (EntityPlayerMP) ((PlayerData) parent).player);
|
||||
}
|
||||
|
||||
public NBTTagCompound writeToNBT(NBTTagCompound compound) {
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
package noppes.npcs.controllers.data;
|
||||
|
||||
import kamkeel.npcs.network.PacketHandler;
|
||||
import kamkeel.npcs.network.packets.client.MarkDataPacket;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraft.world.World;
|
||||
@@ -102,7 +105,7 @@ public class MarkData implements IExtendedEntityProperties {
|
||||
public void init(Entity entity, World world) {}
|
||||
|
||||
public void syncClients() {
|
||||
Server.sendToAll(EnumPacketClient.MARK_DATA, entity.getEntityId(), getNBT());
|
||||
PacketHandler.Instance.sendToAll(new MarkDataPacket(entity.getEntityId(), getNBT()));
|
||||
}
|
||||
|
||||
public class Mark implements IMark {
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
package noppes.npcs.controllers.data;
|
||||
|
||||
import kamkeel.npcs.network.PacketHandler;
|
||||
import kamkeel.npcs.network.PacketUtil;
|
||||
import kamkeel.npcs.network.packets.client.OverlayQuestTrackingPacket;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
@@ -202,8 +204,8 @@ public class PlayerQuestData implements IPlayerQuestData {
|
||||
public void untrackQuest() {
|
||||
if (this.trackedQuest != null) {
|
||||
this.trackedQuest = null;
|
||||
Server.sendData((EntityPlayerMP) this.parent.player, EnumPacketClient.OVERLAY_QUEST_TRACKING);
|
||||
}
|
||||
PacketHandler.Instance.sendToPlayer(new OverlayQuestTrackingPacket(new NBTTagCompound()), (EntityPlayerMP) this.parent.player);
|
||||
}
|
||||
}
|
||||
|
||||
public IQuest getTrackedQuest() {
|
||||
|
||||
@@ -13,6 +13,8 @@ import kamkeel.npcs.network.enums.EnumSoundOperation;
|
||||
import kamkeel.npcs.network.packets.client.ChatBubblePacket;
|
||||
import kamkeel.npcs.network.packets.client.SoundManagementPacket;
|
||||
import kamkeel.npcs.network.packets.client.npc.UpdateNpcPacket;
|
||||
import kamkeel.npcs.network.packets.client.npc.WeaponNpcPacket;
|
||||
import kamkeel.npcs.util.ByteBufUtils;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.Minecraft;
|
||||
@@ -39,7 +41,6 @@ import net.minecraft.network.play.server.S0BPacketAnimation;
|
||||
import net.minecraft.pathfinding.PathNavigate;
|
||||
import net.minecraft.potion.Potion;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.util.*;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.WorldServer;
|
||||
@@ -223,10 +224,9 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
|
||||
if(itemstack1!=null){
|
||||
itemstack1.writeToNBT(itemNBT);
|
||||
}
|
||||
for(Object obj: MinecraftServer.getServer().getConfigurationManager().playerEntityList){
|
||||
Server.sendData((EntityPlayerMP) obj, EnumPacketClient.SYNC_WEAPON, getEntityId(), i, itemNBT);
|
||||
}
|
||||
inventory.prevWeapons.put(i,itemstack1 == null ? null : itemstack1.copy());
|
||||
|
||||
PacketHandler.Instance.sendTracking(new WeaponNpcPacket(getEntityId(), i, itemNBT), this);
|
||||
inventory.prevWeapons.put(i,itemstack1 == null ? null : itemstack1.copy());
|
||||
}
|
||||
}
|
||||
this.timers.update();
|
||||
@@ -1624,7 +1624,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
|
||||
@Override
|
||||
public void writeSpawnData(ByteBuf buffer) {
|
||||
try {
|
||||
Server.writeNBT(buffer, writeSpawnData());
|
||||
ByteBufUtils.writeNBT(buffer, writeSpawnData());
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
@@ -1663,7 +1663,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
|
||||
@Override
|
||||
public void readSpawnData(ByteBuf buf) {
|
||||
try {
|
||||
readSpawnData(Server.readNBT(buf));
|
||||
readSpawnData(ByteBufUtils.readNBT(buf));
|
||||
} catch (IOException e) {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package noppes.npcs.entity.data;
|
||||
|
||||
import kamkeel.npcs.network.PacketHandler;
|
||||
import kamkeel.npcs.network.packets.client.PlayerUpdateSkinOverlaysPacket;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import noppes.npcs.Server;
|
||||
@@ -54,7 +56,7 @@ public class DataSkinOverlays implements IOverlayHandler {
|
||||
if (parent instanceof PlayerData && ((PlayerData) parent).player != null) {
|
||||
NBTTagCompound compound = this.writeToNBT(new NBTTagCompound());
|
||||
((PlayerData) parent).player.getEntityData().setTag("SkinOverlayData", compound.getTagList("SkinOverlayData", 10));
|
||||
Server.sendToAll(EnumPacketClient.PLAYER_UPDATE_SKIN_OVERLAYS, ((PlayerData) parent).player.getCommandSenderName(), compound);
|
||||
PacketHandler.Instance.sendToAll(new PlayerUpdateSkinOverlaysPacket(((PlayerData) parent).player.getCommandSenderName(), compound));
|
||||
} else if (parent instanceof EntityNPCInterface) {
|
||||
((EntityNPCInterface) parent).updateClient = true;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
package noppes.npcs.scripted.entity;
|
||||
|
||||
import kamkeel.npcs.network.PacketHandler;
|
||||
import kamkeel.npcs.network.PacketUtil;
|
||||
import kamkeel.npcs.network.packets.client.script.ScriptOverlayClosePacket;
|
||||
import kamkeel.npcs.network.packets.client.script.ScriptOverlayDataPacket;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -765,8 +768,8 @@ public class ScriptPlayer<T extends EntityPlayerMP> extends ScriptLivingBase<T>
|
||||
}
|
||||
|
||||
public void closeOverlay(int id) {
|
||||
Server.sendData((EntityPlayerMP)this.entity, EnumPacketClient.SCRIPT_OVERLAY_CLOSE, id, new NBTTagCompound());
|
||||
}
|
||||
PacketHandler.Instance.sendToPlayer(new ScriptOverlayClosePacket(id), (EntityPlayerMP)this.entity);
|
||||
}
|
||||
|
||||
public IOverlayHandler getOverlays() {
|
||||
return this.getData().skinOverlays;
|
||||
|
||||
Reference in new issue
Block a user