mirror of
https://github.com/GTNewHorizons/Opis.git
synced 2026-11-17 02:55:20 +00:00
Refactoring of client side packet handling.
It is using the same enum and same generic design as the server side.
This commit is contained in:
1 parent
3f8fcac81c
commit
dcbc5e2f59
15 files changed
+265
-257
No files matched your search
@@ -1,7 +1,7 @@
|
||||
package mcp.mobius.opis.commands.client;
|
||||
|
||||
import mcp.mobius.opis.network.enums.ClientCommand;
|
||||
import mcp.mobius.opis.network.packets.server.Packet_ClientCommand;
|
||||
import mcp.mobius.opis.network.enums.Message;
|
||||
import mcp.mobius.opis.network.packets.server.Packet_DataCommand;
|
||||
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_ClientCommand.create(ClientCommand.SHOW_RENDER_TICK));
|
||||
((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_DataCommand.create(Message.CLIENT_SHOW_RENDER_TICK));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package mcp.mobius.opis.commands.client;
|
||||
|
||||
import mcp.mobius.opis.network.enums.ClientCommand;
|
||||
import mcp.mobius.opis.network.packets.server.Packet_ClientCommand;
|
||||
import mcp.mobius.opis.network.enums.Message;
|
||||
import mcp.mobius.opis.network.packets.server.Packet_DataCommand;
|
||||
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_ClientCommand.create(ClientCommand.START_PROFILING));
|
||||
((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_DataCommand.create(Message.CLIENT_START_PROFILING));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -5,11 +5,10 @@ import javax.swing.JLabel;
|
||||
|
||||
import cpw.mods.fml.common.network.Player;
|
||||
import mcp.mobius.opis.events.PlayerTracker;
|
||||
import mcp.mobius.opis.network.MessageHandler;
|
||||
import mcp.mobius.opis.network.ServerMessageHandler;
|
||||
import mcp.mobius.opis.network.OpisPacketHandler;
|
||||
import mcp.mobius.opis.network.enums.ClientCommand;
|
||||
import mcp.mobius.opis.network.enums.Message;
|
||||
import mcp.mobius.opis.network.packets.server.Packet_ClientCommand;
|
||||
import mcp.mobius.opis.network.packets.server.Packet_DataCommand;
|
||||
import net.minecraft.command.CommandBase;
|
||||
import net.minecraft.command.ICommandSender;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -41,7 +40,7 @@ public class CommandOpis extends CommandBase {
|
||||
}
|
||||
|
||||
PlayerTracker.instance().playersSwing.add((Player)icommandsender);
|
||||
((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_ClientCommand.create(ClientCommand.SHOW_SWING));
|
||||
((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_DataCommand.create(Message.CLIENT_SHOW_SWING));
|
||||
OpisPacketHandler.sendFullUpdate((Player)icommandsender);
|
||||
}
|
||||
|
||||
|
||||
@@ -12,8 +12,8 @@ import mcp.mobius.opis.data.managers.TickHandlerManager;
|
||||
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.ClientCommand;
|
||||
import mcp.mobius.opis.network.packets.server.Packet_ClientCommand;
|
||||
import mcp.mobius.opis.network.enums.Message;
|
||||
import mcp.mobius.opis.network.packets.server.Packet_DataCommand;
|
||||
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_ClientCommand.create(ClientCommand.CLEAR_SELECTION));
|
||||
PacketDispatcher.sendPacketToAllPlayers(Packet_DataCommand.create(Message.CLIENT_CLEAR_SELECTION));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -67,7 +67,7 @@ import cpw.mods.fml.common.registry.LanguageRegistry;
|
||||
import cpw.mods.fml.common.registry.TickRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
|
||||
@Mod(modid="Opis", name="Opis", version="1.2.0_dev3_alpha")
|
||||
@Mod(modid="Opis", name="Opis", version="1.2.1_dev1_alpha")
|
||||
@NetworkMod(channels={"Opis", "Opis_Chunk"},clientSideRequired=false, serverSideRequired=false, connectionHandler=OpisConnectionHandler.class, packetHandler=OpisPacketHandler.class)
|
||||
|
||||
public class modOpis {
|
||||
|
||||
@@ -1,58 +0,0 @@
|
||||
package mcp.mobius.opis.network;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.logging.Level;
|
||||
|
||||
import javax.swing.event.TableModelEvent;
|
||||
import javax.swing.table.DefaultTableModel;
|
||||
|
||||
import cpw.mods.fml.common.network.PacketDispatcher;
|
||||
import mcp.mobius.mobiuscore.profiler.ProfilerRegistrar;
|
||||
import mcp.mobius.opis.modOpis;
|
||||
import mcp.mobius.opis.data.client.DataCache;
|
||||
import mcp.mobius.opis.data.client.TickHandlerClientProfiler;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsTickHandler;
|
||||
import mcp.mobius.opis.data.managers.MetaManager;
|
||||
import mcp.mobius.opis.data.managers.TickHandlerManager;
|
||||
import mcp.mobius.opis.events.OpisClientTickHandler;
|
||||
import mcp.mobius.opis.network.enums.ClientCommand;
|
||||
import mcp.mobius.opis.network.enums.Message;
|
||||
import mcp.mobius.opis.network.packets.client.Packet_ReqData;
|
||||
import mcp.mobius.opis.swing.SwingUI;
|
||||
|
||||
public class ClientCommandHandler {
|
||||
|
||||
private static ClientCommandHandler _instance;
|
||||
private ClientCommandHandler(){}
|
||||
|
||||
public static ClientCommandHandler instance(){
|
||||
if(_instance == null)
|
||||
_instance = new ClientCommandHandler();
|
||||
return _instance;
|
||||
}
|
||||
|
||||
public void handle(ClientCommand cmd){
|
||||
if (cmd == ClientCommand.START_PROFILING){
|
||||
modOpis.log.log(Level.INFO, "Started profiling");
|
||||
|
||||
MetaManager.reset();
|
||||
modOpis.profilerRun = true;
|
||||
ProfilerRegistrar.turnOn();
|
||||
}
|
||||
else if (cmd == ClientCommand.SHOW_RENDER_TICK){
|
||||
modOpis.log.log(Level.INFO, "=== RENDER TICK ===");
|
||||
ArrayList<StatsTickHandler> stats = TickHandlerManager.getCumulatedStats();
|
||||
for (StatsTickHandler stat : stats){
|
||||
System.out.printf("%s \n", stat);
|
||||
}
|
||||
}
|
||||
|
||||
else if (cmd == ClientCommand.SHOW_SWING){
|
||||
SwingUI.instance().showUI();
|
||||
}
|
||||
|
||||
else if (cmd == ClientCommand.CLEAR_SELECTION){
|
||||
modOpis.selectedBlock = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,213 @@
|
||||
package mcp.mobius.opis.network;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.logging.Level;
|
||||
|
||||
import javax.swing.event.TableModelEvent;
|
||||
import javax.swing.table.DefaultTableModel;
|
||||
|
||||
import cpw.mods.fml.common.network.PacketDispatcher;
|
||||
import mcp.mobius.mobiuscore.profiler.ProfilerRegistrar;
|
||||
import mcp.mobius.opis.modOpis;
|
||||
import mcp.mobius.opis.data.client.DataCache;
|
||||
import mcp.mobius.opis.data.client.TickHandlerClientProfiler;
|
||||
import mcp.mobius.opis.data.holders.ISerializable;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsTickHandler;
|
||||
import mcp.mobius.opis.data.managers.ChunkManager;
|
||||
import mcp.mobius.opis.data.managers.MetaManager;
|
||||
import mcp.mobius.opis.data.managers.TickHandlerManager;
|
||||
import mcp.mobius.opis.events.OpisClientTickHandler;
|
||||
import mcp.mobius.opis.gui.overlay.OverlayMeanTime;
|
||||
import mcp.mobius.opis.gui.overlay.entperchunk.OverlayEntityPerChunk;
|
||||
import mcp.mobius.opis.network.enums.Message;
|
||||
import mcp.mobius.opis.network.packets.client.Packet_ReqData;
|
||||
import mcp.mobius.opis.swing.SwingUI;
|
||||
import mcp.mobius.opis.data.holders.basetypes.AmountHolder;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
|
||||
import mcp.mobius.opis.data.holders.basetypes.SerialDouble;
|
||||
import mcp.mobius.opis.data.holders.basetypes.SerialInt;
|
||||
import mcp.mobius.opis.data.holders.basetypes.SerialLong;
|
||||
import mcp.mobius.opis.data.holders.basetypes.TicketData;
|
||||
import mcp.mobius.opis.network.enums.AccessLevel;
|
||||
import mcp.mobius.opis.network.enums.Message;
|
||||
import mcp.mobius.opis.network.enums.Packets;
|
||||
|
||||
public class ClientMessageHandler {
|
||||
|
||||
private static ClientMessageHandler _instance;
|
||||
private ClientMessageHandler(){}
|
||||
|
||||
public static ClientMessageHandler instance(){
|
||||
if(_instance == null)
|
||||
_instance = new ClientMessageHandler();
|
||||
return _instance;
|
||||
}
|
||||
|
||||
public void handle(Message cmd){
|
||||
if (cmd == Message.CLIENT_START_PROFILING){
|
||||
modOpis.log.log(Level.INFO, "Started profiling");
|
||||
|
||||
MetaManager.reset();
|
||||
modOpis.profilerRun = true;
|
||||
ProfilerRegistrar.turnOn();
|
||||
}
|
||||
else if (cmd == Message.CLIENT_SHOW_RENDER_TICK){
|
||||
modOpis.log.log(Level.INFO, "=== RENDER TICK ===");
|
||||
ArrayList<StatsTickHandler> stats = TickHandlerManager.getCumulatedStats();
|
||||
for (StatsTickHandler stat : stats){
|
||||
System.out.printf("%s \n", stat);
|
||||
}
|
||||
}
|
||||
|
||||
else if (cmd == Message.CLIENT_SHOW_SWING){
|
||||
SwingUI.instance().showUI();
|
||||
}
|
||||
|
||||
else if (cmd == Message.CLIENT_CLEAR_SELECTION){
|
||||
modOpis.selectedBlock = null;
|
||||
}
|
||||
}
|
||||
|
||||
public void handle(Message msg, ArrayList<ISerializable> data){
|
||||
|
||||
if (msg == Message.LIST_TIMING_TILEENTS)
|
||||
DataCache.instance().setTimingTileEnts(data);
|
||||
|
||||
else if (msg == Message.LIST_TIMING_ENTITIES)
|
||||
DataCache.instance().setTimingEntities(data);
|
||||
|
||||
else if (msg == Message.LIST_TIMING_HANDLERS)
|
||||
DataCache.instance().setTimingHandlers(data);
|
||||
|
||||
else if (msg == Message.LIST_TIMING_CHUNK){
|
||||
DataCache.instance().setTimingChunks(data);
|
||||
ChunkManager.setChunkMeanTime(data);
|
||||
}
|
||||
|
||||
else if (msg == Message.LIST_AMOUNT_ENTITIES)
|
||||
DataCache.instance().setAmountEntities(data);
|
||||
|
||||
else if (msg == Message.LIST_CHUNK_ENTITIES){
|
||||
OverlayEntityPerChunk.instance().setEntStats(data);
|
||||
OverlayEntityPerChunk.instance().setupEntTable();
|
||||
}
|
||||
else if (msg == Message.LIST_CHUNK_TILEENTS){
|
||||
OverlayMeanTime.instance().setupTable(data);
|
||||
}
|
||||
|
||||
else if (msg == Message.LIST_PLAYERS){
|
||||
DataCache.instance().setListPlayers(data);
|
||||
}
|
||||
}
|
||||
|
||||
public void handle(Message msg, ISerializable data){
|
||||
if (msg == Message.VALUE_TIMING_TILEENTS)
|
||||
DataCache.instance().setTimingTileEntsTotal(((SerialDouble)data).value);
|
||||
|
||||
else if (msg == Message.VALUE_TIMING_ENTITIES)
|
||||
DataCache.instance().setTimingEntitiesTotal(((SerialDouble)data).value);
|
||||
|
||||
else if (msg == Message.VALUE_TIMING_HANDLERS)
|
||||
DataCache.instance().setTimingHandlersTotal(((SerialDouble)data).value);
|
||||
|
||||
else if (msg == Message.VALUE_TIMING_WORLDTICK)
|
||||
DataCache.instance().setTimingWorldTickTotal(((SerialDouble)data).value);
|
||||
|
||||
else if (msg == Message.VALUE_TIMING_ENTUPDATE)
|
||||
DataCache.instance().setTimingEntUpdateTotal(((SerialDouble)data).value);
|
||||
|
||||
else if (msg == Message.VALUE_AMOUNT_TILEENTS)
|
||||
DataCache.instance().setAmountTileEntsTotal(((SerialInt)data).value);
|
||||
|
||||
else if (msg == Message.VALUE_AMOUNT_ENTITIES)
|
||||
DataCache.instance().setAmountEntitiesTotal(((SerialInt)data).value);
|
||||
|
||||
else if (msg == Message.VALUE_AMOUNT_HANDLERS)
|
||||
DataCache.instance().setAmountHandlersTotal(((SerialInt)data).value);
|
||||
|
||||
else if (msg == Message.VALUE_TIMING_TICK)
|
||||
DataCache.instance().setTimingTick(data);
|
||||
|
||||
else if (msg == Message.VALUE_AMOUNT_UPLOAD)
|
||||
DataCache.instance().setAmountUpload(((SerialLong)data).value);
|
||||
|
||||
else if (msg == Message.VALUE_AMOUNT_DOWNLOAD)
|
||||
DataCache.instance().setAmountDownload(((SerialLong)data).value);
|
||||
|
||||
else if (msg == Message.STATUS_START){
|
||||
SwingUI.instance().getBtnTimingChunkRefresh().setText("Running...");
|
||||
SwingUI.instance().getBtnSummaryRefresh().setText("Running...");
|
||||
SwingUI.instance().getBtnTimingEntRefresh().setText("Running...");
|
||||
SwingUI.instance().getBtnTimingHandlerRefresh().setText("Running...");
|
||||
SwingUI.instance().getBtnTimingTERefresh().setText("Running...");
|
||||
|
||||
SwingUI.instance().getProgBarSummaryOpis().setValue(0);
|
||||
SwingUI.instance().getProgBarSummaryOpis().setMinimum(0);
|
||||
SwingUI.instance().getProgBarSummaryOpis().setMaximum(((SerialInt)data).value);
|
||||
}
|
||||
|
||||
else if (msg == Message.STATUS_STOP){
|
||||
SwingUI.instance().getBtnTimingChunkRefresh().setText("Run Opis");
|
||||
SwingUI.instance().getBtnSummaryRefresh().setText("Run Opis");
|
||||
SwingUI.instance().getBtnTimingEntRefresh().setText("Run Opis");
|
||||
SwingUI.instance().getBtnTimingHandlerRefresh().setText("Run Opis");
|
||||
SwingUI.instance().getBtnTimingTERefresh().setText("Run Opis");
|
||||
|
||||
SwingUI.instance().getProgBarSummaryOpis().setValue(((SerialInt)data).value);
|
||||
SwingUI.instance().getProgBarSummaryOpis().setMinimum(0);
|
||||
SwingUI.instance().getProgBarSummaryOpis().setMaximum(((SerialInt)data).value);
|
||||
}
|
||||
|
||||
else if (msg == Message.STATUS_RUN_UPDATE){
|
||||
SwingUI.instance().getProgBarSummaryOpis().setValue(((SerialInt)data).value);
|
||||
}
|
||||
|
||||
else if (msg == Message.STATUS_RUNNING){
|
||||
SwingUI.instance().getBtnTimingChunkRefresh().setText("Running...");
|
||||
SwingUI.instance().getBtnSummaryRefresh().setText("Running...");
|
||||
SwingUI.instance().getBtnTimingEntRefresh().setText("Running...");
|
||||
SwingUI.instance().getBtnTimingHandlerRefresh().setText("Running...");
|
||||
SwingUI.instance().getBtnTimingTERefresh().setText("Running...");
|
||||
|
||||
SwingUI.instance().getProgBarSummaryOpis().setMaximum(((SerialInt)data).value);
|
||||
}
|
||||
|
||||
else if (msg == Message.STATUS_CURRENT_TIME){
|
||||
DataCache.instance().computeClockScrew(((SerialLong)data).value);
|
||||
}
|
||||
|
||||
else if (msg == Message.STATUS_TIME_LAST_RUN){
|
||||
long serverLastRun = ((SerialLong)data).value;
|
||||
if (serverLastRun == 0){
|
||||
SwingUI.instance().getLblSummaryTimeStampLastRun().setText("Last run : <Never>");
|
||||
} else {
|
||||
long clientLastRun = serverLastRun + DataCache.instance().getClockScrew();
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
Date resultdate = new Date(clientLastRun);
|
||||
|
||||
SwingUI.instance().getLblSummaryTimeStampLastRun().setText(String.format("Last run : %s", sdf.format(resultdate)));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
else if(msg == Message.STATUS_ACCESS_LEVEL){
|
||||
DataCache.instance().setAccessLevel( AccessLevel.values()[((SerialInt)data).value] );
|
||||
}
|
||||
|
||||
else if(msg == Message.CLIENT_HIGHLIGHT_BLOCK){
|
||||
modOpis.selectedBlock = (CoordinatesBlock)data;
|
||||
SwingUI.instance().getBtnTimingTERemoveHighlight().setEnabled(true);
|
||||
}
|
||||
|
||||
else if(msg == Message.VALUE_CHUNK_FORCED){
|
||||
SwingUI.instance().getLblSummaryForcedChunks().setText(String.valueOf(((SerialInt)data).value));
|
||||
}
|
||||
|
||||
else if(msg == Message.VALUE_CHUNK_LOADED){
|
||||
SwingUI.instance().getLblSummaryLoadedChunks().setText(String.valueOf(((SerialInt)data).value));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -41,7 +41,7 @@ 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_ClientCommand;
|
||||
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.Packet_DataOverlayChunkEntities;
|
||||
@@ -89,13 +89,6 @@ public class OpisPacketHandler implements IPacketHandler {
|
||||
ChunkManager.chunksLoad = castedPacket.chunkStatus;
|
||||
}
|
||||
|
||||
/*
|
||||
else if (header == Packets.MEANTIME){
|
||||
Packet_MeanTime castedPacket = new Packet_MeanTime(packet);
|
||||
ChunkManager.chunkMeanTime = castedPacket.chunkStatus;
|
||||
}
|
||||
*/
|
||||
|
||||
else if (header == Packets.TICKETS){
|
||||
Packet_Tickets castedPacket = new Packet_Tickets(packet);
|
||||
OverlayLoadedChunks.instance().setupTable(castedPacket.tickets);
|
||||
@@ -115,152 +108,18 @@ public class OpisPacketHandler implements IPacketHandler {
|
||||
}
|
||||
|
||||
else if (header == Packets.CLIENT_CMD){
|
||||
Packet_ClientCommand castedPacket = new Packet_ClientCommand(packet);
|
||||
ClientCommandHandler.instance().handle(castedPacket.cmd);
|
||||
Packet_DataCommand castedPacket = new Packet_DataCommand(packet);
|
||||
ClientMessageHandler.instance().handle(castedPacket.msg);
|
||||
}
|
||||
|
||||
else if (header == Packets.DATA_LIST_GENERAL){
|
||||
Packet_DataList castedPacket = new Packet_DataList(packet);
|
||||
|
||||
if (castedPacket.dataReq == Message.LIST_TIMING_TILEENTS)
|
||||
DataCache.instance().setTimingTileEnts(castedPacket.data);
|
||||
|
||||
else if (castedPacket.dataReq == Message.LIST_TIMING_ENTITIES)
|
||||
DataCache.instance().setTimingEntities(castedPacket.data);
|
||||
|
||||
else if (castedPacket.dataReq == Message.LIST_TIMING_HANDLERS)
|
||||
DataCache.instance().setTimingHandlers(castedPacket.data);
|
||||
|
||||
else if (castedPacket.dataReq == Message.LIST_TIMING_CHUNK){
|
||||
DataCache.instance().setTimingChunks(castedPacket.data);
|
||||
ChunkManager.setChunkMeanTime(castedPacket.data);
|
||||
}
|
||||
|
||||
else if (castedPacket.dataReq == Message.LIST_AMOUNT_ENTITIES)
|
||||
DataCache.instance().setAmountEntities(castedPacket.data);
|
||||
|
||||
else if (castedPacket.dataReq == Message.LIST_CHUNK_ENTITIES){
|
||||
OverlayEntityPerChunk.instance().setEntStats(castedPacket.data);
|
||||
OverlayEntityPerChunk.instance().setupEntTable();
|
||||
}
|
||||
else if (castedPacket.dataReq == Message.LIST_CHUNK_TILEENTS){
|
||||
OverlayMeanTime.instance().setupTable(castedPacket.data);
|
||||
}
|
||||
|
||||
else if (castedPacket.dataReq == Message.LIST_PLAYERS){
|
||||
DataCache.instance().setListPlayers(castedPacket.data);
|
||||
}
|
||||
|
||||
ClientMessageHandler.instance().handle(castedPacket.msg, castedPacket.data);
|
||||
}
|
||||
|
||||
else if (header == Packets.DATA_VALUE_GENERAL){
|
||||
Packet_DataValue castedPacket = new Packet_DataValue(packet);
|
||||
|
||||
if (castedPacket.dataReq == Message.VALUE_TIMING_TILEENTS)
|
||||
DataCache.instance().setTimingTileEntsTotal(((SerialDouble)castedPacket.data).value);
|
||||
|
||||
else if (castedPacket.dataReq == Message.VALUE_TIMING_ENTITIES)
|
||||
DataCache.instance().setTimingEntitiesTotal(((SerialDouble)castedPacket.data).value);
|
||||
|
||||
else if (castedPacket.dataReq == Message.VALUE_TIMING_HANDLERS)
|
||||
DataCache.instance().setTimingHandlersTotal(((SerialDouble)castedPacket.data).value);
|
||||
|
||||
else if (castedPacket.dataReq == Message.VALUE_TIMING_WORLDTICK)
|
||||
DataCache.instance().setTimingWorldTickTotal(((SerialDouble)castedPacket.data).value);
|
||||
|
||||
else if (castedPacket.dataReq == Message.VALUE_TIMING_ENTUPDATE)
|
||||
DataCache.instance().setTimingEntUpdateTotal(((SerialDouble)castedPacket.data).value);
|
||||
|
||||
else if (castedPacket.dataReq == Message.VALUE_AMOUNT_TILEENTS)
|
||||
DataCache.instance().setAmountTileEntsTotal(((SerialInt)castedPacket.data).value);
|
||||
|
||||
else if (castedPacket.dataReq == Message.VALUE_AMOUNT_ENTITIES)
|
||||
DataCache.instance().setAmountEntitiesTotal(((SerialInt)castedPacket.data).value);
|
||||
|
||||
else if (castedPacket.dataReq == Message.VALUE_AMOUNT_HANDLERS)
|
||||
DataCache.instance().setAmountHandlersTotal(((SerialInt)castedPacket.data).value);
|
||||
|
||||
else if (castedPacket.dataReq == Message.VALUE_TIMING_TICK)
|
||||
DataCache.instance().setTimingTick(castedPacket.data);
|
||||
|
||||
else if (castedPacket.dataReq == Message.VALUE_AMOUNT_UPLOAD)
|
||||
DataCache.instance().setAmountUpload(((SerialLong)castedPacket.data).value);
|
||||
|
||||
else if (castedPacket.dataReq == Message.VALUE_AMOUNT_DOWNLOAD)
|
||||
DataCache.instance().setAmountDownload(((SerialLong)castedPacket.data).value);
|
||||
|
||||
else if (castedPacket.dataReq == Message.STATUS_START){
|
||||
SwingUI.instance().getBtnTimingChunkRefresh().setText("Running...");
|
||||
SwingUI.instance().getBtnSummaryRefresh().setText("Running...");
|
||||
SwingUI.instance().getBtnTimingEntRefresh().setText("Running...");
|
||||
SwingUI.instance().getBtnTimingHandlerRefresh().setText("Running...");
|
||||
SwingUI.instance().getBtnTimingTERefresh().setText("Running...");
|
||||
|
||||
SwingUI.instance().getProgBarSummaryOpis().setValue(0);
|
||||
SwingUI.instance().getProgBarSummaryOpis().setMinimum(0);
|
||||
SwingUI.instance().getProgBarSummaryOpis().setMaximum(((SerialInt)castedPacket.data).value);
|
||||
}
|
||||
|
||||
else if (castedPacket.dataReq == Message.STATUS_STOP){
|
||||
SwingUI.instance().getBtnTimingChunkRefresh().setText("Run Opis");
|
||||
SwingUI.instance().getBtnSummaryRefresh().setText("Run Opis");
|
||||
SwingUI.instance().getBtnTimingEntRefresh().setText("Run Opis");
|
||||
SwingUI.instance().getBtnTimingHandlerRefresh().setText("Run Opis");
|
||||
SwingUI.instance().getBtnTimingTERefresh().setText("Run Opis");
|
||||
|
||||
SwingUI.instance().getProgBarSummaryOpis().setValue(((SerialInt)castedPacket.data).value);
|
||||
SwingUI.instance().getProgBarSummaryOpis().setMinimum(0);
|
||||
SwingUI.instance().getProgBarSummaryOpis().setMaximum(((SerialInt)castedPacket.data).value);
|
||||
}
|
||||
|
||||
else if (castedPacket.dataReq == Message.STATUS_RUN_UPDATE){
|
||||
SwingUI.instance().getProgBarSummaryOpis().setValue(((SerialInt)castedPacket.data).value);
|
||||
}
|
||||
|
||||
else if (castedPacket.dataReq == Message.STATUS_RUNNING){
|
||||
SwingUI.instance().getBtnTimingChunkRefresh().setText("Running...");
|
||||
SwingUI.instance().getBtnSummaryRefresh().setText("Running...");
|
||||
SwingUI.instance().getBtnTimingEntRefresh().setText("Running...");
|
||||
SwingUI.instance().getBtnTimingHandlerRefresh().setText("Running...");
|
||||
SwingUI.instance().getBtnTimingTERefresh().setText("Running...");
|
||||
|
||||
SwingUI.instance().getProgBarSummaryOpis().setMaximum(((SerialInt)castedPacket.data).value);
|
||||
}
|
||||
|
||||
else if (castedPacket.dataReq == Message.STATUS_CURRENT_TIME){
|
||||
DataCache.instance().computeClockScrew(((SerialLong)castedPacket.data).value);
|
||||
}
|
||||
|
||||
else if (castedPacket.dataReq == Message.STATUS_TIME_LAST_RUN){
|
||||
long serverLastRun = ((SerialLong)castedPacket.data).value;
|
||||
if (serverLastRun == 0){
|
||||
SwingUI.instance().getLblSummaryTimeStampLastRun().setText("Last run : <Never>");
|
||||
} else {
|
||||
long clientLastRun = serverLastRun + DataCache.instance().getClockScrew();
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
Date resultdate = new Date(clientLastRun);
|
||||
|
||||
SwingUI.instance().getLblSummaryTimeStampLastRun().setText(String.format("Last run : %s", sdf.format(resultdate)));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
else if(castedPacket.dataReq == Message.STATUS_ACCESS_LEVEL){
|
||||
DataCache.instance().setAccessLevel( AccessLevel.values()[((SerialInt)castedPacket.data).value] );
|
||||
}
|
||||
|
||||
else if(castedPacket.dataReq == Message.CLIENT_HIGHLIGHT_BLOCK){
|
||||
modOpis.selectedBlock = (CoordinatesBlock)castedPacket.data;
|
||||
SwingUI.instance().getBtnTimingTERemoveHighlight().setEnabled(true);
|
||||
}
|
||||
|
||||
else if(castedPacket.dataReq == Message.VALUE_CHUNK_FORCED){
|
||||
SwingUI.instance().getLblSummaryForcedChunks().setText(String.valueOf(((SerialInt)castedPacket.data).value));
|
||||
}
|
||||
|
||||
else if(castedPacket.dataReq == Message.VALUE_CHUNK_LOADED){
|
||||
SwingUI.instance().getLblSummaryLoadedChunks().setText(String.valueOf(((SerialInt)castedPacket.data).value));
|
||||
}
|
||||
ClientMessageHandler.instance().handle(castedPacket.msg, castedPacket.data);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -296,7 +155,7 @@ public class OpisPacketHandler implements IPacketHandler {
|
||||
|
||||
if (castedPacket.dataReq.canPlayerUseCommand(player)){
|
||||
logmsg += "Accepted";
|
||||
MessageHandler.instance().handle(castedPacket.dataReq, castedPacket.param1, castedPacket.param2, player);
|
||||
ServerMessageHandler.instance().handle(castedPacket.dataReq, castedPacket.param1, castedPacket.param2, player);
|
||||
} else {
|
||||
logmsg += "Rejected";
|
||||
}
|
||||
@@ -317,7 +176,7 @@ public class OpisPacketHandler implements IPacketHandler {
|
||||
}
|
||||
|
||||
public static void validateAndSend(Packet_DataAbstract capsule, Player player){
|
||||
if (capsule.dataReq.canPlayerUseCommand(player))
|
||||
if (capsule.msg.canPlayerUseCommand(player))
|
||||
PacketDispatcher.sendPacketToPlayer(capsule.packet, player);
|
||||
}
|
||||
|
||||
|
||||
+5
-5
@@ -44,14 +44,14 @@ import mcp.mobius.opis.network.packets.server.Packet_DataValue;
|
||||
import mcp.mobius.opis.network.packets.server.Packet_LoadedChunks;
|
||||
import mcp.mobius.opis.network.packets.server.Packet_Tickets;
|
||||
|
||||
public class MessageHandler {
|
||||
public class ServerMessageHandler {
|
||||
|
||||
private static MessageHandler _instance;
|
||||
private MessageHandler(){}
|
||||
private static ServerMessageHandler _instance;
|
||||
private ServerMessageHandler(){}
|
||||
|
||||
public static MessageHandler instance(){
|
||||
public static ServerMessageHandler instance(){
|
||||
if(_instance == null)
|
||||
_instance = new MessageHandler();
|
||||
_instance = new ServerMessageHandler();
|
||||
return _instance;
|
||||
}
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
package mcp.mobius.opis.network.enums;
|
||||
|
||||
public enum ClientCommand {
|
||||
INVALID,
|
||||
TEST_CMD,
|
||||
START_PROFILING,
|
||||
STOP_PROFILING,
|
||||
RESET_PROFILING,
|
||||
SHOW_RENDER_TICK,
|
||||
SHOW_SWING,
|
||||
CLEAR_SELECTION;
|
||||
}
|
||||
@@ -56,8 +56,15 @@ public enum Message {
|
||||
OVERLAY_CHUNK_ENTITIES,
|
||||
OVERLAY_CHUNK_TIMING,
|
||||
|
||||
CLIENT_START_PROFILING,
|
||||
CLIENT_STOP_PROFILING,
|
||||
CLIENT_RESET_PROFILING,
|
||||
CLIENT_SHOW_RENDER_TICK,
|
||||
CLIENT_SHOW_SWING,
|
||||
CLIENT_CLEAR_SELECTION,
|
||||
CLIENT_HIGHLIGHT_BLOCK;
|
||||
|
||||
|
||||
private AccessLevel accessLevel = AccessLevel.NONE;
|
||||
|
||||
private Message(){
|
||||
|
||||
@@ -6,6 +6,6 @@ import mcp.mobius.opis.network.enums.Message;
|
||||
public class Packet_DataAbstract {
|
||||
|
||||
public byte header;
|
||||
public Message dataReq;
|
||||
public Message msg;
|
||||
public Packet250CustomPayload packet;
|
||||
}
|
||||
+8
-8
@@ -6,32 +6,32 @@ import java.io.DataInputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
import mcp.mobius.opis.network.enums.ClientCommand;
|
||||
import mcp.mobius.opis.network.enums.Message;
|
||||
import mcp.mobius.opis.network.enums.Packets;
|
||||
import net.minecraft.network.packet.Packet250CustomPayload;
|
||||
|
||||
public class Packet_ClientCommand {
|
||||
public class Packet_DataCommand {
|
||||
|
||||
public byte header;
|
||||
public ClientCommand cmd;
|
||||
public byte header;
|
||||
public Message msg;
|
||||
|
||||
public Packet_ClientCommand(Packet250CustomPayload packet) {
|
||||
public Packet_DataCommand(Packet250CustomPayload packet) {
|
||||
DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data));
|
||||
try{
|
||||
this.header = inputStream.readByte();
|
||||
this.cmd = ClientCommand.values()[inputStream.readInt()];
|
||||
this.msg = Message.values()[inputStream.readInt()];
|
||||
} catch (IOException e){}
|
||||
|
||||
}
|
||||
|
||||
public static Packet250CustomPayload create(ClientCommand cmd){
|
||||
public static Packet250CustomPayload create(Message msg){
|
||||
Packet250CustomPayload packet = new Packet250CustomPayload();
|
||||
ByteArrayOutputStream bos = new ByteArrayOutputStream(1);
|
||||
DataOutputStream outputStream = new DataOutputStream(bos);
|
||||
|
||||
try{
|
||||
outputStream.writeByte(Packets.CLIENT_CMD);
|
||||
outputStream.writeInt(cmd.ordinal());
|
||||
outputStream.writeInt(msg.ordinal());
|
||||
}catch(IOException e){}
|
||||
|
||||
packet.channel = "Opis";
|
||||
@@ -31,7 +31,7 @@ public class Packet_DataList extends Packet_DataAbstract{
|
||||
|
||||
try{
|
||||
this.header = istream.readByte();
|
||||
this.dataReq = Message.values()[istream.readInt()];
|
||||
this.msg = Message.values()[istream.readInt()];
|
||||
int ndata = istream.readInt();
|
||||
String datatype = "";
|
||||
if (ndata > 0)
|
||||
@@ -43,7 +43,7 @@ public class Packet_DataList extends Packet_DataAbstract{
|
||||
}
|
||||
|
||||
//public static Packet250Metadata create(DataReq dataReq, ArrayList<? extends ISerializable> stats){
|
||||
public static Packet_DataList create(Message dataReq, ArrayList<? extends ISerializable> stats){
|
||||
public static Packet_DataList create(Message msg, ArrayList<? extends ISerializable> data){
|
||||
//Packet250Metadata packet = new Packet250Metadata();
|
||||
Packet250CustomPayload packet = new Packet250CustomPayload();
|
||||
ByteArrayOutputStream bos = new ByteArrayOutputStream(1);
|
||||
@@ -51,14 +51,14 @@ public class Packet_DataList extends Packet_DataAbstract{
|
||||
|
||||
try{
|
||||
ostream.writeByte(Packets.DATA_LIST_GENERAL);
|
||||
ostream.writeInt(dataReq.ordinal());
|
||||
ostream.writeInt(stats.size());
|
||||
ostream.writeInt(msg.ordinal());
|
||||
ostream.writeInt(data.size());
|
||||
|
||||
if (stats.size() > 0)
|
||||
Packet.writeString(stats.get(0).getClass().getCanonicalName(), ostream);
|
||||
if (data.size() > 0)
|
||||
Packet.writeString(data.get(0).getClass().getCanonicalName(), ostream);
|
||||
|
||||
for (ISerializable data : stats)
|
||||
data.writeToStream(ostream);
|
||||
for (ISerializable odata : data)
|
||||
odata.writeToStream(ostream);
|
||||
}catch(IOException e){}
|
||||
|
||||
//packet.dataReq = dataReq;
|
||||
@@ -69,7 +69,7 @@ public class Packet_DataList extends Packet_DataAbstract{
|
||||
packet.length = bos.size();
|
||||
|
||||
Packet_DataList capsule = new Packet_DataList();
|
||||
capsule.dataReq = dataReq;
|
||||
capsule.msg = msg;
|
||||
capsule.header = Packets.DATA_VALUE_GENERAL;
|
||||
capsule.packet = packet;
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ public class Packet_DataValue extends Packet_DataAbstract{
|
||||
|
||||
try{
|
||||
this.header = istream.readByte();
|
||||
this.dataReq = Message.values()[istream.readInt()];
|
||||
this.msg = Message.values()[istream.readInt()];
|
||||
String datatype = "";
|
||||
datatype = Packet.readString(istream, 255);
|
||||
data = dataRead(datatype, istream);
|
||||
@@ -55,7 +55,7 @@ public class Packet_DataValue extends Packet_DataAbstract{
|
||||
packet.length = bos.size();
|
||||
|
||||
Packet_DataValue capsule = new Packet_DataValue();
|
||||
capsule.dataReq = dataReq;
|
||||
capsule.msg = dataReq;
|
||||
capsule.header = Packets.DATA_VALUE_GENERAL;
|
||||
capsule.packet = packet;
|
||||
|
||||
|
||||
Reference in new issue
Block a user