diff --git a/mcp/mobius/opis/network/ClientMessageHandler.java b/mcp/mobius/opis/network/ClientMessageHandler.java index 1a54cab..1c14f85 100644 --- a/mcp/mobius/opis/network/ClientMessageHandler.java +++ b/mcp/mobius/opis/network/ClientMessageHandler.java @@ -11,6 +11,7 @@ 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.api.IMessageHandler; import mcp.mobius.opis.data.client.DataCache; import mcp.mobius.opis.data.client.TickHandlerClientProfiler; import mcp.mobius.opis.data.holders.ISerializable; @@ -23,6 +24,7 @@ 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.network.packets.server.NetDataRaw; import mcp.mobius.opis.swing.SwingUI; import mcp.mobius.opis.data.holders.basetypes.AmountHolder; import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock; @@ -35,7 +37,7 @@ import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.enums.Packets; -public class ClientMessageHandler { +public class ClientMessageHandler implements IMessageHandler{ private static ClientMessageHandler _instance; private ClientMessageHandler(){} @@ -46,31 +48,6 @@ public class 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 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 data){ if (msg == Message.LIST_TIMING_CHUNK){ @@ -89,4 +66,9 @@ public class ClientMessageHandler { ChunkManager.setLoadedChunks(data); } } + + @Override + public boolean handleMessage(Message msg, NetDataRaw rawdata) { + return false; + } } diff --git a/mcp/mobius/opis/network/OpisPacketHandler.java b/mcp/mobius/opis/network/OpisPacketHandler.java index 0f1629f..ef35df1 100644 --- a/mcp/mobius/opis/network/OpisPacketHandler.java +++ b/mcp/mobius/opis/network/OpisPacketHandler.java @@ -104,8 +104,8 @@ public class OpisPacketHandler implements IPacketHandler { } else if (header == Packets.CLIENT_CMD){ - NetDataCommand castedPacket = new NetDataCommand(packet); - ClientMessageHandler.instance().handle(castedPacket.msg); + NetDataRaw rawdata = new NetDataCommand(packet); + MessageHandlerRegistrar.instance().routeMessage(rawdata.msg, rawdata); } else if (header == Packets.DATA_LIST_GENERAL){ diff --git a/mcp/mobius/opis/proxy/ProxyClient.java b/mcp/mobius/opis/proxy/ProxyClient.java index 13eab5e..1a06db8 100644 --- a/mcp/mobius/opis/proxy/ProxyClient.java +++ b/mcp/mobius/opis/proxy/ProxyClient.java @@ -3,12 +3,15 @@ package mcp.mobius.opis.proxy; import java.awt.Font; import java.util.ArrayList; import java.util.HashMap; +import java.util.logging.Level; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.util.ResourceLocation; import mapwriter.api.MwAPI; +import mcp.mobius.mobiuscore.profiler.ProfilerRegistrar; import mcp.mobius.opis.modOpis; +import mcp.mobius.opis.api.IMessageHandler; import mcp.mobius.opis.api.MessageHandlerRegistrar; import mcp.mobius.opis.data.client.DataCache; import mcp.mobius.opis.data.holders.stats.StatsChunk; @@ -16,6 +19,8 @@ import mcp.mobius.opis.data.holders.stats.StatsEntity; import mcp.mobius.opis.data.holders.stats.StatsMod; import mcp.mobius.opis.data.holders.stats.StatsTickHandler; import mcp.mobius.opis.data.holders.stats.StatsTileEntity; +import mcp.mobius.opis.data.managers.MetaManager; +import mcp.mobius.opis.data.managers.TickHandlerManager; import mcp.mobius.opis.gui.font.Fonts; import mcp.mobius.opis.gui.font.TrueTypeFont; import mcp.mobius.opis.gui.overlay.OverlayLoadedChunks; @@ -23,10 +28,11 @@ 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.network.packets.server.NetDataRaw; import mcp.mobius.opis.swing.SwingUI; import mcp.mobius.opis.swing.panels.PanelPlayers; -public class ProxyClient extends ProxyServer { +public class ProxyClient extends ProxyServer implements IMessageHandler{ public static TrueTypeFont fontMC8, fontMC12, fontMC16, fontMC18, fontMC24; @@ -76,7 +82,8 @@ public class ProxyClient extends ProxyServer { MessageHandlerRegistrar.instance().registerHandler(Message.STATUS_ACCESS_LEVEL, DataCache.instance()); MessageHandlerRegistrar.instance().registerHandler(Message.STATUS_CURRENT_TIME, DataCache.instance()); - MessageHandlerRegistrar.instance().registerHandler(Message.STATUS_ACCESS_LEVEL, SwingUI.instance()); + MessageHandlerRegistrar.instance().registerHandler(Message.STATUS_ACCESS_LEVEL, SwingUI.instance()); + MessageHandlerRegistrar.instance().registerHandler(Message.CLIENT_SHOW_SWING, SwingUI.instance()); MessageHandlerRegistrar.instance().registerHandler(Message.VALUE_AMOUNT_TILEENTS, SwingUI.instance().getPanelSummary()); MessageHandlerRegistrar.instance().registerHandler(Message.VALUE_AMOUNT_ENTITIES, SwingUI.instance().getPanelSummary()); @@ -95,6 +102,40 @@ public class ProxyClient extends ProxyServer { MessageHandlerRegistrar.instance().registerHandler(Message.STATUS_RUN_UPDATE, SwingUI.instance().getPanelSummary()); MessageHandlerRegistrar.instance().registerHandler(Message.STATUS_RUNNING, SwingUI.instance().getPanelSummary()); MessageHandlerRegistrar.instance().registerHandler(Message.STATUS_TIME_LAST_RUN, SwingUI.instance().getPanelSummary()); - MessageHandlerRegistrar.instance().registerHandler(Message.VALUE_TIMING_ENTUPDATE, SwingUI.instance().getPanelSummary()); + MessageHandlerRegistrar.instance().registerHandler(Message.VALUE_TIMING_ENTUPDATE, SwingUI.instance().getPanelSummary()); + + MessageHandlerRegistrar.instance().registerHandler(Message.CLIENT_CLEAR_SELECTION, modOpis.proxy); + MessageHandlerRegistrar.instance().registerHandler(Message.CLIENT_START_PROFILING, modOpis.proxy); + MessageHandlerRegistrar.instance().registerHandler(Message.CLIENT_SHOW_RENDER_TICK, modOpis.proxy); + } + + @Override + public boolean handleMessage(Message msg, NetDataRaw rawdata) { + switch(msg){ + case CLIENT_CLEAR_SELECTION:{ + modOpis.selectedBlock = null; + break; + } + case CLIENT_START_PROFILING:{ + modOpis.log.log(Level.INFO, "Started profiling"); + MetaManager.reset(); + modOpis.profilerRun = true; + ProfilerRegistrar.turnOn(); + break; + } + case CLIENT_SHOW_RENDER_TICK:{ + modOpis.log.log(Level.INFO, "=== RENDER TICK ==="); + ArrayList stats = TickHandlerManager.getCumulatedStats(); + for (StatsTickHandler stat : stats){ + System.out.printf("%s \n", stat); + } + break; + } + default: + return false; + } + + + return true; } } diff --git a/mcp/mobius/opis/proxy/ProxyServer.java b/mcp/mobius/opis/proxy/ProxyServer.java index ba3ccc3..81481b4 100644 --- a/mcp/mobius/opis/proxy/ProxyServer.java +++ b/mcp/mobius/opis/proxy/ProxyServer.java @@ -4,14 +4,22 @@ import java.util.ArrayList; import java.util.HashMap; import cpw.mods.fml.common.network.Player; +import mcp.mobius.opis.api.IMessageHandler; import mcp.mobius.opis.data.holders.stats.StatsChunk; import mcp.mobius.opis.data.holders.stats.StatsEntity; import mcp.mobius.opis.data.holders.stats.StatsMod; import mcp.mobius.opis.data.holders.stats.StatsTickHandler; import mcp.mobius.opis.data.holders.stats.StatsTileEntity; import mcp.mobius.opis.gui.overlay.OverlayStatus; +import mcp.mobius.opis.network.enums.Message; +import mcp.mobius.opis.network.packets.server.NetDataRaw; -public class ProxyServer { +public class ProxyServer implements IMessageHandler{ public void init(){} + + @Override + public boolean handleMessage(Message msg, NetDataRaw rawdata) { + return false; + } } diff --git a/mcp/mobius/opis/swing/SwingUI.java b/mcp/mobius/opis/swing/SwingUI.java index 01b63c7..e9ed315 100644 --- a/mcp/mobius/opis/swing/SwingUI.java +++ b/mcp/mobius/opis/swing/SwingUI.java @@ -207,7 +207,10 @@ public class SwingUI extends JFrame implements WindowListener, IMessageHandler{ } break; } - + case CLIENT_SHOW_SWING:{ + this.showUI(); + break; + } default: return false;