First shoot at Swing.

This commit is contained in:
ProfMobius committed 2014-03-17 23:21:50 +01:00
1 parent ab7823230a
commit f5243d02c3
10 files changed
+380 -54

No files matched your search

@@ -0,0 +1,38 @@
package mcp.mobius.opis.commands.client;
import javax.swing.JFrame;
import javax.swing.JLabel;
import mcp.mobius.opis.network.ClientCommand;
import mcp.mobius.opis.network.server.Packet_ClientCommand;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.player.EntityPlayerMP;
public class CommandOpis extends CommandBase {
@Override
public String getCommandName() {
return "opis";
}
@Override
public String getCommandUsage(ICommandSender icommandsender) {
return "";
}
@Override
public void processCommand(ICommandSender icommandsender, String[] astring) {
((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_ClientCommand.create(ClientCommand.SHOW_SWING));
}
@Override
public int getRequiredPermissionLevel(){
return 0;
}
@Override
public boolean canCommandSenderUseCommand(ICommandSender sender){
return true;
}
}
@@ -49,7 +49,7 @@ public class CommandAmountEntities extends CommandBase implements IOpisCommand{
}
}
@Override
public int getRequiredPermissionLevel()
{
@@ -1,50 +0,0 @@
package mcp.mobius.opis.commands.server;
import javax.swing.JFrame;
import javax.swing.JLabel;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
public class CommandOpis extends CommandBase {
@Override
public String getCommandName() {
return "opis";
}
@Override
public String getCommandUsage(ICommandSender icommandsender) {
return "";
}
@Override
public void processCommand(ICommandSender icommandsender, String[] astring) {
showUI();
}
private static void createAndShowGUI() {
//Create and set up the window.
JFrame frame = new JFrame("HelloWorldSwing");
frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
//Add the ubiquitous "Hello World" label.
JLabel label = new JLabel("Hello World");
frame.getContentPane().add(label);
//Display the window.
frame.pack();
frame.setVisible(true);
}
public static void showUI() {
//Schedule a job for the event-dispatching thread:
//creating and showing this application's GUI.
javax.swing.SwingUtilities.invokeLater(new Runnable() {
public void run() {
createAndShowGUI();
}
});
}
}
@@ -0,0 +1,55 @@
package mcp.mobius.opis.data.client;
import java.util.HashMap;
import javax.swing.table.DefaultTableModel;
import mcp.mobius.opis.gui.swing.SwingUI;
public class DataCache {
private static DataCache _instance = new DataCache();
public static DataCache instance() { return _instance; };
private HashMap<String, Integer> amountEntities = new HashMap<String, Integer>();
public void setAmountEntities(HashMap<String, Integer> stats){
this.amountEntities = stats;
DefaultTableModel model = new DefaultTableModel(
new Object[][] {
{null, null},
},
new String[] {
"Type", "Amount"
}
) {
Class[] columnTypes = new Class[] {
String.class, Integer.class
};
public Class getColumnClass(int columnIndex) {
return columnTypes[columnIndex];
}
};
for (int i = 0; i < model.getRowCount(); i++)
model.removeRow(i);
int totalEntities = 0;
for (String type : DataCache.instance().getAmountEntities().keySet()){
model.addRow(new Object[] {type, DataCache.instance().getAmountEntities().get(type)});
totalEntities += DataCache.instance().getAmountEntities().get(type);
}
SwingUI.instance().getTableEntityList().setModel(model);
SwingUI.instance().getLabelAmountValue().setText(String.valueOf(totalEntities));
model.fireTableDataChanged();
}
public HashMap<String, Integer> getAmountEntities(){
return this.amountEntities;
}
}
+259
View File
@@ -0,0 +1,259 @@
package mcp.mobius.opis.gui.swing;
import java.awt.BorderLayout;
import java.awt.EventQueue;
import javax.swing.JFrame;
import javax.swing.JPanel;
import javax.swing.JTabbedPane;
import javax.swing.JTable;
import javax.swing.border.EmptyBorder;
import javax.swing.table.DefaultTableModel;
import javax.swing.JScrollPane;
import java.awt.GridLayout;
import javax.swing.JLabel;
import java.awt.GridBagLayout;
import java.awt.GridBagConstraints;
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import javax.swing.SwingConstants;
import javax.swing.JCheckBox;
import javax.swing.JButton;
import cpw.mods.fml.common.network.PacketDispatcher;
import mcp.mobius.opis.network.client.Packet_ReqData;
public class SwingUI extends JFrame implements ActionListener, ItemListener{
private static SwingUI _instance = new SwingUI();
public static SwingUI instance(){
return _instance;
}
private JPanel contentPane;
private JScrollPane scrollPaneEntityAmount;
private JTable tableEntityList;
private JPanel panelEntityAmount;
private JLabel labelAmountValue;
private JLabel labelAmountTotal;
private JCheckBox chkBoxDisplayAll;
private JButton btnRefreshEntityAmount;
private boolean filterEntityAmount = false;
private JPanel panelTimingTE;
private JPanel panelTimingEnt;
private JPanel panelTimingHandler;
private JScrollPane scrollPaneTimingEnt;
private JTable tableTimingEnt;
private JScrollPane scrollPaneTimingHandler;
private JTable tableTimingHandler;
private JTable tableTimingTE;
public void showUI(){
EventQueue.invokeLater(new Runnable() {
public void run() {
try {
SwingUI.instance().setVisible(true);
} catch (Exception e) {
e.printStackTrace();
}
}
});
}
/**
* Create the frame.
*/
private SwingUI() {
setTitle("Opis Control Panel");
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
setBounds(100, 100, 571, 383);
contentPane = new JPanel();
contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
contentPane.setLayout(new BorderLayout(0, 0));
setContentPane(contentPane);
JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP);
contentPane.add(tabbedPane, BorderLayout.CENTER);
panelEntityAmount = new JPanel();
tabbedPane.addTab("Entity Amount", null, panelEntityAmount, null);
GridBagLayout gbl_panelEntityAmount = new GridBagLayout();
gbl_panelEntityAmount.columnWidths = new int[]{217, 217, 0};
gbl_panelEntityAmount.rowHeights = new int[]{0, 120, 30, 0};
gbl_panelEntityAmount.columnWeights = new double[]{1.0, 1.0, Double.MIN_VALUE};
gbl_panelEntityAmount.rowWeights = new double[]{0.0, 1.0, 0.0, Double.MIN_VALUE};
panelEntityAmount.setLayout(gbl_panelEntityAmount);
chkBoxDisplayAll = new JCheckBox("Filter Entities");
GridBagConstraints gbc_chkBoxDisplayAll = new GridBagConstraints();
gbc_chkBoxDisplayAll.insets = new Insets(0, 0, 5, 5);
gbc_chkBoxDisplayAll.gridx = 0;
gbc_chkBoxDisplayAll.gridy = 0;
chkBoxDisplayAll.addItemListener(this);
panelEntityAmount.add(chkBoxDisplayAll, gbc_chkBoxDisplayAll);
btnRefreshEntityAmount = new JButton("Refresh");
GridBagConstraints gbc_btnRefreshEntityAmount = new GridBagConstraints();
gbc_btnRefreshEntityAmount.insets = new Insets(0, 0, 5, 0);
gbc_btnRefreshEntityAmount.gridx = 1;
gbc_btnRefreshEntityAmount.gridy = 0;
btnRefreshEntityAmount.addActionListener(this);
panelEntityAmount.add(btnRefreshEntityAmount, gbc_btnRefreshEntityAmount);
scrollPaneEntityAmount = new JScrollPane();
GridBagConstraints gbc_scrollPaneEntityAmount = new GridBagConstraints();
gbc_scrollPaneEntityAmount.gridwidth = 2;
gbc_scrollPaneEntityAmount.fill = GridBagConstraints.BOTH;
gbc_scrollPaneEntityAmount.insets = new Insets(0, 0, 5, 0);
gbc_scrollPaneEntityAmount.gridx = 0;
gbc_scrollPaneEntityAmount.gridy = 1;
panelEntityAmount.add(scrollPaneEntityAmount, gbc_scrollPaneEntityAmount);
tableEntityList = new JTable();
tableEntityList.setModel(new DefaultTableModel(
new Object[][] {
{null, null},
},
new String[] {
"Type", "Amount"
}
) {
Class[] columnTypes = new Class[] {
String.class, Integer.class
};
public Class getColumnClass(int columnIndex) {
return columnTypes[columnIndex];
}
});
tableEntityList.getColumnModel().getColumn(0).setPreferredWidth(231);
tableEntityList.getColumnModel().getColumn(1).setPreferredWidth(237);
tableEntityList.setAutoCreateRowSorter(true);
scrollPaneEntityAmount.setViewportView(tableEntityList);
labelAmountTotal = new JLabel("Total");
labelAmountTotal.setHorizontalAlignment(SwingConstants.CENTER);
GridBagConstraints gbc_labelAmountTotal = new GridBagConstraints();
gbc_labelAmountTotal.fill = GridBagConstraints.BOTH;
gbc_labelAmountTotal.insets = new Insets(0, 0, 0, 5);
gbc_labelAmountTotal.gridx = 0;
gbc_labelAmountTotal.gridy = 2;
panelEntityAmount.add(labelAmountTotal, gbc_labelAmountTotal);
labelAmountValue = new JLabel("0");
labelAmountValue.setHorizontalAlignment(SwingConstants.CENTER);
GridBagConstraints gbc_labelAmountValue = new GridBagConstraints();
gbc_labelAmountValue.fill = GridBagConstraints.BOTH;
gbc_labelAmountValue.gridx = 1;
gbc_labelAmountValue.gridy = 2;
panelEntityAmount.add(labelAmountValue, gbc_labelAmountValue);
panelTimingTE = new JPanel();
tabbedPane.addTab("TileEntity Timing", null, panelTimingTE, null);
panelTimingTE.setLayout(new GridLayout(0, 1, 0, 0));
JScrollPane scrollPaneTimingTE = new JScrollPane();
panelTimingTE.add(scrollPaneTimingTE);
tableTimingTE = new JTable();
tableTimingTE.setModel(new DefaultTableModel(
new Object[][] {
{null, null},
},
new String[] {
"New column", "New column"
}
));
scrollPaneTimingTE.setViewportView(tableTimingTE);
panelTimingEnt = new JPanel();
tabbedPane.addTab("EntityTiming", null, panelTimingEnt, null);
panelTimingEnt.setLayout(new GridLayout(0, 1, 0, 0));
scrollPaneTimingEnt = new JScrollPane();
panelTimingEnt.add(scrollPaneTimingEnt);
tableTimingEnt = new JTable();
tableTimingEnt.setModel(new DefaultTableModel(
new Object[][] {
{null, null},
},
new String[] {
"New column", "New column"
}
));
scrollPaneTimingEnt.setViewportView(tableTimingEnt);
panelTimingHandler = new JPanel();
tabbedPane.addTab("Handlers Timing", null, panelTimingHandler, null);
panelTimingHandler.setLayout(new GridLayout(0, 1, 0, 0));
scrollPaneTimingHandler = new JScrollPane();
panelTimingHandler.add(scrollPaneTimingHandler);
tableTimingHandler = new JTable();
tableTimingHandler.setModel(new DefaultTableModel(
new Object[][] {
{null, null},
},
new String[] {
"New column", "New column"
}
));
scrollPaneTimingHandler.setViewportView(tableTimingHandler);
}
public JTable getTableEntityList() {
return tableEntityList;
}
public JLabel getLabelAmountValue() {
return labelAmountValue;
}
public JTable getTableTimingTE() {
return tableTimingTE;
}
public JTable getTableTimingEnt() {
return tableTimingEnt;
}
public JTable getTableTimingHandler() {
return tableTimingHandler;
}
@Override
public void actionPerformed(ActionEvent e) {
if (e.getSource() == btnRefreshEntityAmount){
this.requestAmoutEntityUpdate(this.filterEntityAmount);
}
}
@Override
public void itemStateChanged(ItemEvent e) {
if (e.getItem() == chkBoxDisplayAll){
if (e.getStateChange() == ItemEvent.SELECTED){
this.filterEntityAmount = true;
this.requestAmoutEntityUpdate(this.filterEntityAmount);
}
else if (e.getStateChange() == ItemEvent.DESELECTED){
this.filterEntityAmount = false;
this.requestAmoutEntityUpdate(this.filterEntityAmount);
}
}
}
private void requestAmoutEntityUpdate(boolean filtered){
System.out.printf("Entity amount update request. Filtering : %s\n", this.filterEntityAmount);
if (filtered)
PacketDispatcher.sendPacketToServer(Packet_ReqData.create("list:amount_ent:filtered"));
else
PacketDispatcher.sendPacketToServer(Packet_ReqData.create("list:amount_ent:unfiltered"));
}
}
+2 -2
View File
@@ -11,6 +11,7 @@ import mcp.mobius.opis.client.OpisClientTickHandler;
import mcp.mobius.opis.commands.client.CommandClientShowRenderTick;
import mcp.mobius.opis.commands.client.CommandClientStart;
import mcp.mobius.opis.commands.client.CommandClientTest;
import mcp.mobius.opis.commands.client.CommandOpis;
import mcp.mobius.opis.commands.server.CommandAmountEntities;
import mcp.mobius.opis.commands.server.CommandChunkDump;
import mcp.mobius.opis.commands.server.CommandChunkList;
@@ -22,7 +23,6 @@ import mcp.mobius.opis.commands.server.CommandHelp;
import mcp.mobius.opis.commands.server.CommandKill;
import mcp.mobius.opis.commands.server.CommandKillAll;
import mcp.mobius.opis.commands.server.CommandMeanModTime;
import mcp.mobius.opis.commands.server.CommandOpis;
import mcp.mobius.opis.commands.server.CommandReset;
import mcp.mobius.opis.commands.server.CommandStart;
import mcp.mobius.opis.commands.server.CommandStop;
@@ -133,7 +133,7 @@ public class modOpis {
event.registerServerCommand(new CommandReset());
event.registerServerCommand(new CommandHandler());
event.registerServerCommand(new CommandEntityCreate());
//event.registerServerCommand(new CommandOpis());
event.registerServerCommand(new CommandOpis());
//event.registerServerCommand(new CommandClientTest());
//event.registerServerCommand(new CommandClientStart());
@@ -7,4 +7,6 @@ public class ClientCommand {
public static byte RESET_PROFILING = 0x03;
public static byte SHOW_RENDER_TICK = 0x04;
public static byte SHOW_SWING = 0x05;
}
@@ -3,13 +3,18 @@ package mcp.mobius.opis.network;
import java.util.ArrayList;
import java.util.logging.Level;
import javax.swing.event.TableModelEvent;
import javax.swing.table.DefaultTableModel;
import mcp.mobius.mobiuscore.profiler.ProfilerRegistrar;
import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.client.OpisClientTickHandler;
import mcp.mobius.opis.data.client.DataCache;
import mcp.mobius.opis.data.client.TickHandlerClientProfiler;
import mcp.mobius.opis.data.holders.TickHandlerStats;
import mcp.mobius.opis.data.managers.MetaManager;
import mcp.mobius.opis.data.managers.TickHandlerManager;
import mcp.mobius.opis.gui.swing.SwingUI;
public class ClientCommandHandler {
@@ -37,5 +42,9 @@ public class ClientCommandHandler {
System.out.printf("%s \n", stat);
}
}
else if (cmd == ClientCommand.SHOW_SWING){
SwingUI.instance().showUI();
}
}
}
@@ -7,11 +7,13 @@ import java.util.logging.Level;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.network.Player;
import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.commands.server.CommandAmountEntities;
import mcp.mobius.opis.data.holders.CoordinatesChunk;
import mcp.mobius.opis.data.holders.EntityStats;
import mcp.mobius.opis.data.managers.EntityManager;
import mcp.mobius.opis.network.server.Packet_DataListChunkEntities;
import mcp.mobius.opis.network.server.Packet_DataOverlayChunkEntities;
import mcp.mobius.opis.network.server.Packet_DataScreenAmountEntities;
public class DataReqHandler {
@@ -42,6 +44,16 @@ public class DataReqHandler {
PacketDispatcher.sendPacketToPlayer(Packet_DataListChunkEntities.create(EntityManager.getEntitiesInChunk(coord)), player);
return;
}
} else if (data[1].equals("amount_ent")){
if (data[2].equals("filtered")){
HashMap<String, Integer> ents = EntityManager.getCumulativeEntities(false);
PacketDispatcher.sendPacketToPlayer(Packet_DataScreenAmountEntities.create(ents), player);
return;
} else if (data[2].equals("unfiltered")){
HashMap<String, Integer> ents = EntityManager.getCumulativeEntities(true);
PacketDispatcher.sendPacketToPlayer(Packet_DataScreenAmountEntities.create(ents), player);
return;
}
}
}
@@ -7,6 +7,7 @@ import java.util.ArrayList;
import mapwriter.Mw;
import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.data.client.DataCache;
import mcp.mobius.opis.data.holders.CoordinatesChunk;
import mcp.mobius.opis.data.holders.EntityStats;
import mcp.mobius.opis.data.holders.TicketData;
@@ -144,7 +145,7 @@ public class OpisPacketHandler implements IPacketHandler {
else if (header == Packets.DATA_SCREEN_AMOUNT_ENTITIES){
Packet_DataScreenAmountEntities castedPacket = new Packet_DataScreenAmountEntities(packet);
modOpis.proxy.displayEntityAmount(castedPacket.entities);
DataCache.instance().setAmountEntities(castedPacket.entities);
}
else if (header == Packets.DATA_SCREEN_TIMING_HANDLERS){