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

+2 -1
View File
@@ -1,7 +1,8 @@
package mcp.mobius.opis.api;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.server.NetDataRaw;
public interface IMessageHandler {
public void handle(Message msg);
public void handleMessage(Message msg, NetDataRaw rawdata);
}
@@ -4,12 +4,14 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.server.NetDataRaw;
public class MessageHandlerRegistrar {
private static MessageHandlerRegistrar _instance = new MessageHandlerRegistrar();
private MessageHandlerRegistrar(){};
public MessageHandlerRegistrar instance(){return this._instance;}
public static MessageHandlerRegistrar instance(){return _instance;}
private HashMap<Message, HashSet<IMessageHandler>> msgHandlers = new HashMap<Message, HashSet<IMessageHandler>>();
@@ -20,9 +22,11 @@ public class MessageHandlerRegistrar {
msgHandlers.get(msg).add(handler);
}
public void routeMessage(Message msg){
public void routeMessage(Message msg, NetDataRaw rawdata){
if (msgHandlers.containsKey(msg))
for (IMessageHandler handler : msgHandlers.get(msg))
handler.handle(msg);
handler.handleMessage(msg, rawdata);
else
modOpis.log.warning(String.format("Unhandled msg : %s", msg));
}
}
@@ -1,7 +1,7 @@
package mcp.mobius.opis.commands.client;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.server.Packet_DataCommand;
import mcp.mobius.opis.network.packets.server.NetDataCommand;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -20,7 +20,7 @@ public class CommandClientShowRenderTick extends CommandBase {
@Override
public void processCommand(ICommandSender icommandsender, String[] astring) {
((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_DataCommand.create(Message.CLIENT_SHOW_RENDER_TICK));
((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(NetDataCommand.create(Message.CLIENT_SHOW_RENDER_TICK));
}
@Override
@@ -1,7 +1,7 @@
package mcp.mobius.opis.commands.client;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.server.Packet_DataCommand;
import mcp.mobius.opis.network.packets.server.NetDataCommand;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -20,7 +20,7 @@ public class CommandClientStart extends CommandBase {
@Override
public void processCommand(ICommandSender icommandsender, String[] astring) {
((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_DataCommand.create(Message.CLIENT_START_PROFILING));
((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(NetDataCommand.create(Message.CLIENT_START_PROFILING));
}
@Override
@@ -8,7 +8,7 @@ import mcp.mobius.opis.events.PlayerTracker;
import mcp.mobius.opis.network.ServerMessageHandler;
import mcp.mobius.opis.network.OpisPacketHandler;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.server.Packet_DataCommand;
import mcp.mobius.opis.network.packets.server.NetDataCommand;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.player.EntityPlayer;
@@ -40,7 +40,7 @@ public class CommandOpis extends CommandBase {
}
PlayerTracker.instance().playersSwing.add((Player)icommandsender);
((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_DataCommand.create(Message.CLIENT_SHOW_SWING));
((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(NetDataCommand.create(Message.CLIENT_SHOW_SWING));
OpisPacketHandler.sendFullUpdate((Player)icommandsender);
}
@@ -10,7 +10,7 @@ import mcp.mobius.opis.data.managers.EntityManager;
import mcp.mobius.opis.events.PlayerTracker;
import mcp.mobius.opis.network.OpisPacketHandler;
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 net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.player.EntityPlayer;
@@ -9,7 +9,7 @@ import mcp.mobius.opis.data.managers.ChunkManager;
import mcp.mobius.opis.events.PlayerTracker;
import mcp.mobius.opis.network.OpisPacketHandler;
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 net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.player.EntityPlayer;
@@ -11,7 +11,7 @@ import mcp.mobius.opis.data.managers.TickHandlerManager;
import mcp.mobius.opis.events.PlayerTracker;
import mcp.mobius.opis.network.OpisPacketHandler;
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 net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -13,7 +13,7 @@ import mcp.mobius.opis.data.managers.TileEntityManager;
import mcp.mobius.opis.events.OpisServerTickHandler;
import mcp.mobius.opis.events.PlayerTracker;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.server.Packet_DataCommand;
import mcp.mobius.opis.network.packets.server.NetDataCommand;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.player.EntityPlayer;
@@ -47,7 +47,7 @@ public class CommandReset extends CommandBase implements IOpisCommand {
icommandsender.sendChatToPlayer(ChatMessageComponent.createFromText(String.format("\u00A7oInternal data reseted.")));
PacketDispatcher.sendPacketToAllPlayers(Packet_DataCommand.create(Message.CLIENT_CLEAR_SELECTION));
PacketDispatcher.sendPacketToAllPlayers(NetDataCommand.create(Message.CLIENT_CLEAR_SELECTION));
}
@Override
@@ -16,7 +16,7 @@ import mcp.mobius.opis.events.OpisServerTickHandler;
import mcp.mobius.opis.events.PlayerTracker;
import mcp.mobius.opis.network.OpisPacketHandler;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.server.Packet_DataValue;
import mcp.mobius.opis.network.packets.server.NetDataValue;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.player.EntityPlayer;
@@ -56,7 +56,7 @@ public class CommandStart extends CommandBase implements IOpisCommand {
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)));
icommandsender.sendChatToPlayer(ChatMessageComponent.createFromText(String.format("\u00A7oOpis started with a tick delay %s.", modOpis.profilerDelay)));
@@ -11,7 +11,7 @@ import mcp.mobius.opis.data.managers.EntityManager;
import mcp.mobius.opis.events.PlayerTracker;
import mcp.mobius.opis.network.OpisPacketHandler;
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 net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.player.EntityPlayer;
@@ -9,7 +9,7 @@ import mcp.mobius.opis.data.managers.TileEntityManager;
import mcp.mobius.opis.events.PlayerTracker;
import mcp.mobius.opis.network.OpisPacketHandler;
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 net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.player.EntityPlayer;
+3 -1
View File
@@ -52,7 +52,7 @@ public class DataCache {
private ArrayList<StatsEntity> timingEntities = new ArrayList<StatsEntity>();
private ArrayList<StatsTileEntity> timingTileEnts = new ArrayList<StatsTileEntity>();
private ArrayList<StatsChunk> timingChunks = new ArrayList<StatsChunk>();
private ArrayList<StatsPlayer> listPlayers = new ArrayList<StatsPlayer>();
//private ArrayList<StatsPlayer> listPlayers = new ArrayList<StatsPlayer>();
private long clockScrew = 0;
@@ -197,6 +197,7 @@ public class DataCache {
this.dataUpdated(table, model, row);
}
/*
public ArrayList<StatsPlayer> getListPlayers(){
return this.listPlayers;
}
@@ -216,6 +217,7 @@ public class DataCache {
this.dataUpdated(table, model, row);
}
*/
private <U> int updateData(JTable table, DefaultTableModel model, ArrayList<U> dataarray, ArrayList<? extends ISerializable> newdata, Class<U> datatype){
int row = table.getSelectedRow();
@@ -30,8 +30,8 @@ import mcp.mobius.opis.data.server.TickProfiler;
import mcp.mobius.opis.gui.overlay.OverlayStatus;
import mcp.mobius.opis.network.OpisPacketHandler;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.server.Packet_DataList;
import mcp.mobius.opis.network.packets.server.Packet_DataValue;
import mcp.mobius.opis.network.packets.server.NetDataList;
import mcp.mobius.opis.network.packets.server.NetDataValue;
import cpw.mods.fml.common.ITickHandler;
import cpw.mods.fml.common.TickType;
import cpw.mods.fml.common.network.PacketDispatcher;
@@ -75,24 +75,24 @@ public class OpisServerTickHandler implements ITickHandler {
if (System.nanoTime() - timer1000 > 1000000000L){
timer1000 = System.nanoTime();
OpisPacketHandler.sendPacketToAllSwing(Packet_DataValue.create(Message.VALUE_AMOUNT_UPLOAD, new SerialLong(PacketProfiler.instance().dataSizeOut)));
OpisPacketHandler.sendPacketToAllSwing(Packet_DataValue.create(Message.VALUE_AMOUNT_DOWNLOAD, new SerialLong(PacketProfiler.instance().dataSizeIn)));
OpisPacketHandler.sendPacketToAllSwing(Packet_DataValue.create(Message.VALUE_CHUNK_FORCED, new SerialInt(ChunkManager.getForcedChunkAmount())));
OpisPacketHandler.sendPacketToAllSwing(Packet_DataValue.create(Message.VALUE_CHUNK_LOADED, new SerialInt(ChunkManager.getLoadedChunkAmount())));
OpisPacketHandler.sendPacketToAllSwing(Packet_DataValue.create(Message.VALUE_TIMING_TICK, TickProfiler.instance().stats));
OpisPacketHandler.sendPacketToAllSwing(Packet_DataValue.create(Message.VALUE_AMOUNT_TILEENTS, new SerialInt(TileEntityManager.getAmountTileEntities())));
OpisPacketHandler.sendPacketToAllSwing(Packet_DataValue.create(Message.VALUE_AMOUNT_ENTITIES, new SerialInt(EntityManager.getAmountEntities())));
OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_AMOUNT_UPLOAD, new SerialLong(PacketProfiler.instance().dataSizeOut)));
OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_AMOUNT_DOWNLOAD, new SerialLong(PacketProfiler.instance().dataSizeIn)));
OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_CHUNK_FORCED, new SerialInt(ChunkManager.getForcedChunkAmount())));
OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_CHUNK_LOADED, new SerialInt(ChunkManager.getLoadedChunkAmount())));
OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_TIMING_TICK, TickProfiler.instance().stats));
OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_AMOUNT_TILEENTS, new SerialInt(TileEntityManager.getAmountTileEntities())));
OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_AMOUNT_ENTITIES, new SerialInt(EntityManager.getAmountEntities())));
OpisPacketHandler.sendPacketToAllSwing(Packet_DataList.create(Message.LIST_PLAYERS, EntityManager.getAllPlayers()));
OpisPacketHandler.sendPacketToAllSwing(NetDataList.create(Message.LIST_PLAYERS, EntityManager.getAllPlayers()));
for (Player player : PlayerTracker.instance().playersSwing){
OpisPacketHandler.validateAndSend(Packet_DataValue.create(Message.STATUS_ACCESS_LEVEL, new SerialInt(PlayerTracker.instance().getPlayerAccessLevel(player).ordinal())), player);
OpisPacketHandler.validateAndSend(NetDataValue.create(Message.STATUS_ACCESS_LEVEL, new SerialInt(PlayerTracker.instance().getPlayerAccessLevel(player).ordinal())), player);
}
if (modOpis.profilerRun){
OpisPacketHandler.sendPacketToAllSwing(Packet_DataValue.create(Message.STATUS_RUNNING, new SerialInt(modOpis.profilerMaxTicks)));
OpisPacketHandler.sendPacketToAllSwing(Packet_DataValue.create(Message.STATUS_RUN_UPDATE, new SerialInt(profilerRunningTicks)));
OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.STATUS_RUNNING, new SerialInt(modOpis.profilerMaxTicks)));
OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.STATUS_RUN_UPDATE, new SerialInt(profilerRunningTicks)));
}
PacketProfiler.instance().dataSizeOut = 0L;
@@ -114,7 +114,7 @@ public class OpisServerTickHandler implements ITickHandler {
modOpis.profilerRun = false;
ProfilerRegistrar.turnOff();
OpisPacketHandler.sendPacketToAllSwing(Packet_DataValue.create(Message.STATUS_STOP, new SerialInt(modOpis.profilerMaxTicks)));
OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.STATUS_STOP, new SerialInt(modOpis.profilerMaxTicks)));
for (Player player : PlayerTracker.instance().playersSwing){
OpisPacketHandler.sendFullUpdate(player);
@@ -145,14 +145,14 @@ public class OpisServerTickHandler implements ITickHandler {
for (Player player : PlayerTracker.instance().playerOverlayStatus.keySet()){
if (PlayerTracker.instance().playerOverlayStatus.get(player) == OverlayStatus.CHUNKSTATUS){
OpisPacketHandler.validateAndSend(Packet_DataList.create(Message.LIST_CHUNK_LOADED, ChunkManager.getLoadedChunks(PlayerTracker.instance().playerDimension.get(player))), player);
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_CHUNK_LOADED, ChunkManager.getLoadedChunks(PlayerTracker.instance().playerDimension.get(player))), player);
}
if (PlayerTracker.instance().playerOverlayStatus.get(player) == OverlayStatus.MEANTIME){
ArrayList<StatsChunk> timingChunks = ChunkManager.getTopChunks(100);
//OpisPacketHandler.validateAndSend(Packet_DataList.create(DataReq.LIST_TIMING_CHUNK, timingChunks), player);
OpisPacketHandler.validateAndSend(Packet_DataList.create(Message.LIST_TIMING_CHUNK, timingChunks), player);
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_CHUNK, timingChunks), player);
}
}
}
@@ -98,9 +98,11 @@ public class ClientMessageHandler {
OverlayMeanTime.instance().setupTable(data);
}
/*
else if (msg == Message.LIST_PLAYERS){
DataCache.instance().setListPlayers(data);
}
}
*/
else if (msg == Message.LIST_CHUNK_LOADED){
ChunkManager.setLoadedChunks(data);
@@ -3,7 +3,7 @@ package mcp.mobius.opis.network;
import mcp.mobius.opis.data.holders.basetypes.SerialLong;
import mcp.mobius.opis.events.PlayerTracker;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.server.Packet_DataValue;
import mcp.mobius.opis.network.packets.server.NetDataValue;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.MemoryConnection;
@@ -18,7 +18,7 @@ public class OpisConnectionHandler implements IConnectionHandler {
@Override
public void playerLoggedIn(Player player, NetHandler netHandler, INetworkManager manager) {
OpisPacketHandler.validateAndSend(Packet_DataValue.create(Message.STATUS_CURRENT_TIME, new SerialLong(System.currentTimeMillis())), player);
OpisPacketHandler.validateAndSend(NetDataValue.create(Message.STATUS_CURRENT_TIME, new SerialLong(System.currentTimeMillis())), player);
if (manager instanceof MemoryConnection){
System.out.printf("Adding SSP player to list of privileged users\n");
+30 -25
View File
@@ -11,6 +11,7 @@ import java.util.logging.Level;
import mapwriter.Mw;
import mcp.mobius.mobiuscore.profiler.ProfilerRegistrar;
import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.api.MessageHandlerRegistrar;
import mcp.mobius.opis.data.client.DataCache;
import mcp.mobius.opis.data.holders.ISerializable;
import mcp.mobius.opis.data.holders.basetypes.AmountHolder;
@@ -41,11 +42,11 @@ import mcp.mobius.opis.network.packets.client.Packet_ReqChunks;
import mcp.mobius.opis.network.packets.client.Packet_ReqData;
import mcp.mobius.opis.network.packets.custom.Packet250Metadata;
import mcp.mobius.opis.network.packets.server.Packet_Chunks;
import mcp.mobius.opis.network.packets.server.Packet_DataCommand;
import mcp.mobius.opis.network.packets.server.Packet_DataAbstract;
import mcp.mobius.opis.network.packets.server.Packet_DataList;
import mcp.mobius.opis.network.packets.server.NetDataCommand;
import mcp.mobius.opis.network.packets.server.NetDataRaw;
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;
import mcp.mobius.opis.swing.SwingUI;
import net.minecraft.entity.player.EntityPlayer;
@@ -103,18 +104,22 @@ public class OpisPacketHandler implements IPacketHandler {
}
else if (header == Packets.CLIENT_CMD){
Packet_DataCommand castedPacket = new Packet_DataCommand(packet);
NetDataCommand castedPacket = new NetDataCommand(packet);
ClientMessageHandler.instance().handle(castedPacket.msg);
}
else if (header == Packets.DATA_LIST_GENERAL){
Packet_DataList castedPacket = new Packet_DataList(packet);
ClientMessageHandler.instance().handle(castedPacket.msg, castedPacket.data);
}
NetDataRaw rawdata = new NetDataList(packet);
MessageHandlerRegistrar.instance().routeMessage(rawdata.msg, rawdata);
//NetDataList castedPacket = new NetDataList(packet);
//ClientMessageHandler.instance().handle(castedPacket.msg, castedPacket.array);
}
else if (header == Packets.DATA_VALUE_GENERAL){
Packet_DataValue castedPacket = new Packet_DataValue(packet);
ClientMessageHandler.instance().handle(castedPacket.msg, castedPacket.data);
NetDataRaw rawdata = new NetDataValue(packet);
MessageHandlerRegistrar.instance().routeMessage(rawdata.msg, rawdata);
//NetDataValue castedPacket = new NetDataValue(packet);
//ClientMessageHandler.instance().handle(castedPacket.msg, castedPacket.value);
}
}
@@ -170,14 +175,14 @@ public class OpisPacketHandler implements IPacketHandler {
}
}
public static void validateAndSend(Packet_DataAbstract capsule, Player player){
public static void validateAndSend(NetDataRaw capsule, Player player){
if (capsule.msg.canPlayerUseCommand(player) && capsule.packet.getPacketSize() < 32000)
PacketDispatcher.sendPacketToPlayer(capsule.packet, player);
else if (capsule.packet.getPacketSize() > 32000)
modOpis.log.warning(String.format("Data packet size of type %s too big : %d ! Dropping !", capsule.msg, capsule.packet.getPacketSize()));
}
public static void sendPacketToAllSwing(Packet_DataAbstract capsule){
public static void sendPacketToAllSwing(NetDataRaw capsule){
for (Player player : PlayerTracker.instance().playersSwing)
OpisPacketHandler.validateAndSend(capsule, player);
}
@@ -204,21 +209,21 @@ public class OpisPacketHandler implements IPacketHandler {
SerialDouble totalWorldTick = new SerialDouble(GlobalTimingManager.getTotalStats(GlobalTimingManager.worldTickStats));
SerialDouble totalEntUpdate = new SerialDouble(GlobalTimingManager.getTotalStats(GlobalTimingManager.entUpdateStats));
OpisPacketHandler.validateAndSend(Packet_DataList.create(Message.LIST_TIMING_HANDLERS, timingHandlers), player);
OpisPacketHandler.validateAndSend(Packet_DataList.create(Message.LIST_TIMING_ENTITIES, timingEntities), player);
OpisPacketHandler.validateAndSend(Packet_DataList.create(Message.LIST_TIMING_TILEENTS, timingTileEnts), player);
OpisPacketHandler.validateAndSend(Packet_DataList.create(Message.LIST_TIMING_CHUNK, timingChunks), player);
OpisPacketHandler.validateAndSend(Packet_DataValue.create(Message.VALUE_TIMING_TILEENTS, totalTimeTE), player);
OpisPacketHandler.validateAndSend(Packet_DataValue.create(Message.VALUE_TIMING_ENTITIES, totalTimeEnt), player);
OpisPacketHandler.validateAndSend(Packet_DataValue.create(Message.VALUE_TIMING_HANDLERS, totalTimeHandler), player);
OpisPacketHandler.validateAndSend(Packet_DataValue.create(Message.VALUE_TIMING_WORLDTICK, totalWorldTick), player);
OpisPacketHandler.validateAndSend(Packet_DataValue.create(Message.VALUE_TIMING_ENTUPDATE, totalEntUpdate), player);
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_HANDLERS, timingHandlers), player);
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_ENTITIES, timingEntities), player);
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_TILEENTS, timingTileEnts), player);
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_CHUNK, timingChunks), player);
OpisPacketHandler.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_TILEENTS, totalTimeTE), player);
OpisPacketHandler.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_ENTITIES, totalTimeEnt), player);
OpisPacketHandler.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_HANDLERS, totalTimeHandler), player);
OpisPacketHandler.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_WORLDTICK, totalWorldTick), player);
OpisPacketHandler.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_ENTUPDATE, totalEntUpdate), player);
OpisPacketHandler.validateAndSend(Packet_DataValue.create(Message.VALUE_AMOUNT_HANDLERS, new SerialInt(TickHandlerManager.startStats.size())), player);
OpisPacketHandler.validateAndSend(NetDataValue.create(Message.VALUE_AMOUNT_HANDLERS, new SerialInt(TickHandlerManager.startStats.size())), player);
OpisPacketHandler.validateAndSend(Packet_DataValue.create(Message.STATUS_TIME_LAST_RUN, new SerialLong(ProfilerRegistrar.timeStampLastRun)), player);
OpisPacketHandler.validateAndSend(NetDataValue.create(Message.STATUS_TIME_LAST_RUN, new SerialLong(ProfilerRegistrar.timeStampLastRun)), player);
OpisPacketHandler.validateAndSend(Packet_DataValue.create(Message.STATUS_ACCESS_LEVEL, new SerialInt(PlayerTracker.instance().getPlayerAccessLevel(player).ordinal())), player);
OpisPacketHandler.validateAndSend(NetDataValue.create(Message.STATUS_ACCESS_LEVEL, new SerialInt(PlayerTracker.instance().getPlayerAccessLevel(player).ordinal())), player);
// This portion is to get the proper filtered amounts depending on the player preferences.
String name = ((EntityPlayer)player).getEntityName();
@@ -229,7 +234,7 @@ public class OpisPacketHandler implements IPacketHandler {
// Here we send a full update to the player
//OpisPacketHandler.validateAndSend(Packet_DataList.create(DataReq.LIST_AMOUNT_ENTITIES, amountEntities), player);
OpisPacketHandler.validateAndSend(Packet_DataList.create(Message.LIST_AMOUNT_ENTITIES, amountEntities), player);
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_AMOUNT_ENTITIES, amountEntities), player);
}
@@ -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{
@@ -10,12 +10,9 @@ import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.enums.Packets;
import net.minecraft.network.packet.Packet250CustomPayload;
public class Packet_DataCommand {
public class NetDataCommand extends NetDataRaw{
public byte header;
public Message msg;
public Packet_DataCommand(Packet250CustomPayload packet) {
public NetDataCommand(Packet250CustomPayload packet) {
DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data));
try{
this.header = inputStream.readByte();
@@ -20,25 +20,29 @@ import mcp.mobius.opis.network.enums.Packets;
import net.minecraft.network.packet.Packet;
import net.minecraft.network.packet.Packet250CustomPayload;
public class Packet_DataList extends Packet_DataAbstract{
public class NetDataList extends NetDataRaw{
public ArrayList<ISerializable> data = new ArrayList<ISerializable>();
//public ArrayList<ISerializable> data = new ArrayList<ISerializable>();
public Packet_DataList() {}
public NetDataList() {}
public Packet_DataList(Packet250CustomPayload packet) {
public NetDataList(Packet250CustomPayload packet) {
DataInputStream istream = new DataInputStream(new ByteArrayInputStream(packet.data));
try{
this.header = istream.readByte();
this.msg = Message.values()[istream.readInt()];
int ndata = istream.readInt();
String datatype = "";
if (ndata > 0)
datatype = Packet.readString(istream, 255);
this.clazzStr = "";
if (ndata > 0){
this.clazzStr = Packet.readString(istream, 255);
this.clazz = this.getClass(this.clazzStr);
}
this.array = new ArrayList<ISerializable>();
for (int i = 0; i < ndata; i++)
data.add(dataRead(datatype, istream));
this.array.add(dataRead(this.clazzStr, istream));
} catch (IOException e){}
}
@@ -56,7 +60,7 @@ public class Packet_DataList extends Packet_DataAbstract{
*/
//public static Packet250Metadata create(DataReq dataReq, ArrayList<? extends ISerializable> stats){
public static Packet_DataList create(Message msg, ArrayList<? extends ISerializable> data){
public static NetDataList create(Message msg, ArrayList<? extends ISerializable> data){
//Packet250Metadata packet = new Packet250Metadata();
Packet250CustomPayload packet = new Packet250CustomPayload();
ByteArrayOutputStream bos = new ByteArrayOutputStream(1);
@@ -81,7 +85,7 @@ public class Packet_DataList extends Packet_DataAbstract{
packet.data = bos.toByteArray();
packet.length = bos.size();
Packet_DataList capsule = new Packet_DataList();
NetDataList capsule = new NetDataList();
capsule.msg = msg;
capsule.header = Packets.DATA_VALUE_GENERAL;
capsule.packet = packet;
@@ -89,16 +93,6 @@ public class Packet_DataList extends Packet_DataAbstract{
return capsule;
}
private ISerializable dataRead(String datatypeStr, DataInputStream istream){
try{
Class datatype = Class.forName(datatypeStr);
Method readFromStream = datatype.getMethod("readFromStream", DataInputStream.class);
return (ISerializable)readFromStream.invoke(null, istream);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
}
@@ -0,0 +1,40 @@
package mcp.mobius.opis.network.packets.server;
import java.io.DataInputStream;
import java.lang.reflect.Method;
import java.util.ArrayList;
import net.minecraft.network.packet.Packet250CustomPayload;
import mcp.mobius.opis.data.holders.ISerializable;
import mcp.mobius.opis.network.enums.Message;
public class NetDataRaw {
public byte header;
public Message msg;
public String clazzStr;
public Class clazz;
public Packet250CustomPayload packet;
public ArrayList<ISerializable> array = null;
public ISerializable value = null;
protected Class getClass(String datatypeStr){
try{
return Class.forName(datatypeStr);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
protected ISerializable dataRead(String datatypeStr, DataInputStream istream){
try{
Class datatype = Class.forName(datatypeStr);
Method readFromStream = datatype.getMethod("readFromStream", DataInputStream.class);
return (ISerializable)readFromStream.invoke(null, istream);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
}
@@ -13,27 +13,25 @@ import mcp.mobius.opis.data.holders.ISerializable;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.enums.Packets;
public class Packet_DataValue extends Packet_DataAbstract{
public class NetDataValue extends NetDataRaw{
public ISerializable data;
public NetDataValue(){};
public Packet_DataValue(){};
public Packet_DataValue(Packet250CustomPayload packet) {
public NetDataValue(Packet250CustomPayload packet) {
DataInputStream istream = new DataInputStream(new ByteArrayInputStream(packet.data));
try{
this.header = istream.readByte();
this.msg = Message.values()[istream.readInt()];
String datatype = "";
datatype = Packet.readString(istream, 255);
data = dataRead(datatype, istream);
this.msg = Message.values()[istream.readInt()];
this.clazzStr = Packet.readString(istream, 255);
this.clazz = this.getClass(this.clazzStr);
this.value = dataRead(this.clazzStr, istream);
} catch (IOException e){}
}
//public static Packet250Metadata create(DataReq dataReq, ISerializable data){
public static Packet_DataValue create(Message dataReq, ISerializable data){
public static NetDataValue create(Message dataReq, ISerializable data){
//Packet250Metadata packet = new Packet250Metadata();
Packet250CustomPayload packet = new Packet250CustomPayload();
ByteArrayOutputStream bos = new ByteArrayOutputStream(1);
@@ -54,24 +52,11 @@ public class Packet_DataValue extends Packet_DataAbstract{
packet.data = bos.toByteArray();
packet.length = bos.size();
Packet_DataValue capsule = new Packet_DataValue();
NetDataValue capsule = new NetDataValue();
capsule.msg = dataReq;
capsule.header = Packets.DATA_VALUE_GENERAL;
capsule.packet = packet;
return capsule;
}
private ISerializable dataRead(String datatypeStr, DataInputStream istream){
try{
Class datatype = Class.forName(datatypeStr);
Method readFromStream = datatype.getMethod("readFromStream", DataInputStream.class);
return (ISerializable)readFromStream.invoke(null, istream);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
}
@@ -1,11 +0,0 @@
package mcp.mobius.opis.network.packets.server;
import net.minecraft.network.packet.Packet250CustomPayload;
import mcp.mobius.opis.network.enums.Message;
public class Packet_DataAbstract {
public byte header;
public Message msg;
public Packet250CustomPayload packet;
}
+6
View File
@@ -9,6 +9,7 @@ import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.util.ResourceLocation;
import mapwriter.api.MwAPI;
import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.api.MessageHandlerRegistrar;
import mcp.mobius.opis.data.holders.stats.StatsChunk;
import mcp.mobius.opis.data.holders.stats.StatsEntity;
import mcp.mobius.opis.data.holders.stats.StatsMod;
@@ -20,6 +21,9 @@ import mcp.mobius.opis.gui.overlay.OverlayLoadedChunks;
import mcp.mobius.opis.gui.overlay.OverlayMeanTime;
import mcp.mobius.opis.gui.overlay.entperchunk.OverlayEntityPerChunk;
import mcp.mobius.opis.gui.screens.ScreenBase;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.swing.SwingUI;
import mcp.mobius.opis.swing.panels.PanelPlayers;
public class ProxyClient extends ProxyServer {
@@ -41,6 +45,8 @@ public class ProxyClient extends ProxyServer {
//fontMC24 = Fonts.createFont(new ResourceLocation("opis", "fonts/Minecraftia.ttf"), 24, true);
//fontMC8 = Fonts.loadSystemFont("Monospace", 12, true, Font.TRUETYPE_FONT | Font.BOLD);
fontMC8 = Fonts.createFont(new ResourceLocation("opis", "fonts/LiberationMono-Bold.ttf"), 14, true);
MessageHandlerRegistrar.instance().registerHandler(Message.LIST_PLAYERS, SwingUI.instance().getPanelPlayers());
}
}
+27 -1
View File
@@ -2,11 +2,18 @@ package mcp.mobius.opis.swing.panels;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import javax.swing.JPanel;
import mcp.mobius.opis.api.IMessageHandler;
import mcp.mobius.opis.data.holders.ISerializable;
import mcp.mobius.opis.data.holders.stats.StatsPlayer;
import mcp.mobius.opis.network.enums.AccessLevel;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.server.NetDataRaw;
import mcp.mobius.opis.swing.widgets.JButtonAccess;
import mcp.mobius.opis.swing.widgets.JPanelMsgHandler;
import net.miginfocom.swing.MigLayout;
import javax.swing.JButton;
@@ -16,7 +23,7 @@ import javax.swing.JTable;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.DefaultTableModel;
public class PanelPlayers extends JPanel implements ActionListener{
public class PanelPlayers extends JPanelMsgHandler implements ActionListener{
private JTable table;
private JButtonAccess btnCenter;
private JButtonAccess btnTeleport;
@@ -88,4 +95,23 @@ public class PanelPlayers extends JPanel implements ActionListener{
@Override
public void actionPerformed(ActionEvent e) {}
@Override
public void handleMessage(Message msg, NetDataRaw rawdata) {
if (msg == Message.LIST_PLAYERS){
DefaultTableModel model = (DefaultTableModel)this.getTable().getModel();
int row = this.updateData(table, model, StatsPlayer.class);
for (Object o : rawdata.array){
StatsPlayer player = (StatsPlayer)o;
model.addRow(new Object[] {
player.getName(),
player.getCoordinates().dim,
String.format("[ %4d %4d %4d ]", player.getCoordinates().x, player.getCoordinates().y, player.getCoordinates().z),
});
}
this.dataUpdated(table, model, row);
}
}
}
@@ -26,7 +26,7 @@ public class PanelTimingHandlers extends JPanel implements ActionListener{
private JTable table;
private JButtonAccess btnRun;
private JLabel lblSummary;
/**
* Create the panel.
*/
@@ -0,0 +1,31 @@
package mcp.mobius.opis.swing.widgets;
import javax.swing.JPanel;
import javax.swing.JTable;
import javax.swing.table.DefaultTableModel;
import mcp.mobius.opis.api.IMessageHandler;
public abstract class JPanelMsgHandler extends JPanel implements IMessageHandler {
protected <U> int updateData(JTable table, DefaultTableModel model, Class<U> datatype){
int row = table.getSelectedRow();
if (model.getRowCount() > 0)
for (int i = model.getRowCount() - 1; i >= 0; i--)
model.removeRow(i);
return row;
}
protected void dataUpdated(JTable table, DefaultTableModel model, int row){
model.fireTableDataChanged();
try{
table.setRowSelectionInterval(row, row);
} catch (IllegalArgumentException e ){
}
}
}