mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-20 22:42:19 +00:00
WHEN WILL THIS END!
This commit is contained in:
1 parent
06275fffa6
commit
d91d4668d6
26 files changed
+322
-343
No files matched your search
@@ -1,10 +1,9 @@
|
||||
package kamkeel.npcs.command;
|
||||
|
||||
import kamkeel.npcs.network.PacketUtil;
|
||||
import net.minecraft.command.CommandException;
|
||||
import net.minecraft.command.ICommandSender;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import noppes.npcs.Server;
|
||||
import noppes.npcs.constants.EnumPacketClient;
|
||||
import noppes.npcs.constants.EnumQuestRepeat;
|
||||
import noppes.npcs.controllers.PlayerDataController;
|
||||
import noppes.npcs.controllers.QuestController;
|
||||
@@ -93,8 +92,8 @@ public class QuestCategoryCommand extends CommandKamkeelBase {
|
||||
playerdata.questData.finishedQuests.put(quest.id, sender.getEntityWorld().getTotalWorldTime());
|
||||
|
||||
if(playerdata.player != null){
|
||||
Server.sendData((EntityPlayerMP)playerdata.player, EnumPacketClient.MESSAGE, "quest.completed", quest.title);
|
||||
Server.sendData((EntityPlayerMP)playerdata.player, EnumPacketClient.CHAT, "quest.completed", ": ", quest.title);
|
||||
PacketUtil.sendAchievement((EntityPlayerMP) playerdata.player, false, "quest.completed", quest.title);
|
||||
PacketUtil.sendChatAlert((EntityPlayerMP) playerdata.player, "quest.completed", ": ", quest.title);
|
||||
}
|
||||
count++;
|
||||
}
|
||||
@@ -185,8 +184,8 @@ public class QuestCategoryCommand extends CommandKamkeelBase {
|
||||
count++;
|
||||
|
||||
if(playerdata.player != null && questData.sendAlerts){
|
||||
Server.sendData((EntityPlayerMP)playerdata.player, EnumPacketClient.MESSAGE, "quest.newquest", quest.title);
|
||||
Server.sendData((EntityPlayerMP)playerdata.player, EnumPacketClient.CHAT, "quest.newquest", ": ", quest.title);
|
||||
PacketUtil.sendAchievement((EntityPlayerMP) playerdata.player, false, "quest.newquest", quest.title);
|
||||
PacketUtil.sendChatAlert((EntityPlayerMP) playerdata.player, "quest.newquest", ": ", quest.title);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,18 +1,16 @@
|
||||
package kamkeel.npcs.command;
|
||||
|
||||
import kamkeel.npcs.controllers.SyncMaster;
|
||||
import kamkeel.npcs.network.PacketUtil;
|
||||
import net.minecraft.command.CommandException;
|
||||
import net.minecraft.command.ICommandSender;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import noppes.npcs.Server;
|
||||
import noppes.npcs.api.handler.data.IQuestObjective;
|
||||
import noppes.npcs.constants.EnumPacketClient;
|
||||
import noppes.npcs.constants.EnumQuestCompletion;
|
||||
import noppes.npcs.constants.EnumQuestRepeat;
|
||||
import noppes.npcs.controllers.PlayerDataController;
|
||||
import noppes.npcs.controllers.QuestController;
|
||||
import noppes.npcs.controllers.SyncController;
|
||||
import noppes.npcs.controllers.data.Party;
|
||||
import noppes.npcs.controllers.data.PlayerData;
|
||||
import noppes.npcs.controllers.data.Quest;
|
||||
@@ -66,8 +64,8 @@ public class QuestCommand extends CommandKamkeelBase {
|
||||
playerdata.questData.activeQuests.put(questid, questdata);
|
||||
playerdata.save();
|
||||
if(playerdata.player != null && questdata.sendAlerts){
|
||||
Server.sendData((EntityPlayerMP)playerdata.player, EnumPacketClient.MESSAGE, "quest.newquest", quest.title);
|
||||
Server.sendData((EntityPlayerMP)playerdata.player, EnumPacketClient.CHAT, "quest.newquest", ": ", quest.title);
|
||||
PacketUtil.sendAchievement((EntityPlayerMP) playerdata.player, false, "quest.newquest", quest.title);
|
||||
PacketUtil.sendChatAlert((EntityPlayerMP) playerdata.player, "quest.newquest", ": ", quest.title);
|
||||
}
|
||||
playerdata.updateClient = true;
|
||||
sendResult(sender, String.format("Started Quest \u00A7e%d\u00A77 for Player '\u00A7b%s\u00A77'", questid, playerdata.playername));
|
||||
@@ -112,8 +110,8 @@ public class QuestCommand extends CommandKamkeelBase {
|
||||
|
||||
playerdata.save();
|
||||
if(playerdata.player != null){
|
||||
Server.sendData((EntityPlayerMP)playerdata.player, EnumPacketClient.MESSAGE, "quest.completed", quest.title);
|
||||
Server.sendData((EntityPlayerMP)playerdata.player, EnumPacketClient.CHAT, "quest.completed", ": ", quest.title);
|
||||
PacketUtil.sendAchievement((EntityPlayerMP) playerdata.player, false, "quest.completed", quest.title);
|
||||
PacketUtil.sendChatAlert((EntityPlayerMP) playerdata.player, "quest.completed", ": ", quest.title);
|
||||
}
|
||||
playerdata.updateClient = true;
|
||||
sendResult(sender, String.format("Finished Quest \u00A7e%d\u00A77 for Player '\u00A7b%s\u00A77'", questid, playerdata.playername));
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
package kamkeel.npcs.network;
|
||||
|
||||
import kamkeel.npcs.network.packets.client.large.LargeScrollGroupPacket;
|
||||
import kamkeel.npcs.network.packets.client.large.LargeScrollDataPacket;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
public class KamUtilServer {
|
||||
|
||||
public static void sendScrollData(EntityPlayerMP player, Map<String, Integer> map) {
|
||||
LargeScrollDataPacket packet = new LargeScrollDataPacket(map);
|
||||
PacketHandler.Instance.sendToPlayer(packet, player);
|
||||
}
|
||||
|
||||
public static void sendScrollGroup(EntityPlayerMP player, Map<String,Integer> map){
|
||||
LargeScrollGroupPacket packet = new LargeScrollGroupPacket(map);
|
||||
PacketHandler.Instance.sendToPlayer(packet, player);
|
||||
}
|
||||
}
|
||||
@@ -6,17 +6,24 @@ import cpw.mods.fml.common.network.FMLNetworkEvent;
|
||||
import cpw.mods.fml.common.network.NetworkRegistry;
|
||||
import cpw.mods.fml.common.network.internal.FMLProxyPacket;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.buffer.Unpooled;
|
||||
import kamkeel.npcs.network.enums.EnumPacketType;
|
||||
import kamkeel.npcs.network.packets.client.AchievementPacket;
|
||||
import kamkeel.npcs.network.packets.client.ChatAlertPacket;
|
||||
import kamkeel.npcs.network.packets.client.ChatBubblePacket;
|
||||
import kamkeel.npcs.network.packets.client.large.LargeScrollDataPacket;
|
||||
import kamkeel.npcs.network.packets.client.large.LargeScrollGroupPacket;
|
||||
import kamkeel.npcs.network.packets.client.large.LargeScrollListPacket;
|
||||
import kamkeel.npcs.network.packets.client.large.sync.LargeSyncPacket;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.network.NetHandlerPlayServer;
|
||||
import noppes.npcs.CustomNpcs;
|
||||
import noppes.npcs.LogWriter;
|
||||
import noppes.npcs.constants.EnumPacketClient;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.*;
|
||||
|
||||
public final class PacketHandler {
|
||||
@@ -45,6 +52,11 @@ public final class PacketHandler {
|
||||
LARGE_PACKET.registerPacket(new LargeScrollDataPacket());
|
||||
LARGE_PACKET.registerPacket(new LargeScrollListPacket());
|
||||
LARGE_PACKET.registerPacket(new LargeSyncPacket());
|
||||
|
||||
// Client Packets
|
||||
CLIENT_PACKET.registerPacket(new ChatBubblePacket());
|
||||
CLIENT_PACKET.registerPacket(new ChatAlertPacket());
|
||||
CLIENT_PACKET.registerPacket(new AchievementPacket());
|
||||
}
|
||||
|
||||
private void registerChannels() {
|
||||
@@ -159,16 +171,7 @@ public final class PacketHandler {
|
||||
sendAllPackets(packet, eventChannel::sendToAll);
|
||||
}
|
||||
|
||||
public void sendToAllAround(AbstractPacket packet, NetworkRegistry.TargetPoint point) {
|
||||
FMLEventChannel eventChannel = getEventChannel(packet);
|
||||
if (eventChannel == null) {
|
||||
LogWriter.error("Error: Event channel is null for packet: " + packet.getClass().getName());
|
||||
return;
|
||||
}
|
||||
sendAllPackets(packet, p -> eventChannel.sendToAllAround(p, point));
|
||||
}
|
||||
|
||||
public void sendToDimension(AbstractPacket packet, int dimensionId) {
|
||||
public void sendToDimension(AbstractPacket packet, final int dimensionId) {
|
||||
FMLEventChannel eventChannel = getEventChannel(packet);
|
||||
if (eventChannel == null) {
|
||||
LogWriter.error("Error: Event channel is null for packet: " + packet.getClass().getName());
|
||||
@@ -177,6 +180,16 @@ public final class PacketHandler {
|
||||
sendAllPackets(packet, p -> eventChannel.sendToDimension(p, dimensionId));
|
||||
}
|
||||
|
||||
public void sendTracking(AbstractPacket packet, final Entity entity) {
|
||||
FMLEventChannel eventChannel = getEventChannel(packet);
|
||||
if (eventChannel == null) {
|
||||
LogWriter.error("Error: Event channel is null for packet: " + packet.getClass().getName());
|
||||
return;
|
||||
}
|
||||
final NetworkRegistry.TargetPoint point = new NetworkRegistry.TargetPoint(entity.dimension, entity.posX, entity.posY, entity.posZ, 60);
|
||||
sendAllPackets(packet, p -> eventChannel.sendToAllAround(p, point));
|
||||
}
|
||||
|
||||
// Simple functional interface to unify the "send" action
|
||||
private interface SendAction {
|
||||
void send(FMLProxyPacket proxy);
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
package kamkeel.npcs.network;
|
||||
|
||||
import kamkeel.npcs.network.packets.client.ChatAlertPacket;
|
||||
import kamkeel.npcs.network.packets.client.AchievementPacket;
|
||||
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 java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class PacketUtil {
|
||||
|
||||
public static void sendScrollData(EntityPlayerMP player, Map<String, Integer> map) {
|
||||
LargeScrollDataPacket packet = new LargeScrollDataPacket(map);
|
||||
PacketHandler.Instance.sendToPlayer(packet, player);
|
||||
}
|
||||
|
||||
public static void sendScrollGroup(EntityPlayerMP player, Map<String,Integer> map){
|
||||
LargeScrollGroupPacket packet = new LargeScrollGroupPacket(map);
|
||||
PacketHandler.Instance.sendToPlayer(packet, player);
|
||||
}
|
||||
|
||||
public static void sendList(EntityPlayerMP player, List<String> list){
|
||||
LargeScrollListPacket packet = new LargeScrollListPacket(list);
|
||||
PacketHandler.Instance.sendToPlayer(packet, player);
|
||||
}
|
||||
|
||||
public static void sendChatAlert(EntityPlayerMP playerMP, final Object... obs){
|
||||
ChatAlertPacket packet = new ChatAlertPacket(obs);
|
||||
PacketHandler.Instance.sendToPlayer(packet, playerMP);
|
||||
}
|
||||
|
||||
public static void sendAchievement(EntityPlayerMP playerMP, boolean isParty, String description, String message){
|
||||
AchievementPacket packet = new AchievementPacket(isParty, description, message);
|
||||
PacketHandler.Instance.sendToPlayer(packet, playerMP);
|
||||
}
|
||||
}
|
||||
@@ -3,8 +3,8 @@ package kamkeel.npcs.network.enums;
|
||||
// Packets to the Client
|
||||
public enum EnumClientPacket {
|
||||
SYNC,
|
||||
CHAT,
|
||||
MESSAGE,
|
||||
CHAT_ALERT,
|
||||
ACHIEVEMENT,
|
||||
PARTY_MESSAGE,
|
||||
SYNCRECIPES_ADD,
|
||||
SYNCRECIPES_WORKBENCH,
|
||||
@@ -35,7 +35,6 @@ public enum EnumClientPacket {
|
||||
CLONER,
|
||||
TELEPORTER,
|
||||
OPEN_BOOK,
|
||||
DIALOG_DUMMY,
|
||||
CONFIG,
|
||||
ISGUIOPEN,
|
||||
SCRIPT_OVERLAY_DATA,
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
package kamkeel.npcs.network.packets.client;
|
||||
|
||||
import cpw.mods.fml.common.ObfuscationReflectionHelper;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
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.client.gui.achievement.GuiAchievement;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.stats.Achievement;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import noppes.npcs.CustomItems;
|
||||
import noppes.npcs.CustomNpcs;
|
||||
import noppes.npcs.client.MessageAchievement;
|
||||
import noppes.npcs.config.ConfigClient;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
public final class AchievementPacket extends AbstractPacket {
|
||||
public static final String packetName = "Client|Achievement";
|
||||
|
||||
private boolean isParty;
|
||||
private String description;
|
||||
private String message;
|
||||
|
||||
public AchievementPacket() {}
|
||||
|
||||
public AchievementPacket(boolean isParty, String description, String message) {
|
||||
this.isParty = isParty;
|
||||
this.description = description;
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Enum getType() {
|
||||
return EnumClientPacket.ACHIEVEMENT;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PacketChannel getChannel() {
|
||||
return PacketHandler.CLIENT_PACKET;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sendData(ByteBuf out) throws IOException {
|
||||
out.writeBoolean(this.isParty);
|
||||
ByteBufUtils.writeString(out, this.description);
|
||||
ByteBufUtils.writeString(out, this.message);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if(!ConfigClient.BannerAlerts)
|
||||
return;
|
||||
|
||||
if(CustomNpcs.side() != Side.CLIENT)
|
||||
return;
|
||||
|
||||
boolean isNotParty = !in.readBoolean();
|
||||
String description = StatCollector.translateToLocal(ByteBufUtils.readString(in));
|
||||
String message = ByteBufUtils.readString(in);
|
||||
Achievement ach = isNotParty ? new MessageAchievement(message, description) : new MessageAchievement(CustomItems.bag == null ? Items.paper : CustomItems.bag, message, description);
|
||||
Minecraft.getMinecraft().guiAchievement.func_146256_a(ach);
|
||||
ObfuscationReflectionHelper.setPrivateValue(GuiAchievement.class, Minecraft.getMinecraft().guiAchievement, ach.getDescription(), 4);
|
||||
}
|
||||
}
|
||||
+16
-5
@@ -6,21 +6,29 @@ 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.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;
|
||||
|
||||
public final class ChatPacket extends AbstractPacket {
|
||||
public static final String packetName = "Client|Chat";
|
||||
public final class ChatAlertPacket extends AbstractPacket {
|
||||
public static final String packetName = "Client|ChatAlert";
|
||||
|
||||
public ChatPacket() {}
|
||||
private Object[] objects;
|
||||
|
||||
public ChatAlertPacket() {}
|
||||
|
||||
public ChatAlertPacket(final Object... obs) {
|
||||
this.objects = obs;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Enum getType() {
|
||||
return EnumClientPacket.CHAT;
|
||||
return EnumClientPacket.CHAT_ALERT;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -30,11 +38,14 @@ public final class ChatPacket extends AbstractPacket {
|
||||
|
||||
@Override
|
||||
public void sendData(ByteBuf out) throws IOException {
|
||||
// TODO: Send Packet
|
||||
ByteBufUtils.fillBuffer(out, this.objects);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if(!ConfigClient.ChatAlerts)
|
||||
return;
|
||||
|
||||
if(CustomNpcs.side() != Side.CLIENT)
|
||||
return;
|
||||
|
||||
@@ -6,13 +6,13 @@ 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.util.ChatComponentTranslation;
|
||||
import noppes.npcs.CustomNpcs;
|
||||
import noppes.npcs.NoppesStringUtils;
|
||||
import noppes.npcs.Server;
|
||||
import noppes.npcs.client.RenderChatMessages;
|
||||
import noppes.npcs.entity.EntityNPCInterface;
|
||||
|
||||
@@ -21,8 +21,17 @@ import java.io.IOException;
|
||||
public final class ChatBubblePacket extends AbstractPacket {
|
||||
public static final String packetName = "Client|ChatBubble";
|
||||
|
||||
private int entityId;
|
||||
private String text;
|
||||
private boolean hideText;
|
||||
|
||||
public ChatBubblePacket() {}
|
||||
|
||||
public ChatBubblePacket(int entityId, String text, boolean hideText) {
|
||||
this.entityId = entityId;
|
||||
this.text = text;
|
||||
this.hideText = hideText;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Enum getType() {
|
||||
@@ -36,7 +45,9 @@ public final class ChatBubblePacket extends AbstractPacket {
|
||||
|
||||
@Override
|
||||
public void sendData(ByteBuf out) throws IOException {
|
||||
// TODO: Send Packet
|
||||
out.writeInt(this.entityId);
|
||||
ByteBufUtils.writeString(out, this.text);
|
||||
out.writeBoolean(this.hideText);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -45,12 +56,13 @@ public final class ChatBubblePacket extends AbstractPacket {
|
||||
return;
|
||||
|
||||
Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(in.readInt());
|
||||
if(entity == null || !(entity instanceof EntityNPCInterface))
|
||||
if(!(entity instanceof EntityNPCInterface))
|
||||
return;
|
||||
|
||||
EntityNPCInterface npc = (EntityNPCInterface) entity;
|
||||
if(npc.messages == null)
|
||||
npc.messages = new RenderChatMessages();
|
||||
String text = NoppesStringUtils.formatText(Server.readString(in), player, npc);
|
||||
String text = NoppesStringUtils.formatText(ByteBufUtils.readString(in), player, npc);
|
||||
npc.messages.addMessage(text, npc);
|
||||
|
||||
if(in.readBoolean())
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
package kamkeel.npcs.network.packets.client;
|
||||
|
||||
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 net.minecraft.entity.player.EntityPlayer;
|
||||
import noppes.npcs.Server;
|
||||
import noppes.npcs.client.NoppesUtil;
|
||||
import noppes.npcs.entity.EntityDialogNpc;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
public final class DialogDummyPacket extends AbstractPacket {
|
||||
public static final String packetName = "Client|DialogDummy";
|
||||
|
||||
public DialogDummyPacket() {}
|
||||
|
||||
@Override
|
||||
public Enum getType() {
|
||||
return EnumClientPacket.DIALOG_DUMMY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PacketChannel getChannel() {
|
||||
return PacketHandler.CLIENT_PACKET;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sendData(ByteBuf out) throws IOException {
|
||||
// TODO: Send Packet
|
||||
}
|
||||
|
||||
@Override
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
EntityDialogNpc npc = new EntityDialogNpc(player.worldObj);
|
||||
npc.display.name = Server.readString(in);
|
||||
NoppesUtil.openDialog(Server.readNBT(in), npc, player);
|
||||
}
|
||||
}
|
||||
@@ -5,11 +5,14 @@ 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.nbt.NBTTagCompound;
|
||||
import noppes.npcs.Server;
|
||||
import noppes.npcs.client.NoppesUtil;
|
||||
import noppes.npcs.entity.EntityDialogNpc;
|
||||
import noppes.npcs.entity.EntityNPCInterface;
|
||||
|
||||
import java.io.IOException;
|
||||
@@ -17,8 +20,18 @@ import java.io.IOException;
|
||||
public final class DialogPacket extends AbstractPacket {
|
||||
public static final String packetName = "Client|Dialog";
|
||||
|
||||
private String dummyName;
|
||||
private int entityID;
|
||||
private NBTTagCompound compound;
|
||||
|
||||
public DialogPacket() {}
|
||||
|
||||
public DialogPacket(String dummyName, int entityID, NBTTagCompound compound) {
|
||||
this.dummyName = dummyName;
|
||||
this.entityID = entityID;
|
||||
this.compound = compound;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Enum getType() {
|
||||
return EnumClientPacket.DIALOG;
|
||||
@@ -31,15 +44,29 @@ public final class DialogPacket extends AbstractPacket {
|
||||
|
||||
@Override
|
||||
public void sendData(ByteBuf out) throws IOException {
|
||||
// TODO: Send Packet
|
||||
out.writeInt(this.entityID);
|
||||
ByteBufUtils.writeString(out, this.dummyName);
|
||||
ByteBufUtils.writeNBT(out, this.compound);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(in.readInt());
|
||||
if (!(entity instanceof EntityNPCInterface)) {
|
||||
return;
|
||||
int entityID = in.readInt();
|
||||
String name = ByteBufUtils.readString(in);
|
||||
NBTTagCompound tagCompound = ByteBufUtils.readNBT(in);
|
||||
|
||||
// Dummy NPC
|
||||
if(entityID == -1){
|
||||
EntityDialogNpc npc = new EntityDialogNpc(player.worldObj);
|
||||
npc.display.name = name;
|
||||
NoppesUtil.openDialog(tagCompound, npc, player);
|
||||
}
|
||||
else {
|
||||
Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(entityID);
|
||||
if (!(entity instanceof EntityNPCInterface)) {
|
||||
return;
|
||||
}
|
||||
NoppesUtil.openDialog(tagCompound, (EntityNPCInterface) entity, player);
|
||||
}
|
||||
NoppesUtil.openDialog(Server.readNBT(in), (EntityNPCInterface) entity, player);
|
||||
}
|
||||
}
|
||||
@@ -16,8 +16,13 @@ import java.io.IOException;
|
||||
public final class EditNpcPacket extends AbstractPacket {
|
||||
public static final String packetName = "Client|EditNpc";
|
||||
|
||||
int entityId;
|
||||
public EditNpcPacket() {}
|
||||
|
||||
public EditNpcPacket(int entityId) {
|
||||
this.entityId = entityId;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Enum getType() {
|
||||
return EnumClientPacket.EDIT_NPC;
|
||||
@@ -30,7 +35,7 @@ public final class EditNpcPacket extends AbstractPacket {
|
||||
|
||||
@Override
|
||||
public void sendData(ByteBuf out) throws IOException {
|
||||
// TODO: Send Packet
|
||||
out.writeInt(this.entityId);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
package kamkeel.npcs.network.packets.client;
|
||||
|
||||
import cpw.mods.fml.common.ObfuscationReflectionHelper;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
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 net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.achievement.GuiAchievement;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.stats.Achievement;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import noppes.npcs.CustomNpcs;
|
||||
import noppes.npcs.Server;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
public final class MessagePacket extends AbstractPacket {
|
||||
public static final String packetName = "Client|Message";
|
||||
|
||||
public MessagePacket() {}
|
||||
|
||||
@Override
|
||||
public Enum getType() {
|
||||
return EnumClientPacket.MESSAGE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PacketChannel getChannel() {
|
||||
return PacketHandler.CLIENT_PACKET;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sendData(ByteBuf out) throws IOException {
|
||||
// TODO: Send Packet
|
||||
}
|
||||
|
||||
@Override
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if(CustomNpcs.side() != Side.CLIENT)
|
||||
return;
|
||||
|
||||
// TODO: Fix Message Packet
|
||||
// String description = StatCollector.translateToLocal(Server.readString(in));
|
||||
// String message = Server.readString(in);
|
||||
// Achievement achievement = new Achievement(message, description);
|
||||
// GuiAchievement guiAchievement = Minecraft.getMinecraft().guiAchievement;
|
||||
// guiAchievement.func_146256_a(achievement);
|
||||
// ObfuscationReflectionHelper.setPrivateValue(GuiAchievement.class, guiAchievement, achievement.getDescription(), 4);
|
||||
}
|
||||
}
|
||||
@@ -5,6 +5,7 @@ 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;
|
||||
@@ -18,8 +19,14 @@ import java.io.IOException;
|
||||
public final class RolePacket extends AbstractPacket {
|
||||
public static final String packetName = "Client|Role";
|
||||
|
||||
private NBTTagCompound compound;
|
||||
|
||||
public RolePacket() {}
|
||||
|
||||
public RolePacket(NBTTagCompound compound) {
|
||||
this.compound = compound;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Enum getType() {
|
||||
return EnumClientPacket.ROLE;
|
||||
@@ -32,12 +39,12 @@ public final class RolePacket extends AbstractPacket {
|
||||
|
||||
@Override
|
||||
public void sendData(ByteBuf out) throws IOException {
|
||||
// TODO: Send Packet
|
||||
ByteBufUtils.writeNBT(out, this.compound);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
NBTTagCompound compound = Server.readNBT(in);
|
||||
NBTTagCompound compound = ByteBufUtils.readNBT(in);
|
||||
Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(compound.getInteger("EntityId"));
|
||||
if (entity instanceof EntityNPCInterface) {
|
||||
EntityNPCInterface npc = (EntityNPCInterface) entity;
|
||||
|
||||
@@ -9,8 +9,6 @@ import net.minecraft.network.PacketBuffer;
|
||||
import net.minecraft.village.MerchantRecipeList;
|
||||
import noppes.npcs.LogWriter;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
@@ -18,10 +16,7 @@ import java.util.Map;
|
||||
|
||||
public class ByteBufUtils extends cpw.mods.fml.common.network.ByteBufUtils {
|
||||
|
||||
// TODO: Modify this to check if it a large packet so we don't need the condition at the bottom or make two
|
||||
// differnt methods one for fillBuffer normal and one fillLargeBuffer
|
||||
public static boolean fillBuffer(ByteBuf buffer, Enum enu, Object... obs) throws IOException{
|
||||
buffer.writeInt(enu.ordinal());
|
||||
public static void fillBuffer(ByteBuf buffer, Object... obs) throws IOException{
|
||||
for(Object ob : obs){
|
||||
if(ob == null)
|
||||
continue;
|
||||
@@ -66,12 +61,7 @@ public class ByteBufUtils extends cpw.mods.fml.common.network.ByteBufUtils {
|
||||
else if(ob instanceof NBTTagCompound)
|
||||
writeNBT(buffer, (NBTTagCompound) ob);
|
||||
}
|
||||
if(buffer.array().length >= 32767){
|
||||
LogWriter.error("Packet " + enu + " was too big to be send");
|
||||
LogWriter.script( "Issue occurred with the following Packet - " + enu + ":\n" + Arrays.toString(obs));
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
return;
|
||||
}
|
||||
|
||||
public static void writeIntArray(ByteBuf buffer, int[] arr) {
|
||||
|
||||
Reference in new issue
Block a user