mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-17 21:35:10 +00:00
Syncing and Large Packet Completion
This commit is contained in:
1 parent
dcf3a0d8b0
commit
de56032118
39 files changed
+648
-862
No files matched your search
@@ -7,9 +7,10 @@ import cpw.mods.fml.common.network.NetworkRegistry;
|
||||
import cpw.mods.fml.common.network.internal.FMLProxyPacket;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import kamkeel.npcs.network.enums.EnumPacketType;
|
||||
import kamkeel.npcs.network.packets.large.LargeScrollDataPacket;
|
||||
import kamkeel.npcs.network.packets.large.LargeScrollGroupPacket;
|
||||
import kamkeel.npcs.network.packets.large.LargeScrollListPacket;
|
||||
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.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.network.NetHandlerPlayServer;
|
||||
@@ -17,19 +18,19 @@ import noppes.npcs.CustomNpcs;
|
||||
import noppes.npcs.LogWriter;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
public final class PacketHandler {
|
||||
public static PacketHandler Instance;
|
||||
|
||||
// Channels
|
||||
public Map<EnumPacketType, FMLEventChannel> channels = new Hashtable<>();
|
||||
|
||||
public final static PacketChannel INFO_PACKET = new PacketChannel("CNPC+|Info", EnumPacketType.INFO);
|
||||
public final static PacketChannel DATA_PACKET = new PacketChannel("CNPC+|Data", EnumPacketType.DATA);
|
||||
public final static PacketChannel CLIENT_PACKET = new PacketChannel("CNPC+|Client", EnumPacketType.CLIENT);
|
||||
public final static PacketChannel LARGE_PACKET = new PacketChannel("CNPC+|Large", EnumPacketType.LARGE);
|
||||
public static final PacketChannel INFO_PACKET = new PacketChannel("CNPC+|Info", EnumPacketType.INFO);
|
||||
public static final PacketChannel DATA_PACKET = new PacketChannel("CNPC+|Data", EnumPacketType.DATA);
|
||||
public static final PacketChannel CLIENT_PACKET = new PacketChannel("CNPC+|Client", EnumPacketType.CLIENT);
|
||||
public static final PacketChannel LARGE_PACKET = new PacketChannel("CNPC+|Large", EnumPacketType.LARGE);
|
||||
|
||||
private final static List<PacketChannel> packetChannels = new ArrayList<>();
|
||||
private static final List<PacketChannel> packetChannels = new ArrayList<>();
|
||||
|
||||
public PacketHandler() {
|
||||
// Register Channels
|
||||
@@ -43,22 +44,20 @@ public final class PacketHandler {
|
||||
LARGE_PACKET.registerPacket(new LargeScrollGroupPacket());
|
||||
LARGE_PACKET.registerPacket(new LargeScrollDataPacket());
|
||||
LARGE_PACKET.registerPacket(new LargeScrollListPacket());
|
||||
|
||||
// Log channel registration
|
||||
System.out.println("PacketHandler initialized and channels registered.");
|
||||
LARGE_PACKET.registerPacket(new LargeSyncPacket());
|
||||
}
|
||||
|
||||
public void registerChannels() {
|
||||
FMLEventChannel eventChannel;
|
||||
private void registerChannels() {
|
||||
for (PacketChannel channel : packetChannels) {
|
||||
eventChannel = NetworkRegistry.INSTANCE.newEventDrivenChannel(channel.getChannelName());
|
||||
FMLEventChannel eventChannel =
|
||||
NetworkRegistry.INSTANCE.newEventDrivenChannel(channel.getChannelName());
|
||||
eventChannel.register(this);
|
||||
channels.put(channel.getChannelType(), eventChannel);
|
||||
System.out.println("Registered channel: " + channel.getChannelName());
|
||||
}
|
||||
}
|
||||
|
||||
public PacketChannel getPacketChannel(EnumPacketType type){
|
||||
public PacketChannel getPacketChannel(EnumPacketType type) {
|
||||
return packetChannels.stream()
|
||||
.filter(channel -> channel.getChannelType() == type)
|
||||
.findFirst()
|
||||
@@ -86,20 +85,26 @@ public final class PacketHandler {
|
||||
private void handlePacket(FMLProxyPacket packet, EntityPlayer player) {
|
||||
ByteBuf buf = packet.payload();
|
||||
try {
|
||||
// First two ints are channelTypeOrdinal and packetTypeOrdinal
|
||||
int packetTypeOrdinal = buf.readInt();
|
||||
EnumPacketType packetType = EnumPacketType.values()[packetTypeOrdinal];
|
||||
|
||||
PacketChannel packetChannel = getPacketChannel(packetType);
|
||||
if (packetChannel == null) {
|
||||
LogWriter.error("Error: Packet channel is null for packet type: " + packetType);
|
||||
return;
|
||||
}
|
||||
|
||||
int packetId = buf.readInt();
|
||||
AbstractPacket abstractPacket = packetChannel.packets.get(packetId);
|
||||
if (abstractPacket == null) {
|
||||
LogWriter.error("Error: Abstract packet is null for packet ID: " + packetId);
|
||||
return;
|
||||
}
|
||||
|
||||
// Let the packet parse the rest
|
||||
abstractPacket.receiveData(buf, player);
|
||||
|
||||
} catch (IndexOutOfBoundsException e) {
|
||||
LogWriter.error("Error: IndexOutOfBoundsException in handlePacket: " + e.getMessage());
|
||||
} catch (Exception e) {
|
||||
@@ -107,20 +112,31 @@ public final class PacketHandler {
|
||||
}
|
||||
}
|
||||
|
||||
public void sendPacket(AbstractPacket packet, Consumer<FMLProxyPacket> sendFunction) {
|
||||
FMLProxyPacket proxyPacket = packet.generatePacket();
|
||||
if (proxyPacket != null) {
|
||||
sendFunction.accept(proxyPacket);
|
||||
/**
|
||||
* Sends every FMLProxyPacket produced by packet.generatePackets()
|
||||
*/
|
||||
private void sendAllPackets(AbstractPacket packet, SendAction action) {
|
||||
// get all generated FMLProxyPacket objects (could be 1 for normal, or many for large)
|
||||
List<FMLProxyPacket> proxyPackets = packet.generatePackets();
|
||||
if (proxyPackets.isEmpty()) {
|
||||
LogWriter.error("Warning: No packets generated for " + packet.getClass().getName());
|
||||
}
|
||||
|
||||
for (FMLProxyPacket proxy : proxyPackets) {
|
||||
action.send(proxy);
|
||||
}
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------
|
||||
// Public API methods for sending
|
||||
|
||||
public void sendToPlayer(AbstractPacket packet, EntityPlayerMP player) {
|
||||
FMLEventChannel eventChannel = getEventChannel(packet);
|
||||
if (eventChannel == null) {
|
||||
LogWriter.error("Error: Event channel is null for packet: " + packet.getClass().getName());
|
||||
return;
|
||||
}
|
||||
sendPacket(packet, proxyPacket -> eventChannel.sendTo(proxyPacket, player));
|
||||
sendAllPackets(packet, p -> eventChannel.sendTo(p, player));
|
||||
}
|
||||
|
||||
public void sendToServer(AbstractPacket packet) {
|
||||
@@ -129,7 +145,7 @@ public final class PacketHandler {
|
||||
LogWriter.error("Error: Event channel is null for packet: " + packet.getClass().getName());
|
||||
return;
|
||||
}
|
||||
sendPacket(packet, eventChannel::sendToServer);
|
||||
sendAllPackets(packet, eventChannel::sendToServer);
|
||||
}
|
||||
|
||||
public void sendToAll(AbstractPacket packet) {
|
||||
@@ -138,7 +154,7 @@ public final class PacketHandler {
|
||||
LogWriter.error("Error: Event channel is null for packet: " + packet.getClass().getName());
|
||||
return;
|
||||
}
|
||||
sendPacket(packet, eventChannel::sendToAll);
|
||||
sendAllPackets(packet, eventChannel::sendToAll);
|
||||
}
|
||||
|
||||
public void sendToAllAround(AbstractPacket packet, NetworkRegistry.TargetPoint point) {
|
||||
@@ -147,7 +163,7 @@ public final class PacketHandler {
|
||||
LogWriter.error("Error: Event channel is null for packet: " + packet.getClass().getName());
|
||||
return;
|
||||
}
|
||||
sendPacket(packet, proxyPacket -> eventChannel.sendToAllAround(proxyPacket, point));
|
||||
sendAllPackets(packet, p -> eventChannel.sendToAllAround(p, point));
|
||||
}
|
||||
|
||||
public void sendToDimension(AbstractPacket packet, int dimensionId) {
|
||||
@@ -156,6 +172,11 @@ public final class PacketHandler {
|
||||
LogWriter.error("Error: Event channel is null for packet: " + packet.getClass().getName());
|
||||
return;
|
||||
}
|
||||
sendPacket(packet, proxyPacket -> eventChannel.sendToDimension(proxyPacket, dimensionId));
|
||||
sendAllPackets(packet, p -> eventChannel.sendToDimension(p, dimensionId));
|
||||
}
|
||||
|
||||
// Simple functional interface to unify the "send" action
|
||||
private interface SendAction {
|
||||
void send(FMLProxyPacket proxy);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user