Moved all the data packets data to the top class, renamed everything.

Put the dispatcher in the main code and started adding Messages.
This commit is contained in:
ProfMobius committed 2014-03-27 04:11:51 +01:00
1 parent 1ad1413356
commit 96db5c338f
27 files changed
+227 -145

No files matched your search

@@ -38,9 +38,9 @@ import mcp.mobius.opis.data.server.WorldTickProfiler;
import mcp.mobius.opis.events.PlayerTracker;
import mcp.mobius.opis.gui.overlay.OverlayStatus;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.server.Packet_DataList;
import mcp.mobius.opis.network.packets.server.NetDataList;
import mcp.mobius.opis.network.packets.server.Packet_DataOverlayChunkEntities;
import mcp.mobius.opis.network.packets.server.Packet_DataValue;
import mcp.mobius.opis.network.packets.server.NetDataValue;
import mcp.mobius.opis.network.packets.server.Packet_Tickets;
public class ServerMessageHandler {
@@ -63,21 +63,21 @@ public class ServerMessageHandler {
else if (maintype == Message.OVERLAY_CHUNK_TIMING){
ArrayList<StatsChunk> timingChunks = ChunkManager.getTopChunks(100);
OpisPacketHandler.validateAndSend(Packet_DataList.create(Message.LIST_TIMING_CHUNK, timingChunks), (Player)player);
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_CHUNK, timingChunks), (Player)player);
}
else if (maintype == Message.LIST_CHUNK_TILEENTS){
OpisPacketHandler.validateAndSend(Packet_DataList.create(Message.LIST_CHUNK_TILEENTS, TileEntityManager.getTileEntitiesInChunk((CoordinatesChunk)param1)), player);
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_CHUNK_TILEENTS, TileEntityManager.getTileEntitiesInChunk((CoordinatesChunk)param1)), player);
}
else if (maintype == Message.LIST_CHUNK_ENTITIES){
OpisPacketHandler.validateAndSend(Packet_DataList.create(Message.LIST_CHUNK_ENTITIES, EntityManager.getEntitiesInChunk((CoordinatesChunk)param1)), (Player)player);
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_CHUNK_ENTITIES, EntityManager.getEntitiesInChunk((CoordinatesChunk)param1)), (Player)player);
}
else if (maintype == Message.LIST_CHUNK_LOADED){
PlayerTracker.instance().playerOverlayStatus.put(player, OverlayStatus.CHUNKSTATUS);
PlayerTracker.instance().playerDimension.put(player, ((SerialInt)param1).value);
OpisPacketHandler.validateAndSend(Packet_DataList.create(Message.LIST_CHUNK_LOADED, ChunkManager.getLoadedChunks(((SerialInt)param1).value)), player);
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_CHUNK_LOADED, ChunkManager.getLoadedChunks(((SerialInt)param1).value)), player);
}
else if (maintype == Message.LIST_CHUNK_TICKETS){
@@ -87,35 +87,35 @@ public class ServerMessageHandler {
else if (maintype == Message.LIST_TIMING_TILEENTS){
ArrayList<StatsTileEntity> timingTileEnts = TileEntityManager.getTopEntities(100);
SerialDouble totalTime = new SerialDouble(TileEntityManager.getTotalUpdateTime());
OpisPacketHandler.validateAndSend(Packet_DataList.create (Message.LIST_TIMING_TILEENTS, timingTileEnts), (Player)player);
OpisPacketHandler.validateAndSend(Packet_DataValue.create(Message.VALUE_TIMING_TILEENTS, totalTime), (Player)player);
OpisPacketHandler.validateAndSend(NetDataList.create (Message.LIST_TIMING_TILEENTS, timingTileEnts), (Player)player);
OpisPacketHandler.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_TILEENTS, totalTime), (Player)player);
}
else if (maintype == Message.LIST_TIMING_ENTITIES){
ArrayList<StatsEntity> timingEntities = EntityManager.getTopEntities(100);
SerialDouble totalTime = new SerialDouble(EntityManager.getTotalUpdateTime());
OpisPacketHandler.validateAndSend(Packet_DataList.create(Message.LIST_TIMING_ENTITIES, timingEntities), (Player)player);
OpisPacketHandler.validateAndSend(Packet_DataValue.create(Message.VALUE_TIMING_ENTITIES, totalTime), (Player)player);
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_ENTITIES, timingEntities), (Player)player);
OpisPacketHandler.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_ENTITIES, totalTime), (Player)player);
}
else if (maintype == Message.LIST_TIMING_HANDLERS){
ArrayList<StatsTickHandler> timingHandlers = TickHandlerManager.getCumulatedStats();
SerialDouble totalTime = new SerialDouble(TickHandlerManager.getTotalUpdateTime());
OpisPacketHandler.validateAndSend(Packet_DataList.create(Message.LIST_TIMING_HANDLERS, timingHandlers), (Player)player);
OpisPacketHandler.validateAndSend(Packet_DataValue.create(Message.VALUE_TIMING_HANDLERS, totalTime), (Player)player);
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_HANDLERS, timingHandlers), (Player)player);
OpisPacketHandler.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_HANDLERS, totalTime), (Player)player);
}
else if (maintype == Message.LIST_TIMING_CHUNK){
ArrayList<StatsChunk> timingChunks = ChunkManager.getTopChunks(100);
OpisPacketHandler.validateAndSend(Packet_DataList.create(Message.LIST_TIMING_CHUNK, timingChunks), (Player)player);
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_CHUNK, timingChunks), (Player)player);
}
else if (maintype == Message.VALUE_TIMING_WORLDTICK){
OpisPacketHandler.validateAndSend(Packet_DataValue.create(Message.VALUE_TIMING_WORLDTICK, new SerialDouble(GlobalTimingManager.getTotalStats(GlobalTimingManager.worldTickStats))), (Player)player);
OpisPacketHandler.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_WORLDTICK, new SerialDouble(GlobalTimingManager.getTotalStats(GlobalTimingManager.worldTickStats))), (Player)player);
}
else if (maintype == Message.VALUE_TIMING_ENTUPDATE){
OpisPacketHandler.validateAndSend(Packet_DataValue.create(Message.VALUE_TIMING_ENTUPDATE, new SerialDouble(GlobalTimingManager.getTotalStats(GlobalTimingManager.entUpdateStats))), (Player)player);
OpisPacketHandler.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_ENTUPDATE, new SerialDouble(GlobalTimingManager.getTotalStats(GlobalTimingManager.entUpdateStats))), (Player)player);
}
else if (maintype == Message.LIST_AMOUNT_ENTITIES){
@@ -124,7 +124,7 @@ public class ServerMessageHandler {
filtered = PlayerTracker.instance().filteredAmount.get(name);
ArrayList<AmountHolder> ents = EntityManager.getCumulativeEntities(filtered);
OpisPacketHandler.validateAndSend(Packet_DataList.create(Message.LIST_AMOUNT_ENTITIES, ents), (Player)player);
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_AMOUNT_ENTITIES, ents), (Player)player);
}
else if (maintype == Message.COMMAND_FILTERING_TRUE){
@@ -144,12 +144,12 @@ public class ServerMessageHandler {
MetaManager.reset();
modOpis.profilerRun = true;
ProfilerRegistrar.turnOn();
OpisPacketHandler.sendPacketToAllSwing(Packet_DataValue.create(Message.STATUS_START, new SerialInt(modOpis.profilerMaxTicks)));
OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.STATUS_START, new SerialInt(modOpis.profilerMaxTicks)));
}
else if (maintype == Message.COMMAND_TELEPORT_BLOCK){
EntityManager.teleportPlayer((CoordinatesBlock)param1, (EntityPlayerMP)player);
OpisPacketHandler.validateAndSend(Packet_DataValue.create(Message.CLIENT_HIGHLIGHT_BLOCK, param1), (Player)player);
OpisPacketHandler.validateAndSend(NetDataValue.create(Message.CLIENT_HIGHLIGHT_BLOCK, param1), (Player)player);
}
else if (maintype == Message.COMMAND_TELEPORT_TO_ENTITY){
@@ -181,7 +181,7 @@ public class ServerMessageHandler {
}
else if(maintype == Message.STATUS_TIME_LAST_RUN){
OpisPacketHandler.validateAndSend(Packet_DataValue.create(Message.STATUS_TIME_LAST_RUN, new SerialLong(ProfilerRegistrar.timeStampLastRun)), (Player)player);
OpisPacketHandler.validateAndSend(NetDataValue.create(Message.STATUS_TIME_LAST_RUN, new SerialLong(ProfilerRegistrar.timeStampLastRun)), (Player)player);
}
else{