From 70dc1d235bdbd7f46338d273a44f1eb00a869481 Mon Sep 17 00:00:00 2001 From: ProfMobius Date: Thu, 27 Mar 2014 19:10:59 +0100 Subject: [PATCH] Readded the last missing values. --- mcp/mobius/opis/network/ClientMessageHandler.java | 10 ---------- mcp/mobius/opis/network/OpisPacketHandler.java | 4 ---- mcp/mobius/opis/proxy/ProxyClient.java | 14 +++----------- mcp/mobius/opis/swing/panels/PanelSummary.java | 3 +++ .../opis/swing/panels/PanelTimingTileEnts.java | 6 ++++++ 5 files changed, 12 insertions(+), 25 deletions(-) diff --git a/mcp/mobius/opis/network/ClientMessageHandler.java b/mcp/mobius/opis/network/ClientMessageHandler.java index 8810f61..1a54cab 100644 --- a/mcp/mobius/opis/network/ClientMessageHandler.java +++ b/mcp/mobius/opis/network/ClientMessageHandler.java @@ -89,14 +89,4 @@ public class ClientMessageHandler { ChunkManager.setLoadedChunks(data); } } - - public void handle(Message msg, ISerializable data){ - if (msg == Message.VALUE_TIMING_ENTUPDATE) - SwingUI.instance().getPanelSummary().setTimingEntUpdateTotal(((SerialDouble)data).value); - - else if(msg == Message.CLIENT_HIGHLIGHT_BLOCK){ - modOpis.selectedBlock = (CoordinatesBlock)data; - SwingUI.instance().getPanelTimingTileEnts().getBtnReset().setEnabled(true); - } - } } diff --git a/mcp/mobius/opis/network/OpisPacketHandler.java b/mcp/mobius/opis/network/OpisPacketHandler.java index a42b324..0f1629f 100644 --- a/mcp/mobius/opis/network/OpisPacketHandler.java +++ b/mcp/mobius/opis/network/OpisPacketHandler.java @@ -111,15 +111,11 @@ public class OpisPacketHandler implements IPacketHandler { else if (header == Packets.DATA_LIST_GENERAL){ 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){ NetDataRaw rawdata = new NetDataValue(packet); MessageHandlerRegistrar.instance().routeMessage(rawdata.msg, rawdata); - //NetDataValue castedPacket = new NetDataValue(packet); - //ClientMessageHandler.instance().handle(castedPacket.msg, castedPacket.value); } } diff --git a/mcp/mobius/opis/proxy/ProxyClient.java b/mcp/mobius/opis/proxy/ProxyClient.java index 1f4bc7c..13eab5e 100644 --- a/mcp/mobius/opis/proxy/ProxyClient.java +++ b/mcp/mobius/opis/proxy/ProxyClient.java @@ -55,6 +55,7 @@ public class ProxyClient extends ProxyServer { MessageHandlerRegistrar.instance().registerHandler(Message.STATUS_START, SwingUI.instance().getPanelTimingTileEnts()); MessageHandlerRegistrar.instance().registerHandler(Message.STATUS_STOP, SwingUI.instance().getPanelTimingTileEnts()); MessageHandlerRegistrar.instance().registerHandler(Message.STATUS_RUNNING, SwingUI.instance().getPanelTimingTileEnts()); + MessageHandlerRegistrar.instance().registerHandler(Message.CLIENT_HIGHLIGHT_BLOCK,SwingUI.instance().getPanelTimingTileEnts()); MessageHandlerRegistrar.instance().registerHandler(Message.LIST_TIMING_ENTITIES, SwingUI.instance().getPanelTimingEntities()); MessageHandlerRegistrar.instance().registerHandler(Message.VALUE_TIMING_ENTITIES, SwingUI.instance().getPanelTimingEntities()); @@ -93,16 +94,7 @@ public class ProxyClient extends ProxyServer { MessageHandlerRegistrar.instance().registerHandler(Message.STATUS_STOP, SwingUI.instance().getPanelSummary()); 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.STATUS_TIME_LAST_RUN, SwingUI.instance().getPanelSummary()); + MessageHandlerRegistrar.instance().registerHandler(Message.VALUE_TIMING_ENTUPDATE, SwingUI.instance().getPanelSummary()); } } diff --git a/mcp/mobius/opis/swing/panels/PanelSummary.java b/mcp/mobius/opis/swing/panels/PanelSummary.java index d91a09d..c1ac20e 100644 --- a/mcp/mobius/opis/swing/panels/PanelSummary.java +++ b/mcp/mobius/opis/swing/panels/PanelSummary.java @@ -365,6 +365,9 @@ public class PanelSummary extends JPanelMsgHandler implements ActionListener{ } break; } + case VALUE_TIMING_ENTUPDATE:{ + break; + } default: return false; diff --git a/mcp/mobius/opis/swing/panels/PanelTimingTileEnts.java b/mcp/mobius/opis/swing/panels/PanelTimingTileEnts.java index b6a638c..b15cc7d 100644 --- a/mcp/mobius/opis/swing/panels/PanelTimingTileEnts.java +++ b/mcp/mobius/opis/swing/panels/PanelTimingTileEnts.java @@ -5,6 +5,8 @@ import java.awt.event.ActionListener; import javax.swing.JPanel; +import mcp.mobius.opis.modOpis; +import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock; import mcp.mobius.opis.data.holders.basetypes.SerialDouble; import mcp.mobius.opis.data.holders.stats.StatAbstract; import mcp.mobius.opis.data.holders.stats.StatsTileEntity; @@ -149,6 +151,10 @@ public class PanelTimingTileEnts extends JPanelMsgHandler implements ActionListe this.getBtnRun().setText("Running..."); break; } + case CLIENT_HIGHLIGHT_BLOCK:{ + modOpis.selectedBlock = (CoordinatesBlock)rawdata.value; + this.getBtnReset().setEnabled(true); + } default: return false;