Tabs are now dynamically added at runtime by the client Proxy.

They can be registered and will be displayed in the order requested.
They can be retrieved by a name provided using the ITabPanel interface.
This commit is contained in:
ProfMobius committed 2014-03-31 17:07:00 +02:00
1 parent 7c97b0891d
commit 486abcb4bb
18 files changed
+258 -86

No files matched your search

+6
View File
@@ -0,0 +1,6 @@
package mcp.mobius.opis.api;
public interface ITabPanel {
String getTabTitle();
String getTabRefName();
}
@@ -8,10 +8,8 @@ import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.server.NetDataRaw;
public class MessageHandlerRegistrar {
private static MessageHandlerRegistrar _instance = new MessageHandlerRegistrar();
private MessageHandlerRegistrar(){};
public static MessageHandlerRegistrar instance(){return _instance;}
public enum MessageHandlerRegistrar {
INSTANCE;
private HashMap<Message, HashSet<IMessageHandler>> msgHandlers = new HashMap<Message, HashSet<IMessageHandler>>();
@@ -0,0 +1,34 @@
package mcp.mobius.opis.api;
import java.util.ArrayList;
import java.util.HashMap;
import javax.swing.JPanel;
import mcp.mobius.opis.swing.SwingUI;
public enum TabPanelRegistrar {
INSTANCE;
private ArrayList<ITabPanel> panels = new ArrayList<ITabPanel>();
private HashMap<String, ITabPanel> lookup = new HashMap<String, ITabPanel>();
public ITabPanel registerTab(ITabPanel panel){
this.panels.add(panel);
this.lookup.put(panel.getTabRefName(), panel);
SwingUI.instance().getTabbedPane().addTab(panel.getTabTitle(), (JPanel)panel);
return panel;
}
public ITabPanel getTab(String refname){
return lookup.get(refname);
}
public JPanel getTabAsPanel(String refname){
return (JPanel)lookup.get(refname);
}
public ArrayList<ITabPanel> getTabs(){
return this.panels;
}
}
@@ -105,17 +105,17 @@ public class OpisPacketHandler implements IPacketHandler {
else if (header == Packets.NETDATACOMMAND){
NetDataRaw rawdata = new NetDataCommand(packet);
MessageHandlerRegistrar.instance().routeMessage(rawdata.msg, rawdata);
MessageHandlerRegistrar.INSTANCE.routeMessage(rawdata.msg, rawdata);
}
else if (header == Packets.NETDATALIST){
NetDataRaw rawdata = new NetDataList(packet);
MessageHandlerRegistrar.instance().routeMessage(rawdata.msg, rawdata);
MessageHandlerRegistrar.INSTANCE.routeMessage(rawdata.msg, rawdata);
}
else if (header == Packets.NETDATAVALUE){
NetDataRaw rawdata = new NetDataValue(packet);
MessageHandlerRegistrar.instance().routeMessage(rawdata.msg, rawdata);
MessageHandlerRegistrar.INSTANCE.routeMessage(rawdata.msg, rawdata);
}
}
+67 -52
View File
@@ -13,6 +13,7 @@ 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.api.TabPanelRegistrar;
import mcp.mobius.opis.data.client.DataCache;
import mcp.mobius.opis.data.holders.stats.StatsChunk;
import mcp.mobius.opis.data.holders.stats.StatsEntity;
@@ -31,7 +32,13 @@ 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.PanelAmountEntities;
import mcp.mobius.opis.swing.panels.PanelPlayers;
import mcp.mobius.opis.swing.panels.PanelSummary;
import mcp.mobius.opis.swing.panels.PanelTimingChunks;
import mcp.mobius.opis.swing.panels.PanelTimingEntities;
import mcp.mobius.opis.swing.panels.PanelTimingHandlers;
import mcp.mobius.opis.swing.panels.PanelTimingTileEnts;
public class ProxyClient extends ProxyServer implements IMessageHandler{
@@ -53,68 +60,76 @@ public class ProxyClient extends ProxyServer implements IMessageHandler{
//fontMC24 = Fonts.createFont(new ResourceLocation("opis", "fonts/Minecraftia.ttf"), 24, true);
//fontMC8 = Fonts.loadSystemFont("Monospace", 12, true, Font.TRUETYPE_FONT | Font.BOLD);
fontMC8 = Fonts.createFont(new ResourceLocation("opis", "fonts/LiberationMono-Bold.ttf"), 14, true);
IMessageHandler panelSummary = (IMessageHandler)TabPanelRegistrar.INSTANCE.registerTab(new PanelSummary());
IMessageHandler panelPlayers = (IMessageHandler)TabPanelRegistrar.INSTANCE.registerTab(new PanelPlayers());
IMessageHandler panelAmountEntities = (IMessageHandler)TabPanelRegistrar.INSTANCE.registerTab(new PanelAmountEntities());
IMessageHandler panelTimingTileEnts = (IMessageHandler)TabPanelRegistrar.INSTANCE.registerTab(new PanelTimingTileEnts());
IMessageHandler panelTimingEntities = (IMessageHandler)TabPanelRegistrar.INSTANCE.registerTab(new PanelTimingEntities());
IMessageHandler panelTimingHandlers = (IMessageHandler)TabPanelRegistrar.INSTANCE.registerTab(new PanelTimingHandlers());
IMessageHandler panelTimingChunks = (IMessageHandler)TabPanelRegistrar.INSTANCE.registerTab(new PanelTimingChunks());
MessageHandlerRegistrar.instance().registerHandler(Message.LIST_PLAYERS, SwingUI.instance().getPanelPlayers());
MessageHandlerRegistrar.instance().registerHandler(Message.LIST_AMOUNT_ENTITIES, SwingUI.instance().getPanelAmountEntities());
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_PLAYERS, panelPlayers);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_AMOUNT_ENTITIES, panelAmountEntities);
MessageHandlerRegistrar.instance().registerHandler(Message.LIST_TIMING_TILEENTS, SwingUI.instance().getPanelTimingTileEnts());
MessageHandlerRegistrar.instance().registerHandler(Message.VALUE_TIMING_TILEENTS, SwingUI.instance().getPanelTimingTileEnts());
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_TILEENTS, panelTimingTileEnts);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.VALUE_TIMING_TILEENTS, panelTimingTileEnts);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_START, panelTimingTileEnts);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_STOP, panelTimingTileEnts);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_RUNNING, panelTimingTileEnts);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.CLIENT_HIGHLIGHT_BLOCK,panelTimingTileEnts);
MessageHandlerRegistrar.instance().registerHandler(Message.LIST_TIMING_ENTITIES, SwingUI.instance().getPanelTimingEntities());
MessageHandlerRegistrar.instance().registerHandler(Message.VALUE_TIMING_ENTITIES, SwingUI.instance().getPanelTimingEntities());
MessageHandlerRegistrar.instance().registerHandler(Message.STATUS_START, SwingUI.instance().getPanelTimingEntities());
MessageHandlerRegistrar.instance().registerHandler(Message.STATUS_STOP, SwingUI.instance().getPanelTimingEntities());
MessageHandlerRegistrar.instance().registerHandler(Message.STATUS_RUNNING, SwingUI.instance().getPanelTimingEntities());
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_TIMING_ENTITIES, panelTimingEntities);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.VALUE_TIMING_ENTITIES, panelTimingEntities);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_START, panelTimingEntities);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_STOP, panelTimingEntities);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_RUNNING, panelTimingEntities);
MessageHandlerRegistrar.instance().registerHandler(Message.LIST_TIMING_HANDLERS, SwingUI.instance().getPanelTimingHandlers());
MessageHandlerRegistrar.instance().registerHandler(Message.VALUE_TIMING_HANDLERS, SwingUI.instance().getPanelTimingHandlers());
MessageHandlerRegistrar.instance().registerHandler(Message.STATUS_START, SwingUI.instance().getPanelTimingHandlers());
MessageHandlerRegistrar.instance().registerHandler(Message.STATUS_STOP, SwingUI.instance().getPanelTimingHandlers());
MessageHandlerRegistrar.instance().registerHandler(Message.STATUS_RUNNING, SwingUI.instance().getPanelTimingHandlers());
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_TIMING_HANDLERS, panelTimingHandlers);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.VALUE_TIMING_HANDLERS, panelTimingHandlers);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_START, panelTimingHandlers);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_STOP, panelTimingHandlers);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_RUNNING, panelTimingHandlers);
MessageHandlerRegistrar.instance().registerHandler(Message.LIST_TIMING_CHUNK, SwingUI.instance().getPanelTimingChunks());
MessageHandlerRegistrar.instance().registerHandler(Message.STATUS_START, SwingUI.instance().getPanelTimingChunks());
MessageHandlerRegistrar.instance().registerHandler(Message.STATUS_STOP, SwingUI.instance().getPanelTimingChunks());
MessageHandlerRegistrar.instance().registerHandler(Message.STATUS_RUNNING, SwingUI.instance().getPanelTimingChunks());
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_TIMING_CHUNK, panelTimingChunks);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_START, panelTimingChunks);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_STOP, panelTimingChunks);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_RUNNING, panelTimingChunks);
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.CLIENT_SHOW_SWING, SwingUI.instance());
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.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());
MessageHandlerRegistrar.instance().registerHandler(Message.VALUE_AMOUNT_HANDLERS, SwingUI.instance().getPanelSummary());
MessageHandlerRegistrar.instance().registerHandler(Message.VALUE_AMOUNT_UPLOAD, SwingUI.instance().getPanelSummary());
MessageHandlerRegistrar.instance().registerHandler(Message.VALUE_AMOUNT_DOWNLOAD, SwingUI.instance().getPanelSummary());
MessageHandlerRegistrar.instance().registerHandler(Message.VALUE_TIMING_TICK, SwingUI.instance().getPanelSummary());
MessageHandlerRegistrar.instance().registerHandler(Message.VALUE_CHUNK_FORCED, SwingUI.instance().getPanelSummary());
MessageHandlerRegistrar.instance().registerHandler(Message.VALUE_CHUNK_LOADED, SwingUI.instance().getPanelSummary());
MessageHandlerRegistrar.instance().registerHandler(Message.VALUE_TIMING_TILEENTS, SwingUI.instance().getPanelSummary());
MessageHandlerRegistrar.instance().registerHandler(Message.VALUE_TIMING_ENTITIES, SwingUI.instance().getPanelSummary());
MessageHandlerRegistrar.instance().registerHandler(Message.VALUE_TIMING_HANDLERS, SwingUI.instance().getPanelSummary());
MessageHandlerRegistrar.instance().registerHandler(Message.VALUE_TIMING_WORLDTICK, SwingUI.instance().getPanelSummary());
MessageHandlerRegistrar.instance().registerHandler(Message.STATUS_START, SwingUI.instance().getPanelSummary());
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.VALUE_TIMING_ENTUPDATE, SwingUI.instance().getPanelSummary());
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.VALUE_AMOUNT_TILEENTS, panelSummary);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.VALUE_AMOUNT_ENTITIES, panelSummary);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.VALUE_AMOUNT_HANDLERS, panelSummary);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.VALUE_AMOUNT_UPLOAD, panelSummary);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.VALUE_AMOUNT_DOWNLOAD, panelSummary);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.VALUE_TIMING_TICK, panelSummary);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.VALUE_CHUNK_FORCED, panelSummary);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.VALUE_CHUNK_LOADED, panelSummary);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.VALUE_TIMING_TILEENTS, panelSummary);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.VALUE_TIMING_ENTITIES, panelSummary);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.VALUE_TIMING_HANDLERS, panelSummary);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.VALUE_TIMING_WORLDTICK, panelSummary);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_START, panelSummary);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_STOP, panelSummary);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_RUN_UPDATE, panelSummary);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_RUNNING, panelSummary);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_TIME_LAST_RUN, panelSummary);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.VALUE_TIMING_ENTUPDATE, panelSummary);
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);
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);
MessageHandlerRegistrar.instance().registerHandler(Message.LIST_CHUNK_ENTITIES, OverlayEntityPerChunk.instance());
MessageHandlerRegistrar.instance().registerHandler(Message.LIST_CHUNK_TILEENTS, OverlayMeanTime.instance());
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_CHUNK_ENTITIES, OverlayEntityPerChunk.instance());
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_CHUNK_TILEENTS, OverlayMeanTime.instance());
MessageHandlerRegistrar.instance().registerHandler(Message.LIST_TIMING_CHUNK, ChunkManager.instance());
MessageHandlerRegistrar.instance().registerHandler(Message.LIST_CHUNK_LOADED, ChunkManager.instance());
MessageHandlerRegistrar.instance().registerHandler(Message.LIST_CHUNK_LOADED_CLEAR, ChunkManager.instance());
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_TIMING_CHUNK, ChunkManager.instance());
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_CHUNK_LOADED, ChunkManager.instance());
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_CHUNK_LOADED_CLEAR, ChunkManager.instance());
}
@Override
+23 -2
View File
@@ -8,13 +8,17 @@ import javax.swing.JPanel;
import javax.swing.JTabbedPane;
import javax.swing.WindowConstants;
import javax.swing.border.EmptyBorder;
import java.awt.event.WindowEvent;
import java.awt.event.WindowListener;
import java.util.HashSet;
import javax.swing.SwingConstants;
import cpw.mods.fml.common.network.PacketDispatcher;
import mcp.mobius.opis.api.IMessageHandler;
import mcp.mobius.opis.api.ITabPanel;
import mcp.mobius.opis.api.TabPanelRegistrar;
import mcp.mobius.opis.data.holders.basetypes.SerialInt;
import mcp.mobius.opis.network.enums.AccessLevel;
import mcp.mobius.opis.network.enums.Message;
@@ -39,7 +43,10 @@ public class SwingUI extends JFrame implements WindowListener, IMessageHandler{
}
private JPanel contentPane;
private JTabbedPane tabbedPane;
/*
private PanelSummary panelSummary;
private PanelPlayers panelPlayers;
private PanelAmountEntities panelAmountEntities;
@@ -47,6 +54,7 @@ public class SwingUI extends JFrame implements WindowListener, IMessageHandler{
private PanelTimingEntities panelTimingEntities;
private PanelTimingHandlers panelTimingHandlers;
private PanelTimingChunks panelTimingChunks;
*/
public void showUI(){
EventQueue.invokeLater(new Runnable() {
@@ -73,9 +81,16 @@ public class SwingUI extends JFrame implements WindowListener, IMessageHandler{
contentPane.setLayout(new BorderLayout(0, 0));
setContentPane(contentPane);
JTabbedPane tabbedPane = new JTabbedPane(SwingConstants.TOP);
tabbedPane = new JTabbedPane(SwingConstants.TOP);
contentPane.add(tabbedPane, BorderLayout.CENTER);
/*
for (ITabPanel panel : TabPanelRegistrar.INSTANCE.getTabs()){
tabbedPane.addTab(panel.getTabTitle(), (JPanel)panel);
}
*/
/*
panelSummary = new PanelSummary();
tabbedPane.addTab("Summary", null, panelSummary, null);
@@ -96,6 +111,7 @@ public class SwingUI extends JFrame implements WindowListener, IMessageHandler{
panelTimingChunks = new PanelTimingChunks();
tabbedPane.addTab("Chunks timing", null, panelTimingChunks, null);
*/
this.addWindowListener(this);
}
@@ -123,7 +139,11 @@ public class SwingUI extends JFrame implements WindowListener, IMessageHandler{
@Override
public void windowOpened(WindowEvent arg0) {}
public JTabbedPane getTabbedPane() {
return tabbedPane;
}
/*
public PanelTimingChunks getPanelTimingChunks() {
return panelTimingChunks;
}
@@ -145,6 +165,7 @@ public class SwingUI extends JFrame implements WindowListener, IMessageHandler{
public PanelSummary getPanelSummary() {
return panelSummary;
}
*/
@Override
public boolean handleMessage(Message msg, NetDataRaw rawdata) {
@@ -8,11 +8,13 @@ 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.SwingUI;
import mcp.mobius.opis.swing.panels.PanelAmountEntities;
import mcp.mobius.opis.swing.widgets.JTableStats;
import javax.swing.JButton;
import cpw.mods.fml.common.network.PacketDispatcher;
import mcp.mobius.opis.api.TabPanelRegistrar;
import mcp.mobius.opis.data.holders.basetypes.AmountHolder;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
import mcp.mobius.opis.data.holders.basetypes.SerialString;
@@ -24,17 +26,20 @@ public class ActionAmountEntities implements ActionListener, ItemListener {
@Override
public void actionPerformed(ActionEvent e) {
JTableStats table = SwingUI.instance().getPanelAmountEntities().getTable();
PanelAmountEntities panel = (PanelAmountEntities)TabPanelRegistrar.INSTANCE.getTab("opis.amountents");
JTableStats table = panel.getTable();
if (table == null || table.getSelectedRow() == -1) return;
int indexData = table.convertRowIndexToModel(table.getSelectedRow());
AmountHolder data = (AmountHolder)table.getStatistics().get(indexData);
if (e.getSource() == SwingUI.instance().getPanelAmountEntities().getBtnKillAll()){
if (e.getSource() == panel.getBtnKillAll()){
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_KILLALL, new SerialString(data.key)));
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_AMOUNT_ENTITIES));
}
if (e.getSource() == SwingUI.instance().getPanelAmountEntities().getBtnRefresh()){
if (e.getSource() == panel.getBtnRefresh()){
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_AMOUNT_ENTITIES));
}
@@ -11,11 +11,13 @@ import mapwriter.gui.MwGui;
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.swing.panels.PanelPlayers;
import mcp.mobius.opis.swing.widgets.JTableStats;
import javax.swing.JButton;
import cpw.mods.fml.common.network.PacketDispatcher;
import mcp.mobius.opis.api.TabPanelRegistrar;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
import mcp.mobius.opis.data.holders.basetypes.TargetEntity;
import mcp.mobius.opis.data.holders.stats.StatAbstract;
@@ -29,12 +31,14 @@ public class ActionPlayers implements ActionListener {
@Override
public void actionPerformed(ActionEvent e) {
JTableStats table = SwingUI.instance().getPanelPlayers().getTable();
PanelPlayers panel = (PanelPlayers)TabPanelRegistrar.INSTANCE.getTab("opis.players");
JTableStats table = panel.getTable();
if (table == null || table.getSelectedRow() == -1) return;
int indexData = table.convertRowIndexToModel(table.getSelectedRow());
StatsPlayer data = (StatsPlayer)table.getStatistics().get(indexData);
if (e.getSource() == SwingUI.instance().getPanelPlayers().getBtnCenter()){
if (e.getSource() == panel.getBtnCenter()){
CoordinatesBlock coord = data.getCoordinates();
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.OVERLAY_CHUNK_ENTITIES));
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_CHUNK_ENTITIES, data.getChunk()));
@@ -43,14 +47,14 @@ public class ActionPlayers implements ActionListener {
Minecraft.getMinecraft().displayGuiScreen(new MwGui(Mw.instance, coord.dim, coord.x, coord.z));
}
if (e.getSource() == SwingUI.instance().getPanelPlayers().getBtnTeleport()){
if (e.getSource() == panel.getBtnTeleport()){
int eid = data.getEID();
int dim = data.getCoordinates().dim;
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_TO_ENTITY, new TargetEntity(eid, dim)));
Minecraft.getMinecraft().setIngameFocus();
}
if (e.getSource() == SwingUI.instance().getPanelPlayers().getBtnPull()){
if (e.getSource() == panel.getBtnPull()){
int eid = data.getEID();
int dim = data.getCoordinates().dim;
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_PULL_ENTITY, new TargetEntity(eid, dim)));
@@ -11,11 +11,13 @@ import mapwriter.gui.MwGui;
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.swing.panels.PanelTimingChunks;
import mcp.mobius.opis.swing.widgets.JTableStats;
import javax.swing.JButton;
import cpw.mods.fml.common.network.PacketDispatcher;
import mcp.mobius.opis.api.TabPanelRegistrar;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
import mcp.mobius.opis.data.holders.stats.StatAbstract;
import mcp.mobius.opis.data.holders.stats.StatsChunk;
@@ -28,18 +30,20 @@ public class ActionTimingChunks implements ActionListener {
@Override
public void actionPerformed(ActionEvent e) {
JTableStats table = SwingUI.instance().getPanelTimingChunks().getTable();
PanelTimingChunks panel = (PanelTimingChunks)TabPanelRegistrar.INSTANCE.getTab("opis.timingchunks");
JTableStats table = panel.getTable();
if (table == null || table.getSelectedRow() == -1) return;
int indexData = table.convertRowIndexToModel(table.getSelectedRow());
StatsChunk data = (StatsChunk)table.getStatistics().get(indexData);
if (e.getSource() == SwingUI.instance().getPanelTimingChunks().getBtnCenter()){
if (e.getSource() == panel.getBtnCenter()){
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));
}
if (e.getSource() == SwingUI.instance().getPanelTimingChunks().getBtnTeleport()){
if (e.getSource() == panel.getBtnTeleport()){
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_CHUNK, data.getChunk()));
}
}
@@ -11,11 +11,13 @@ import mapwriter.gui.MwGui;
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.swing.panels.PanelTimingEntities;
import mcp.mobius.opis.swing.widgets.JTableStats;
import javax.swing.JButton;
import cpw.mods.fml.common.network.PacketDispatcher;
import mcp.mobius.opis.api.TabPanelRegistrar;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
import mcp.mobius.opis.data.holders.basetypes.TargetEntity;
import mcp.mobius.opis.data.holders.stats.StatAbstract;
@@ -29,12 +31,14 @@ public class ActionTimingEntities implements ActionListener {
@Override
public void actionPerformed(ActionEvent e) {
JTableStats table = SwingUI.instance().getPanelTimingEntities().getTable();
PanelTimingEntities panel = (PanelTimingEntities)TabPanelRegistrar.INSTANCE.getTab("opis.timingents");
JTableStats table = panel.getTable();
if (table == null || table.getSelectedRow() == -1) return;
int indexData = table.convertRowIndexToModel(table.getSelectedRow());
StatsEntity data = (StatsEntity)table.getStatistics().get(indexData);
if (e.getSource() == SwingUI.instance().getPanelTimingEntities().getBtnCenter()){
if (e.getSource() == panel.getBtnCenter()){
CoordinatesBlock coord = data.getCoordinates();
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.OVERLAY_CHUNK_ENTITIES));
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_CHUNK_ENTITIES, data.getChunk()));
@@ -43,14 +47,14 @@ public class ActionTimingEntities implements ActionListener {
Minecraft.getMinecraft().displayGuiScreen(new MwGui(Mw.instance, coord.dim, coord.x, coord.z));
}
if (e.getSource() == SwingUI.instance().getPanelTimingEntities().getBtnTeleport()){
if (e.getSource() == panel.getBtnTeleport()){
int eid = data.getID();
int dim = data.getCoordinates().dim;
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_TO_ENTITY, new TargetEntity(eid, dim)));
Minecraft.getMinecraft().setIngameFocus();
}
if (e.getSource() == SwingUI.instance().getPanelTimingEntities().getBtnPull()){
if (e.getSource() == panel.getBtnPull()){
int eid = data.getID();
int dim = data.getCoordinates().dim;
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_PULL_ENTITY, new TargetEntity(eid, dim)));
@@ -12,11 +12,13 @@ import mcp.mobius.opis.modOpis;
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.swing.panels.PanelTimingTileEnts;
import mcp.mobius.opis.swing.widgets.JTableStats;
import javax.swing.JButton;
import cpw.mods.fml.common.network.PacketDispatcher;
import mcp.mobius.opis.api.TabPanelRegistrar;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
import mcp.mobius.opis.data.holders.stats.StatAbstract;
import mcp.mobius.opis.data.holders.stats.StatsTileEntity;
@@ -29,26 +31,28 @@ public class ActionTimingTileEnts implements ActionListener {
@Override
public void actionPerformed(ActionEvent e) {
JTableStats table = SwingUI.instance().getPanelTimingTileEnts().getTable();
PanelTimingTileEnts panel = (PanelTimingTileEnts)TabPanelRegistrar.INSTANCE.getTab("opis.timingtileents");
JTableStats table = panel.getTable();
if (table == null || table.getSelectedRow() == -1) return;
int indexData = table.convertRowIndexToModel(table.getSelectedRow());
StatsTileEntity data = (StatsTileEntity)table.getStatistics().get(indexData);
if (e.getSource() == SwingUI.instance().getPanelTimingTileEnts().getBtnCenter()){
if (e.getSource() == panel.getBtnCenter()){
CoordinatesBlock coord = data.getCoordinates();
OverlayMeanTime.instance().setSelectedChunk(coord.dim, coord.x >> 4, coord.z >> 4);
MwAPI.setCurrentDataProvider(OverlayMeanTime.instance());
Minecraft.getMinecraft().displayGuiScreen(new MwGui(Mw.instance, coord.dim, coord.x, coord.z));
}
if (e.getSource() == SwingUI.instance().getPanelTimingTileEnts().getBtnTeleport()){
if (e.getSource() == panel.getBtnTeleport()){
CoordinatesBlock coord = data.getCoordinates();
modOpis.selectedBlock = coord;
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_BLOCK, coord));
Minecraft.getMinecraft().setIngameFocus();
}
if (e.getSource() == SwingUI.instance().getPanelTimingTileEnts().getBtnReset()){
if (e.getSource() == panel.getBtnReset()){
modOpis.selectedBlock = null;
}
}
@@ -5,6 +5,7 @@ import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import mcp.mobius.opis.api.ITabPanel;
import mcp.mobius.opis.data.holders.basetypes.AmountHolder;
import mcp.mobius.opis.network.enums.AccessLevel;
import mcp.mobius.opis.network.enums.Message;
@@ -25,7 +26,7 @@ import javax.swing.SwingConstants;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.DefaultTableModel;
public class PanelAmountEntities extends JPanelMsgHandler{
public class PanelAmountEntities extends JPanelMsgHandler implements ITabPanel{
private JCheckBox chckbxFilter;
private JButtonAccess btnKillAll;
private JButtonAccess btnRefresh;
@@ -117,4 +118,14 @@ public class PanelAmountEntities extends JPanelMsgHandler{
}
return true;
}
@Override
public String getTabTitle() {
return "Entities amount";
}
@Override
public String getTabRefName() {
return "opis.amountents";
}
}
+12 -1
View File
@@ -3,6 +3,7 @@ package mcp.mobius.opis.swing.panels;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import mcp.mobius.opis.api.ITabPanel;
import mcp.mobius.opis.data.holders.stats.StatsPlayer;
import mcp.mobius.opis.gui.overlay.entperchunk.OverlayEntityPerChunk;
import mcp.mobius.opis.network.enums.AccessLevel;
@@ -22,7 +23,7 @@ import javax.swing.SwingConstants;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.DefaultTableModel;
public class PanelPlayers extends JPanelMsgHandler{
public class PanelPlayers extends JPanelMsgHandler implements ITabPanel{
private JButtonAccess btnCenter;
private JButtonAccess btnTeleport;
private JButtonAccess btnPull;
@@ -122,4 +123,14 @@ public class PanelPlayers extends JPanelMsgHandler{
return true;
}
@Override
public String getTabTitle() {
return "Players";
}
@Override
public String getTabRefName() {
return "opis.players";
}
}
+12 -1
View File
@@ -9,6 +9,7 @@ import java.util.Date;
import javax.swing.JPanel;
import mcp.mobius.opis.api.ITabPanel;
import mcp.mobius.opis.data.client.DataCache;
import mcp.mobius.opis.data.holders.ISerializable;
import mcp.mobius.opis.data.holders.basetypes.SerialDouble;
@@ -38,7 +39,7 @@ import org.jfree.chart.plot.XYPlot;
import org.jfree.data.xy.XYSeries;
import org.jfree.data.xy.XYSeriesCollection;
public class PanelSummary extends JPanelMsgHandler{
public class PanelSummary extends JPanelMsgHandler implements ITabPanel{
private JLabel lblTimingWorldTick;
private JLabel lblTimingTileEnts;
private JLabel lblTimingEntities;
@@ -367,4 +368,14 @@ public class PanelSummary extends JPanelMsgHandler{
}
return true;
}
@Override
public String getTabTitle() {
return "Summary";
}
@Override
public String getTabRefName() {
return "opis.summary";
}
}
@@ -3,6 +3,7 @@ package mcp.mobius.opis.swing.panels;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import mcp.mobius.opis.api.ITabPanel;
import mcp.mobius.opis.data.holders.stats.StatAbstract;
import mcp.mobius.opis.data.holders.stats.StatsChunk;
import mcp.mobius.opis.gui.overlay.OverlayMeanTime;
@@ -25,7 +26,7 @@ import javax.swing.SwingConstants;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.DefaultTableModel;
public class PanelTimingChunks extends JPanelMsgHandler{
public class PanelTimingChunks extends JPanelMsgHandler implements ITabPanel{
private JButtonAccess btnRun;
private JButtonAccess btnTeleport;
private JButtonAccess btnCenter;
@@ -128,4 +129,14 @@ public class PanelTimingChunks extends JPanelMsgHandler{
}
return true;
}
@Override
public String getTabTitle() {
return "Chunks timing";
}
@Override
public String getTabRefName() {
return "opis.timingchunks";
}
}
@@ -3,6 +3,7 @@ package mcp.mobius.opis.swing.panels;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import mcp.mobius.opis.api.ITabPanel;
import mcp.mobius.opis.data.holders.basetypes.SerialDouble;
import mcp.mobius.opis.data.holders.stats.StatAbstract;
import mcp.mobius.opis.data.holders.stats.StatsEntity;
@@ -26,7 +27,7 @@ import javax.swing.SwingConstants;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.DefaultTableModel;
public class PanelTimingEntities extends JPanelMsgHandler{
public class PanelTimingEntities extends JPanelMsgHandler implements ITabPanel{
private JButtonAccess btnRun;
private JButtonAccess btnPull;
private JButtonAccess btnTeleport;
@@ -144,4 +145,14 @@ public class PanelTimingEntities extends JPanelMsgHandler{
}
return true;
}
@Override
public String getTabTitle() {
return "Entities timing";
}
@Override
public String getTabRefName() {
return "opis.timingents";
}
}
@@ -3,6 +3,7 @@ package mcp.mobius.opis.swing.panels;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import mcp.mobius.opis.api.ITabPanel;
import mcp.mobius.opis.data.holders.basetypes.SerialDouble;
import mcp.mobius.opis.data.holders.stats.StatAbstract;
import mcp.mobius.opis.data.holders.stats.StatsTickHandler;
@@ -27,7 +28,7 @@ import javax.swing.table.DefaultTableModel;
import cpw.mods.fml.common.network.PacketDispatcher;
public class PanelTimingHandlers extends JPanelMsgHandler{
public class PanelTimingHandlers extends JPanelMsgHandler implements ITabPanel{
private JButtonAccess btnRun;
private JLabel lblSummary;
@@ -123,4 +124,14 @@ public class PanelTimingHandlers extends JPanelMsgHandler{
}
return true;
}
@Override
public String getTabTitle() {
return "Handlers timing";
}
@Override
public String getTabRefName() {
return "opis.timinghandlers";
}
}
@@ -4,6 +4,7 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.api.ITabPanel;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
import mcp.mobius.opis.data.holders.basetypes.SerialDouble;
import mcp.mobius.opis.data.holders.stats.StatAbstract;
@@ -30,7 +31,7 @@ import javax.swing.SwingConstants;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.DefaultTableModel;
public class PanelTimingTileEnts extends JPanelMsgHandler{
public class PanelTimingTileEnts extends JPanelMsgHandler implements ITabPanel{
private JButtonAccess btnCenter;
private JButtonAccess btnTeleport;
private JButtonAccess btnReset;
@@ -164,4 +165,14 @@ public class PanelTimingTileEnts extends JPanelMsgHandler{
}
return true;
}
@Override
public String getTabTitle() {
return "TileEntities timing";
}
@Override
public String getTabRefName() {
return "opis.timingtileents";
}
}