diff --git a/mcp/mobius/opis/swing/actions/ActionCenterMap.java b/mcp/mobius/opis/swing/actions/ActionAmountEntities.java similarity index 56% rename from mcp/mobius/opis/swing/actions/ActionCenterMap.java rename to mcp/mobius/opis/swing/actions/ActionAmountEntities.java index 7cbbc15..44d9f85 100644 --- a/mcp/mobius/opis/swing/actions/ActionCenterMap.java +++ b/mcp/mobius/opis/swing/actions/ActionAmountEntities.java @@ -2,37 +2,34 @@ package mcp.mobius.opis.swing.actions; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import mcp.mobius.opis.network.enums.Message; +import mcp.mobius.opis.network.packets.client.Packet_ReqData; +import mcp.mobius.opis.swing.widgets.JTableStats; import javax.swing.JButton; -import net.minecraft.client.Minecraft; -import mapwriter.Mw; -import mapwriter.api.IMwDataProvider; -import mapwriter.api.MwAPI; -import mapwriter.gui.MwGui; +import cpw.mods.fml.common.network.PacketDispatcher; import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock; import mcp.mobius.opis.data.holders.stats.StatAbstract; import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; import mcp.mobius.opis.swing.widgets.JTableStats; -public class ActionCenterMap implements ActionListener { +public class ActionAmountEntities implements ActionListener, ItemListener { - IMwDataProvider overlay; - - public ActionCenterMap(IMwDataProvider overlay){ - super(); - this.overlay = overlay; - } - @Override public void actionPerformed(ActionEvent e) { JTableStats table = ((JPanelMsgHandler)((JButton)e.getSource()).getParent()).getTable(); + if (table == null || table.getSelectedRow() == -1) return; int indexData = table.convertRowIndexToModel(table.getSelectedRow()); StatAbstract data = table.getStatistics().get(indexData); - CoordinatesBlock target = data.getTeleportTarget(); - MwAPI.setCurrentDataProvider(overlay); - Minecraft.getMinecraft().displayGuiScreen(new MwGui(Mw.instance, target.dim, target.x, target.z)); + } + + @Override + public void itemStateChanged(ItemEvent arg0) { + } } diff --git a/mcp/mobius/opis/swing/actions/ActionTeleport.java b/mcp/mobius/opis/swing/actions/ActionPlayers.java similarity index 80% rename from mcp/mobius/opis/swing/actions/ActionTeleport.java rename to mcp/mobius/opis/swing/actions/ActionPlayers.java index fb5014d..0f25ab6 100644 --- a/mcp/mobius/opis/swing/actions/ActionTeleport.java +++ b/mcp/mobius/opis/swing/actions/ActionPlayers.java @@ -2,7 +2,8 @@ package mcp.mobius.opis.swing.actions; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; - +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.Packet_ReqData; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -15,17 +16,15 @@ import mcp.mobius.opis.data.holders.stats.StatAbstract; import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; import mcp.mobius.opis.swing.widgets.JTableStats; - -public class ActionTeleport implements ActionListener { +public class ActionPlayers implements ActionListener { @Override public void actionPerformed(ActionEvent e) { JTableStats table = ((JPanelMsgHandler)((JButton)e.getSource()).getParent()).getTable(); + if (table == null || table.getSelectedRow() == -1) return; int indexData = table.convertRowIndexToModel(table.getSelectedRow()); StatAbstract data = table.getStatistics().get(indexData); - CoordinatesBlock target = data.getTeleportTarget(); - PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_BLOCK, target)); } } diff --git a/mcp/mobius/opis/swing/actions/ActionTimingChunks.java b/mcp/mobius/opis/swing/actions/ActionTimingChunks.java new file mode 100644 index 0000000..5da99fd --- /dev/null +++ b/mcp/mobius/opis/swing/actions/ActionTimingChunks.java @@ -0,0 +1,30 @@ +package mcp.mobius.opis.swing.actions; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import mcp.mobius.opis.network.enums.Message; +import mcp.mobius.opis.network.packets.client.Packet_ReqData; +import mcp.mobius.opis.swing.widgets.JTableStats; + +import javax.swing.JButton; + +import cpw.mods.fml.common.network.PacketDispatcher; +import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock; +import mcp.mobius.opis.data.holders.stats.StatAbstract; +import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; +import mcp.mobius.opis.swing.widgets.JTableStats; + +public class ActionTimingChunks implements ActionListener { + + @Override + public void actionPerformed(ActionEvent e) { + JTableStats table = ((JPanelMsgHandler)((JButton)e.getSource()).getParent()).getTable(); + if (table == null || table.getSelectedRow() == -1) return; + int indexData = table.convertRowIndexToModel(table.getSelectedRow()); + StatAbstract data = table.getStatistics().get(indexData); + + } + +} diff --git a/mcp/mobius/opis/swing/actions/ActionTimingEntities.java b/mcp/mobius/opis/swing/actions/ActionTimingEntities.java new file mode 100644 index 0000000..e8ede94 --- /dev/null +++ b/mcp/mobius/opis/swing/actions/ActionTimingEntities.java @@ -0,0 +1,30 @@ +package mcp.mobius.opis.swing.actions; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import mcp.mobius.opis.network.enums.Message; +import mcp.mobius.opis.network.packets.client.Packet_ReqData; +import mcp.mobius.opis.swing.widgets.JTableStats; + +import javax.swing.JButton; + +import cpw.mods.fml.common.network.PacketDispatcher; +import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock; +import mcp.mobius.opis.data.holders.stats.StatAbstract; +import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; +import mcp.mobius.opis.swing.widgets.JTableStats; + +public class ActionTimingEntities implements ActionListener { + + @Override + public void actionPerformed(ActionEvent e) { + JTableStats table = ((JPanelMsgHandler)((JButton)e.getSource()).getParent()).getTable(); + if (table == null || table.getSelectedRow() == -1) return; + int indexData = table.convertRowIndexToModel(table.getSelectedRow()); + StatAbstract data = table.getStatistics().get(indexData); + + } + +} diff --git a/mcp/mobius/opis/swing/actions/ActionTimingHandlers.java b/mcp/mobius/opis/swing/actions/ActionTimingHandlers.java new file mode 100644 index 0000000..f243777 --- /dev/null +++ b/mcp/mobius/opis/swing/actions/ActionTimingHandlers.java @@ -0,0 +1,30 @@ +package mcp.mobius.opis.swing.actions; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import mcp.mobius.opis.network.enums.Message; +import mcp.mobius.opis.network.packets.client.Packet_ReqData; +import mcp.mobius.opis.swing.widgets.JTableStats; + +import javax.swing.JButton; + +import cpw.mods.fml.common.network.PacketDispatcher; +import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock; +import mcp.mobius.opis.data.holders.stats.StatAbstract; +import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; +import mcp.mobius.opis.swing.widgets.JTableStats; + +public class ActionTimingHandlers implements ActionListener { + + @Override + public void actionPerformed(ActionEvent e) { + JTableStats table = ((JPanelMsgHandler)((JButton)e.getSource()).getParent()).getTable(); + if (table == null || table.getSelectedRow() == -1) return; + int indexData = table.convertRowIndexToModel(table.getSelectedRow()); + StatAbstract data = table.getStatistics().get(indexData); + + } + +} diff --git a/mcp/mobius/opis/swing/actions/ActionTimingTileEnts.java b/mcp/mobius/opis/swing/actions/ActionTimingTileEnts.java new file mode 100644 index 0000000..3a108ea --- /dev/null +++ b/mcp/mobius/opis/swing/actions/ActionTimingTileEnts.java @@ -0,0 +1,30 @@ +package mcp.mobius.opis.swing.actions; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import mcp.mobius.opis.network.enums.Message; +import mcp.mobius.opis.network.packets.client.Packet_ReqData; +import mcp.mobius.opis.swing.widgets.JTableStats; + +import javax.swing.JButton; + +import cpw.mods.fml.common.network.PacketDispatcher; +import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock; +import mcp.mobius.opis.data.holders.stats.StatAbstract; +import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; +import mcp.mobius.opis.swing.widgets.JTableStats; + +public class ActionTimingTileEnts implements ActionListener { + + @Override + public void actionPerformed(ActionEvent e) { + JTableStats table = ((JPanelMsgHandler)((JButton)e.getSource()).getParent()).getTable(); + if (table == null || table.getSelectedRow() == -1) return; + int indexData = table.convertRowIndexToModel(table.getSelectedRow()); + StatAbstract data = table.getStatistics().get(indexData); + + } + +} diff --git a/mcp/mobius/opis/swing/panels/PanelAmountEntities.java b/mcp/mobius/opis/swing/panels/PanelAmountEntities.java index 0aa4c21..5f59723 100644 --- a/mcp/mobius/opis/swing/panels/PanelAmountEntities.java +++ b/mcp/mobius/opis/swing/panels/PanelAmountEntities.java @@ -9,6 +9,7 @@ import mcp.mobius.opis.data.holders.basetypes.AmountHolder; 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.actions.ActionAmountEntities; import mcp.mobius.opis.swing.widgets.JButtonAccess; import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -24,7 +25,7 @@ import javax.swing.SwingConstants; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.DefaultTableModel; -public class PanelAmountEntities extends JPanelMsgHandler implements ActionListener, ItemListener{ +public class PanelAmountEntities extends JPanelMsgHandler{ private JCheckBox chckbxFilter; private JButtonAccess btnKillAll; private JButtonAccess btnRefresh; @@ -38,15 +39,15 @@ public class PanelAmountEntities extends JPanelMsgHandler implements ActionListe chckbxFilter = new JCheckBox("Filter Entities"); add(chckbxFilter, "cell 0 0"); - chckbxFilter.addItemListener(this); + chckbxFilter.addItemListener(new ActionAmountEntities()); btnKillAll = new JButtonAccess("Kill All", AccessLevel.PRIVILEGED); add(btnKillAll, "cell 1 0"); - btnKillAll.addActionListener(this); + btnKillAll.addActionListener(new ActionAmountEntities()); btnRefresh = new JButtonAccess("Refresh", AccessLevel.NONE); add(btnRefresh, "cell 3 0"); - btnRefresh.addActionListener(this); + btnRefresh.addActionListener(new ActionAmountEntities()); JScrollPane scrollPane = new JScrollPane(); add(scrollPane, "cell 0 1 4 1,grow"); @@ -90,12 +91,6 @@ public class PanelAmountEntities extends JPanelMsgHandler implements ActionListe public JButton getBtnRefresh() {return btnRefresh;} public JLabel getLblSummary() {return lblSummary;} - @Override - public void actionPerformed(ActionEvent arg0) {} - - @Override - public void itemStateChanged(ItemEvent arg0) {} - @Override public boolean handleMessage(Message msg, NetDataRaw rawdata) { switch(msg){ diff --git a/mcp/mobius/opis/swing/panels/PanelPlayers.java b/mcp/mobius/opis/swing/panels/PanelPlayers.java index b2687bb..f5efbf2 100644 --- a/mcp/mobius/opis/swing/panels/PanelPlayers.java +++ b/mcp/mobius/opis/swing/panels/PanelPlayers.java @@ -4,11 +4,11 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import mcp.mobius.opis.data.holders.stats.StatsPlayer; +import mcp.mobius.opis.gui.overlay.entperchunk.OverlayEntityPerChunk; 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.actions.ActionCenterMap; -import mcp.mobius.opis.swing.actions.ActionTeleport; +import mcp.mobius.opis.swing.actions.ActionPlayers; import mcp.mobius.opis.swing.widgets.JButtonAccess; import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -22,7 +22,7 @@ import javax.swing.SwingConstants; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.DefaultTableModel; -public class PanelPlayers extends JPanelMsgHandler implements ActionListener{ +public class PanelPlayers extends JPanelMsgHandler{ private JButtonAccess btnCenter; private JButtonAccess btnTeleport; private JButtonAccess btnPull; @@ -35,15 +35,15 @@ public class PanelPlayers extends JPanelMsgHandler implements ActionListener{ btnCenter = new JButtonAccess("Center Map", AccessLevel.NONE); add(btnCenter, "cell 0 0"); - btnCenter.addActionListener(new ActionCenterMap()); + btnCenter.addActionListener(new ActionPlayers()); btnTeleport = new JButtonAccess("Teleport", AccessLevel.PRIVILEGED); add(btnTeleport, "cell 1 0"); - btnTeleport.addActionListener(new ActionTeleport()); + btnTeleport.addActionListener(new ActionPlayers()); btnPull = new JButtonAccess("Pull", AccessLevel.PRIVILEGED); add(btnPull, "cell 2 0"); - btnPull.addActionListener(this); + btnPull.addActionListener(new ActionPlayers()); JButton btnKill = new JButton("Kill"); btnKill.setEnabled(false); @@ -91,9 +91,6 @@ public class PanelPlayers extends JPanelMsgHandler implements ActionListener{ public JButton getBtnTeleport() {return btnTeleport;} public JButton getBtnPull() {return btnPull;} - @Override - public void actionPerformed(ActionEvent e) {} - @Override public boolean handleMessage(Message msg, NetDataRaw rawdata) { switch(msg){ diff --git a/mcp/mobius/opis/swing/panels/PanelSummary.java b/mcp/mobius/opis/swing/panels/PanelSummary.java index 79535c0..693df25 100644 --- a/mcp/mobius/opis/swing/panels/PanelSummary.java +++ b/mcp/mobius/opis/swing/panels/PanelSummary.java @@ -38,7 +38,7 @@ import org.jfree.chart.plot.XYPlot; import org.jfree.data.xy.XYSeries; import org.jfree.data.xy.XYSeriesCollection; -public class PanelSummary extends JPanelMsgHandler implements ActionListener{ +public class PanelSummary extends JPanelMsgHandler{ private JLabel lblTimingWorldTick; private JLabel lblTimingTileEnts; private JLabel lblTimingEntities; @@ -196,9 +196,6 @@ public class PanelSummary extends JPanelMsgHandler implements ActionListener{ public JProgressBar getProgressBarRun() {return progressBarRun;} public JLabel getLblTimeStamp() {return lblTimeStamp;} - @Override - public void actionPerformed(ActionEvent e) {} - public void setProgressBar(int min, int max, int value){ if (min != -1) this.getProgressBarRun().setMinimum(min); diff --git a/mcp/mobius/opis/swing/panels/PanelTimingChunks.java b/mcp/mobius/opis/swing/panels/PanelTimingChunks.java index 20ff484..6559999 100644 --- a/mcp/mobius/opis/swing/panels/PanelTimingChunks.java +++ b/mcp/mobius/opis/swing/panels/PanelTimingChunks.java @@ -5,12 +5,12 @@ import java.awt.event.ActionListener; import mcp.mobius.opis.data.holders.stats.StatAbstract; import mcp.mobius.opis.data.holders.stats.StatsChunk; +import mcp.mobius.opis.gui.overlay.OverlayMeanTime; 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.actions.ActionCenterMap; import mcp.mobius.opis.swing.actions.ActionRunOpis; -import mcp.mobius.opis.swing.actions.ActionTeleport; +import mcp.mobius.opis.swing.actions.ActionTimingChunks; import mcp.mobius.opis.swing.widgets.JButtonAccess; import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -25,7 +25,7 @@ import javax.swing.SwingConstants; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.DefaultTableModel; -public class PanelTimingChunks extends JPanelMsgHandler implements ActionListener{ +public class PanelTimingChunks extends JPanelMsgHandler{ private JButtonAccess btnRun; private JButtonAccess btnTeleport; private JButtonAccess btnCenter; @@ -38,11 +38,11 @@ public class PanelTimingChunks extends JPanelMsgHandler implements ActionListene btnCenter = new JButtonAccess("Center Map", AccessLevel.NONE); add(btnCenter, "cell 0 0"); - btnCenter.addActionListener(new ActionCenterMap()); + btnCenter.addActionListener(new ActionTimingChunks()); btnTeleport = new JButtonAccess("Teleport", AccessLevel.PRIVILEGED); add(btnTeleport, "cell 1 0"); - btnTeleport.addActionListener(new ActionTeleport()); + btnTeleport.addActionListener(new ActionTimingChunks()); btnRun = new JButtonAccess("Run Opis", AccessLevel.PRIVILEGED); add(btnRun, "cell 3 0"); @@ -86,31 +86,6 @@ public class PanelTimingChunks extends JPanelMsgHandler implements ActionListene public JButton getBtnTeleport() {return btnTeleport;} public JButton getBtnCenter() {return btnCenter;} - @Override - public void actionPerformed(ActionEvent e) { - // RUN OPIS Button - //if (e.getSource() == this.getBtnRun()){ - // PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_START)); - //} - - // TELEPORT Button on the TimingChunk Screen - //else if ((e.getSource() == this.getBtnTeleport()) && (this.getTable().getSelectedRow() != -1)){ - // int indexData = this.getTable().convertRowIndexToModel(this.getTable().getSelectedRow()); - // StatsChunk data = DataCache.instance().getTimingChunks().get(indexData); - // PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_CHUNK, data.getChunk())); - //} - - // CENTER Button on the TimingChunk Screen - //else if ((e.getSource() == this.getBtnCenter()) && (this.getTable().getSelectedRow() != -1)){ - // int indexData = this.getTable().convertRowIndexToModel(this.getTable().getSelectedRow()); - // StatsChunk data = DataCache.instance().getTimingChunks().get(indexData); - - // OverlayMeanTime.instance().setSelectedChunk(data.getChunk().dim, data.getChunk().chunkX, data.getChunk().chunkZ); - // MwAPI.setCurrentDataProvider(OverlayMeanTime.instance()); - // Minecraft.getMinecraft().displayGuiScreen(new MwGui(Mw.instance, data.getChunk().dim, data.getChunk().x + 8, data.getChunk().z + 8)); - //} - } - @Override public boolean handleMessage(Message msg, NetDataRaw rawdata) { switch(msg){ diff --git a/mcp/mobius/opis/swing/panels/PanelTimingEntities.java b/mcp/mobius/opis/swing/panels/PanelTimingEntities.java index 185bb46..b76ba20 100644 --- a/mcp/mobius/opis/swing/panels/PanelTimingEntities.java +++ b/mcp/mobius/opis/swing/panels/PanelTimingEntities.java @@ -6,12 +6,12 @@ import java.awt.event.ActionListener; import mcp.mobius.opis.data.holders.basetypes.SerialDouble; import mcp.mobius.opis.data.holders.stats.StatAbstract; import mcp.mobius.opis.data.holders.stats.StatsEntity; +import mcp.mobius.opis.gui.overlay.entperchunk.OverlayEntityPerChunk; 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.actions.ActionCenterMap; import mcp.mobius.opis.swing.actions.ActionRunOpis; -import mcp.mobius.opis.swing.actions.ActionTeleport; +import mcp.mobius.opis.swing.actions.ActionTimingEntities; import mcp.mobius.opis.swing.widgets.JButtonAccess; import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -26,7 +26,7 @@ import javax.swing.SwingConstants; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.DefaultTableModel; -public class PanelTimingEntities extends JPanelMsgHandler implements ActionListener{ +public class PanelTimingEntities extends JPanelMsgHandler{ private JButtonAccess btnRun; private JButtonAccess btnPull; private JButtonAccess btnTeleport; @@ -41,15 +41,15 @@ public class PanelTimingEntities extends JPanelMsgHandler implements ActionListe btnCenter = new JButtonAccess("Center Map", AccessLevel.NONE); add(btnCenter, "cell 0 0"); - btnCenter.addActionListener(new ActionCenterMap()); + btnCenter.addActionListener(new ActionTimingEntities()); btnTeleport = new JButtonAccess("Teleport", AccessLevel.PRIVILEGED); add(btnTeleport, "cell 1 0"); - btnTeleport.addActionListener(new ActionTeleport()); + btnTeleport.addActionListener(new ActionTimingEntities()); btnPull = new JButtonAccess("Pull", AccessLevel.PRIVILEGED); add(btnPull, "cell 2 0"); - btnPull.addActionListener(this); + btnPull.addActionListener(new ActionTimingEntities()); btnRun = new JButtonAccess("Run Opis", AccessLevel.PRIVILEGED); add(btnRun, "cell 4 0"); @@ -98,9 +98,6 @@ public class PanelTimingEntities extends JPanelMsgHandler implements ActionListe public JButton getBtnCenter() {return btnCenter;} public JLabel getLblSummary() {return lblSummary;} - @Override - public void actionPerformed(ActionEvent e) {} - @Override public boolean handleMessage(Message msg, NetDataRaw rawdata) { switch(msg){ diff --git a/mcp/mobius/opis/swing/panels/PanelTimingHandlers.java b/mcp/mobius/opis/swing/panels/PanelTimingHandlers.java index c638799..6be6670 100644 --- a/mcp/mobius/opis/swing/panels/PanelTimingHandlers.java +++ b/mcp/mobius/opis/swing/panels/PanelTimingHandlers.java @@ -27,7 +27,7 @@ import javax.swing.table.DefaultTableModel; import cpw.mods.fml.common.network.PacketDispatcher; -public class PanelTimingHandlers extends JPanelMsgHandler implements ActionListener{ +public class PanelTimingHandlers extends JPanelMsgHandler{ private JButtonAccess btnRun; private JLabel lblSummary; @@ -82,14 +82,6 @@ public class PanelTimingHandlers extends JPanelMsgHandler implements ActionListe public JButton getBtnRun() {return btnRun;} public JLabel getLblSummary(){return lblSummary;} - @Override - public void actionPerformed(ActionEvent e) { - // RUN OPIS Button - if (e.getSource() == this.getBtnRun()){ - PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_START)); - } - } - @Override public boolean handleMessage(Message msg, NetDataRaw rawdata) { switch(msg){ diff --git a/mcp/mobius/opis/swing/panels/PanelTimingTileEnts.java b/mcp/mobius/opis/swing/panels/PanelTimingTileEnts.java index a56d0d8..8c70aef 100644 --- a/mcp/mobius/opis/swing/panels/PanelTimingTileEnts.java +++ b/mcp/mobius/opis/swing/panels/PanelTimingTileEnts.java @@ -8,13 +8,13 @@ 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; +import mcp.mobius.opis.gui.overlay.OverlayMeanTime; import mcp.mobius.opis.helpers.ModIdentification; 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.actions.ActionCenterMap; import mcp.mobius.opis.swing.actions.ActionRunOpis; -import mcp.mobius.opis.swing.actions.ActionTeleport; +import mcp.mobius.opis.swing.actions.ActionTimingTileEnts; import mcp.mobius.opis.swing.widgets.JButtonAccess; import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -30,7 +30,7 @@ import javax.swing.SwingConstants; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.DefaultTableModel; -public class PanelTimingTileEnts extends JPanelMsgHandler implements ActionListener{ +public class PanelTimingTileEnts extends JPanelMsgHandler{ private JButtonAccess btnCenter; private JButtonAccess btnTeleport; private JButtonAccess btnReset; @@ -45,16 +45,16 @@ public class PanelTimingTileEnts extends JPanelMsgHandler implements ActionListe btnCenter = new JButtonAccess("Center Map", AccessLevel.NONE); add(btnCenter, "cell 0 0"); - btnCenter.addActionListener(new ActionCenterMap()); + btnCenter.addActionListener(new ActionTimingTileEnts()); btnTeleport = new JButtonAccess("Teleport", AccessLevel.PRIVILEGED); add(btnTeleport, "cell 1 0"); - btnTeleport.addActionListener(new ActionTeleport()); + btnTeleport.addActionListener(new ActionTimingTileEnts()); btnReset = new JButtonAccess("Reset Highlight", AccessLevel.PRIVILEGED); btnReset.setEnabled(false); add(btnReset, "cell 2 0"); - btnReset.addActionListener(this); + btnReset.addActionListener(new ActionTimingTileEnts()); btnRun = new JButtonAccess("Run Opis", AccessLevel.PRIVILEGED); add(btnRun, "cell 4 0"); @@ -103,9 +103,6 @@ public class PanelTimingTileEnts extends JPanelMsgHandler implements ActionListe public JButton getBtnRun() {return btnRun;} public JLabel getLblSummary() {return lblSummary;} - @Override - public void actionPerformed(ActionEvent e) {} - @Override public boolean handleMessage(Message msg, NetDataRaw rawdata) { switch(msg){