From cd82afdeca80dbe3eb5bef66c1e1f036222054e5 Mon Sep 17 00:00:00 2001 From: ProfMobius Date: Mon, 24 Mar 2014 22:11:06 +0100 Subject: [PATCH] Added reset highlight button to the TE Timing tab to remove highlight post teleport. --- .../opis/gui/overlay/OverlayMeanTime.java | 2 +- mcp/mobius/opis/network/MessageHandler.java | 1 + .../opis/network/OpisPacketHandler.java | 8 +++++- mcp/mobius/opis/network/enums/Message.java | 4 ++- mcp/mobius/opis/swing/SwingUI.java | 25 +++++++++++++++---- 5 files changed, 32 insertions(+), 8 deletions(-) diff --git a/mcp/mobius/opis/gui/overlay/OverlayMeanTime.java b/mcp/mobius/opis/gui/overlay/OverlayMeanTime.java index b3975d9..648a2d7 100644 --- a/mcp/mobius/opis/gui/overlay/OverlayMeanTime.java +++ b/mcp/mobius/opis/gui/overlay/OverlayMeanTime.java @@ -68,7 +68,7 @@ public class OverlayMeanTime implements IMwDataProvider { MathHelper.ceiling_double_int(this.mapView.getZ()) >> 4); } else{ - modOpis.selectedBlock = coord; + //modOpis.selectedBlock = coord; PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_BLOCK, coord)); Minecraft.getMinecraft().setIngameFocus(); } diff --git a/mcp/mobius/opis/network/MessageHandler.java b/mcp/mobius/opis/network/MessageHandler.java index ca67cce..a8e95ed 100644 --- a/mcp/mobius/opis/network/MessageHandler.java +++ b/mcp/mobius/opis/network/MessageHandler.java @@ -150,6 +150,7 @@ public class MessageHandler { 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); } else if (maintype == Message.COMMAND_TELEPORT_TO_ENTITY){ diff --git a/mcp/mobius/opis/network/OpisPacketHandler.java b/mcp/mobius/opis/network/OpisPacketHandler.java index bd34ae2..76ca528 100644 --- a/mcp/mobius/opis/network/OpisPacketHandler.java +++ b/mcp/mobius/opis/network/OpisPacketHandler.java @@ -14,6 +14,7 @@ import mcp.mobius.opis.modOpis; import mcp.mobius.opis.data.client.DataCache; import mcp.mobius.opis.data.holders.ISerializable; 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; @@ -247,7 +248,12 @@ public class OpisPacketHandler implements IPacketHandler { 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); + } + } } diff --git a/mcp/mobius/opis/network/enums/Message.java b/mcp/mobius/opis/network/enums/Message.java index 7aaed7c..94207a9 100644 --- a/mcp/mobius/opis/network/enums/Message.java +++ b/mcp/mobius/opis/network/enums/Message.java @@ -51,7 +51,9 @@ public enum Message { COMMAND_OPEN_SWING, OVERLAY_CHUNK_ENTITIES, - OVERLAY_CHUNK_TIMING; + OVERLAY_CHUNK_TIMING, + + CLIENT_HIGHLIGHT_BLOCK; private AccessLevel accessLevel = AccessLevel.NONE; diff --git a/mcp/mobius/opis/swing/SwingUI.java b/mcp/mobius/opis/swing/SwingUI.java index 6efa55d..22a1a22 100644 --- a/mcp/mobius/opis/swing/SwingUI.java +++ b/mcp/mobius/opis/swing/SwingUI.java @@ -153,6 +153,7 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener, Wi private JButton btnPlayers_Dummy1; private JButton btnPlayers_Dummy2; private JLabel lblSummaryTimeStampLastRun; + private JButton btnTimingTERemoveHighlight; public void showUI(){ EventQueue.invokeLater(new Runnable() { @@ -569,7 +570,7 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener, Wi btnTimingTECenterMap = new JButtonAccess("Center Map"); btnTimingTECenterMap.addActionListener(this); - panelTimingTE.setLayout(new MigLayout("", "[left][left][233px,grow][right]", "[][334px,grow][]")); + panelTimingTE.setLayout(new MigLayout("", "[left][left][][233px,grow][right]", "[][334px,grow][]")); panelTimingTE.add(btnTimingTECenterMap, "cell 0 0,alignx center,aligny center"); btnTimingTETeleport = new JButtonAccess("Teleport", AccessLevel.PRIVILEGED); @@ -578,10 +579,15 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener, Wi btnTimingTERefresh = new JButtonAccess("Run Opis", AccessLevel.PRIVILEGED); btnTimingTERefresh.addActionListener(this); - panelTimingTE.add(btnTimingTERefresh, "cell 3 0,alignx right,aligny center"); + + btnTimingTERemoveHighlight = new JButton("Reset Highlight"); + btnTimingTERemoveHighlight.setEnabled(false); + panelTimingTE.add(btnTimingTERemoveHighlight, "cell 2 0,alignx left"); + panelTimingTE.add(btnTimingTERefresh, "cell 4 0,alignx right,aligny center"); + btnTimingTERemoveHighlight.addActionListener(this); JScrollPane scrollPaneTimingTE = new JScrollPane(); - panelTimingTE.add(scrollPaneTimingTE, "cell 0 1 4 1,grow"); + panelTimingTE.add(scrollPaneTimingTE, "cell 0 1 5 1,grow"); tableTimingTE = new JTable(); tableTimingTE.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); @@ -607,7 +613,7 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener, Wi scrollPaneTimingTE.setViewportView(tableTimingTE); lblTimingTEValue = new JLabel("Total update time : 0 µs"); - panelTimingTE.add(lblTimingTEValue, "cell 0 2 4 1,alignx center,aligny center"); + panelTimingTE.add(lblTimingTEValue, "cell 0 2 5 1,alignx center,aligny center"); panelTimingEnt = new JPanel(); tabbedPane.addTab("EntityTiming", null, panelTimingEnt, null); @@ -971,7 +977,13 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener, Wi int eid = data.getEID(); int dim = data.getCoordinates().dim; PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_PULL_ENTITY, new TargetEntity(eid, dim))); - } + } + + // RESET HIGHLIGHT on the TimingTE Screen + else if (e.getSource() == this.btnTimingTERemoveHighlight){ + modOpis.selectedBlock = null; + this.btnTimingTERemoveHighlight.setEnabled(false); + } } @@ -1025,4 +1037,7 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener, Wi public JLabel getLblSummaryTimeStampLastRun() { return lblSummaryTimeStampLastRun; } + public JButton getBtnTimingTERemoveHighlight() { + return btnTimingTERemoveHighlight; + } }