upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-13 03:07:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Register More Packets + Remove Useless Sync Packets

Browse Source
This commit is contained in:
Kam committed 2025-01-30 10:32:01 -05:00
1 parent 87cad579ae
commit a70300c54b
14 files changed
+39 -253
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/kamkeel/npcs/network/PacketHandler.java
+9 -5
View File
@@ -10,9 +10,8 @@ import kamkeel.npcs.network.enums.EnumPacketType;
import kamkeel.npcs.network.packets.client.*;
import kamkeel.npcs.network.packets.client.gui.*;
import kamkeel.npcs.network.packets.client.large.*;
import kamkeel.npcs.network.packets.client.npc.DeleteNpcPacket;
import kamkeel.npcs.network.packets.client.npc.EditNpcPacket;
import kamkeel.npcs.network.packets.client.script.ScriptedParticlePacket;
import kamkeel.npcs.network.packets.client.npc.*;
import kamkeel.npcs.network.packets.client.script.*;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -48,17 +47,18 @@ public final class PacketHandler {
LARGE_PACKET.registerPacket(new LargeScrollDataPacket());
LARGE_PACKET.registerPacket(new LargeScrollListPacket());
LARGE_PACKET.registerPacket(new LargeSyncPacket());
LARGE_PACKET.registerPacket(new LargeGuiDataPacket());
// Client Packets
CLIENT_PACKET.registerPacket(new ChatBubblePacket());
CLIENT_PACKET.registerPacket(new ChatAlertPacket());
CLIENT_PACKET.registerPacket(new AchievementPacket());
CLIENT_PACKET.registerPacket(new EditNpcPacket());
CLIENT_PACKET.registerPacket(new RolePacket());
CLIENT_PACKET.registerPacket(new GuiTeleporterPacket());
CLIENT_PACKET.registerPacket(new SoundManagementPacket());
CLIENT_PACKET.registerPacket(new ParticlePacket());
CLIENT_PACKET.registerPacket(new ScriptedParticlePacket());
CLIENT_PACKET.registerPacket(new ScriptOverlayClosePacket());
CLIENT_PACKET.registerPacket(new ScriptOverlayDataPacket());
CLIENT_PACKET.registerPacket(new ConfigCommandPacket());
// Client | GUI Packets
@@ -70,6 +70,10 @@ public final class PacketHandler {
// Client | NPC Packets
CLIENT_PACKET.registerPacket(new DeleteNpcPacket());
CLIENT_PACKET.registerPacket(new EditNpcPacket());
CLIENT_PACKET.registerPacket(new UpdateNpcPacket());
CLIENT_PACKET.registerPacket(new DialogPacket());
CLIENT_PACKET.registerPacket(new RolePacket());
}
private void registerChannels() {
src/main/java/kamkeel/npcs/network/packets/client/DialogPacket.java → src/main/java/kamkeel/npcs/network/packets/client/npc/DialogPacket.java
+1 -3
View File
@@ -1,4 +1,4 @@
package kamkeel.npcs.network.packets.client;
package kamkeel.npcs.network.packets.client.npc;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -12,8 +12,6 @@ import net.minecraft.client.Minecraft;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.client.NoppesUtil;
import noppes.npcs.entity.EntityDialogNpc;
import noppes.npcs.entity.EntityNPCInterface;
src/main/java/kamkeel/npcs/network/packets/client/RolePacket.java → src/main/java/kamkeel/npcs/network/packets/client/npc/RolePacket.java
+1 -3
View File
@@ -1,4 +1,4 @@
package kamkeel.npcs.network.packets.client;
package kamkeel.npcs.network.packets.client.npc;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -12,8 +12,6 @@ import net.minecraft.client.Minecraft;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.client.NoppesUtil;
import noppes.npcs.entity.EntityNPCInterface;
src/main/java/kamkeel/npcs/network/packets/client/npc/UpdateNpcPacket.java
+9 -2
View File
@@ -7,6 +7,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;
@@ -20,8 +21,14 @@ import java.io.IOException;
public final class UpdateNpcPacket extends AbstractPacket {
public static final String packetName = "Client|UpdateNpc";
private NBTTagCompound npcCompound;
public UpdateNpcPacket() {}
public UpdateNpcPacket(NBTTagCompound npcCompound) {
this.npcCompound = npcCompound;
}
@Override
public Enum getType() {
return EnumClientPacket.UPDATE_NPC;
@@ -34,13 +41,13 @@ public final class UpdateNpcPacket extends AbstractPacket {
@Override
public void sendData(ByteBuf out) throws IOException {
// TODO: Send Packet
ByteBufUtils.writeNBT(out, this.npcCompound);
}
@SideOnly(Side.CLIENT)
@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) entity).readSpawnData(compound);
src/main/java/kamkeel/npcs/network/packets/client/script/ScriptOverlayClosePacket.java
+7 -1
View File
@@ -15,8 +15,14 @@ import java.io.IOException;
public final class ScriptOverlayClosePacket extends AbstractPacket {
public static final String packetName = "Client|ScriptOverlayClose";
private int particleId;
public ScriptOverlayClosePacket() {}
public ScriptOverlayClosePacket(int particleId) {
this.particleId = particleId;
}
@Override
public Enum getType() {
return EnumClientPacket.SCRIPT_OVERLAY_CLOSE;
@@ -29,7 +35,7 @@ public final class ScriptOverlayClosePacket extends AbstractPacket {
@Override
public void sendData(ByteBuf out) throws IOException {
// TODO: Send Packet
out.writeInt(this.particleId);
}
@SideOnly(Side.CLIENT)
src/main/java/kamkeel/npcs/network/packets/client/script/ScriptOverlayDataPacket.java
+10 -2
View File
@@ -7,8 +7,10 @@ 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.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.Server;
import noppes.npcs.client.gui.customoverlay.OverlayCustom;
import noppes.npcs.client.ClientCacheHandler;
@@ -18,8 +20,14 @@ import java.io.IOException;
public final class ScriptOverlayDataPacket extends AbstractPacket {
public static final String packetName = "Client|ScriptOverlayData";
private NBTTagCompound overlayCompound;
public ScriptOverlayDataPacket() {}
public ScriptOverlayDataPacket(NBTTagCompound overlayCompound) {
this.overlayCompound = overlayCompound;
}
@Override
public Enum getType() {
return EnumClientPacket.SCRIPT_OVERLAY_DATA;
@@ -32,14 +40,14 @@ public final class ScriptOverlayDataPacket extends AbstractPacket {
@Override
public void sendData(ByteBuf out) throws IOException {
// TODO: Send Packet
ByteBufUtils.writeNBT(out, this.overlayCompound);
}
@SideOnly(Side.CLIENT)
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
OverlayCustom overlayCustom = new OverlayCustom(Minecraft.getMinecraft());
overlayCustom.setOverlayData(Server.readNBT(in));
overlayCustom.setOverlayData(ByteBufUtils.readNBT(in));
ClientCacheHandler.customOverlays.put(overlayCustom.overlay.getID(), overlayCustom);
}
}
src/main/java/kamkeel/npcs/network/packets/client/sync/SyncConfigPacket.java
-42
View File
@@ -1,42 +0,0 @@
package kamkeel.npcs.network.packets.client.sync;
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 net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.Server;
import java.io.IOException;
public final class SyncConfigPacket extends AbstractPacket {
public static final String packetName = "Client|SyncConfig";
public SyncConfigPacket() {}
@Override
public Enum getType() {
return EnumClientPacket.SYNC_CONFIG;
}
@Override
public PacketChannel getChannel() {
return PacketHandler.CLIENT_PACKET;
}
@Override
public void sendData(ByteBuf out) throws IOException {
// TODO: Send Packet
}
@SideOnly(Side.CLIENT)
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
NBTTagCompound configNBT = Server.readNBT(in);
SyncController.receiveConfigs(configNBT);
}
}
src/main/java/kamkeel/npcs/network/packets/client/sync/SyncRecipesAddPacket.java
-50
View File
@@ -1,50 +0,0 @@
package kamkeel.npcs.network.packets.client.sync;
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 net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagList;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.controllers.RecipeController;
import noppes.npcs.controllers.data.RecipeCarpentry;
import java.io.IOException;
public final class SyncRecipesAddPacket extends AbstractPacket {
public static final String packetName = "Client|SyncRecipesAdd";
public SyncRecipesAddPacket() {}
@Override
public Enum getType() {
return EnumClientPacket.SYNCRECIPES_ADD;
}
@Override
public PacketChannel getChannel() {
return PacketHandler.CLIENT_PACKET;
}
@Override
public void sendData(ByteBuf out) throws IOException {
// TODO: Send Packet
}
@SideOnly(Side.CLIENT)
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
NBTTagList list = Server.readNBT(in).getTagList("recipes", 10);
if (list != null) {
for (int i = 0; i < list.tagCount(); i++) {
RecipeCarpentry recipe = RecipeCarpentry.read(list.getCompoundTagAt(i));
RecipeController.syncRecipes.put(recipe.id, recipe);
}
}
}
}
src/main/java/kamkeel/npcs/network/packets/client/sync/SyncRecipesCarpentryBenchPacket.java
-41
View File
@@ -1,41 +0,0 @@
package kamkeel.npcs.network.packets.client.sync;
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 net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.controllers.RecipeController;
import java.io.IOException;
public final class SyncRecipesCarpentryBenchPacket extends AbstractPacket {
public static final String packetName = "Client|SyncRecipesCarpentryBench";
public SyncRecipesCarpentryBenchPacket() {}
@Override
public Enum getType() {
return EnumClientPacket.SYNCRECIPES_CARPENTRYBENCH;
}
@Override
public PacketChannel getChannel() {
return PacketHandler.CLIENT_PACKET;
}
@Override
public void sendData(ByteBuf out) throws IOException {
// TODO: Send Packet
}
@SideOnly(Side.CLIENT)
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
RecipeController.Instance.carpentryRecipes = RecipeController.syncRecipes;
RecipeController.syncRecipes.clear();
}
}
src/main/java/kamkeel/npcs/network/packets/client/sync/SyncRecipesWorkbenchPacket.java
-42
View File
@@ -1,42 +0,0 @@
package kamkeel.npcs.network.packets.client.sync;
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 net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.CustomNpcs;
import noppes.npcs.controllers.RecipeController;
import java.io.IOException;
public final class SyncRecipesWorkbenchPacket extends AbstractPacket {
public static final String packetName = "Client|SyncRecipesWorkbench";
public SyncRecipesWorkbenchPacket() {}
@Override
public Enum getType() {
return EnumClientPacket.SYNCRECIPES_WORKBENCH;
}
@Override
public PacketChannel getChannel() {
return PacketHandler.CLIENT_PACKET;
}
@Override
public void sendData(ByteBuf out) throws IOException {
// TODO: Send Packet
}
@SideOnly(Side.CLIENT)
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
RecipeController.reloadGlobalRecipes(RecipeController.syncRecipes);
RecipeController.syncRecipes.clear();
}
}
src/main/java/kamkeel/npcs/network/packets/client/sync/SyncWeaponPacket.java
-52
View File
@@ -1,52 +0,0 @@
package kamkeel.npcs.network.packets.client.sync;
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 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;
public final class SyncWeaponPacket extends AbstractPacket {
public static final String packetName = "Client|SyncWeapon";
public SyncWeaponPacket() {}
@Override
public Enum getType() {
return EnumClientPacket.SYNC_WEAPON;
}
@Override
public PacketChannel getChannel() {
return PacketHandler.CLIENT_PACKET;
}
@Override
public void sendData(ByteBuf out) throws IOException {
// TODO: Send Packet
}
@SideOnly(Side.CLIENT)
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
Entity entity = player.worldObj.getEntityByID(in.readInt());
if (!(entity instanceof EntityNPCInterface)) return;
EntityNPCInterface npc = (EntityNPCInterface) entity;
int weaponSlotIndex = in.readInt();
NBTTagCompound nbt = Server.readNBT(in);
ItemStack stack = ItemStack.loadItemStackFromNBT(nbt);
npc.inventory.weapons.put(weaponSlotIndex, stack);
}
}
src/main/java/noppes/npcs/NoppesUtilServer.java
+2 -2
View File
@@ -4,12 +4,12 @@ import io.netty.buffer.ByteBuf;
import kamkeel.npcs.controllers.SyncController;
import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.PacketUtil;
import kamkeel.npcs.network.packets.client.DialogPacket;
import kamkeel.npcs.network.packets.client.npc.DialogPacket;
import kamkeel.npcs.network.packets.client.ParticlePacket;
import kamkeel.npcs.network.packets.client.script.ScriptedParticlePacket;
import kamkeel.npcs.network.packets.client.npc.DeleteNpcPacket;
import kamkeel.npcs.network.packets.client.npc.EditNpcPacket;
import kamkeel.npcs.network.packets.client.RolePacket;
import kamkeel.npcs.network.packets.client.npc.RolePacket;
import kamkeel.npcs.network.packets.client.gui.GuiTeleporterPacket;
import kamkeel.npcs.util.ByteBufUtils;
import net.minecraft.command.server.CommandBlockLogic;
src/main/java/noppes/npcs/client/PacketHandlerClient.java
-6
View File
@@ -48,12 +48,6 @@ public class PacketHandlerClient extends PacketHandlerServer{
MarkData data = MarkData.get((EntityNPCInterface) entity);
data.setNBT(Server.readNBT(buffer));
}
else if(type == EnumPacketClient.DIALOG){
Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(buffer.readInt());
if(entity == null || !(entity instanceof EntityNPCInterface))
return;
NoppesUtil.openDialog(Server.readNBT(buffer), (EntityNPCInterface) entity, player);
}
else if(type == EnumPacketClient.QUEST_COMPLETION){
NoppesUtil.guiQuestCompletion(player, Server.readNBT(buffer));
}
src/main/java/noppes/npcs/constants/EnumPacketClient.java
-2
View File
@@ -2,7 +2,6 @@ package
noppes.npcs.constants;
public enum EnumPacketClient {
DIALOG,
QUEST_COMPLETION,
UPDATE_NPC,
ROLE,
@@ -19,7 +18,6 @@ public enum EnumPacketClient {
SCRIPT_OVERLAY_DATA,
SCRIPT_OVERLAY_CLOSE,
SWING_PLAYER_ARM,
UPDATE_ITEM,
PLAYER_UPDATE_SKIN_OVERLAYS,
UPDATE_ANIMATIONS,
OVERLAY_QUEST_TRACKING,